Merge pull request #177 from companieshouse/feature/JU-89-java-21-migration-validation-errors

correcting custom validation errors to match pre-java-upgrade errors

Author: foman-ch

src/main/java/uk/gov/companieshouse/orders/api/validator/DeliveryDetailsValidator.java

@@ -11,11 +11,11 @@
 @Component
 public class DeliveryDetailsValidator {
 
-    private static final String ADDRESS_LINE_1_VALIDATION = "delivery_details.address_line_1 may not be blank";
-    private static final String COUNTRY_VALIDATION = "delivery_details.country may not be blank";
-    private static final String FORENAME_VALIDATION = "delivery_details.forename may not be blank";
-    private static final String SURNAME_VALIDATION = "delivery_details.surname may not be blank";
-    private static final String LOCALITY_VALIDATION = "delivery_details.locality may not be blank";
+    private static final String ADDRESS_LINE_1_VALIDATION = "delivery_details.address_line_1: must not be blank";
+    private static final String COUNTRY_VALIDATION = "delivery_details.country: must not be blank";
+    private static final String FORENAME_VALIDATION = "delivery_details.forename: must not be blank";
+    private static final String SURNAME_VALIDATION = "delivery_details.surname: must not be blank";
+    private static final String LOCALITY_VALIDATION = "delivery_details.locality: must not be blank";
     private static final String POSTAL_CODE_VALIDATION = "Postcode or Region is required";
 
     public DeliveryDetailsValidator() { }

src/test/java/uk/gov/companieshouse/orders/api/controller/BasketControllerIntegrationTest.java

@@ -1536,7 +1536,7 @@ void addDeliveryDetailsFailsDueToFailedValidation() throws Exception {
                 .andExpect(status().isBadRequest())
                 .andDo(MockMvcResultHandlers.print())
                 .andReturn();
-        Assertions.assertTrue(result.getResponse().getContentAsString().contains("address_line_1 may not be blank"));
+        Assertions.assertTrue(result.getResponse().getContentAsString().contains("delivery_details.address_line_1: must not be blank"));
     }
 
     @Test