Pārlūkot izejas kodu

Birth Certificate validatorOne extracted TestNullPerson

Andrew Grant 6 mēneši atpakaļ
vecāks
revīzija
7013c2c605

+ 8 - 4
src/main/java/scot/carricksoftware/grants/validators/certificates/BirthCertificateCommandPartOneValidator.java

@@ -12,6 +12,7 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.constants.ValidationConstants;
+import scot.carricksoftware.grants.domains.people.Person;
 
 import java.time.LocalDate;
 
@@ -36,10 +37,13 @@ public class BirthCertificateCommandPartOneValidator {
 
     private void validateNewBorn(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating birth certificate newBorn");
-        if (birthCertificateCommand.getNewBorn() == null ) {
-            bindingResult.rejectValue("newBorn", ApplicationConstants.EMPTY_STRING,
-                    null,
-                    ValidationConstants.NEWBORN_IS_NULL);
+        validatePerson(birthCertificateCommand.getNewBorn(),"newBorn", ValidationConstants.NEWBORN_IS_NULL, bindingResult);
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private void validatePerson(Person person, String field, String message, BindingResult bindingResult) {
+        if (person == null ) {
+            bindingResult.rejectValue(field, ApplicationConstants.EMPTY_STRING, null, message);
         }
     }
 

+ 3 - 2
src/main/java/scot/carricksoftware/grants/validators/certificates/BirthCertificateCommandPartThreeValidator.java

@@ -61,7 +61,7 @@ public class BirthCertificateCommandPartThreeValidator {
 
 
     @SuppressWarnings("DuplicatedCode")
-    private void validateInteger(String part, int low, int high, String validationConstant, String field, BindingResult bindingResult) {
+    private void validateInteger(String part, int low, int high, @SuppressWarnings("SameParameterValue") String validationConstant, @SuppressWarnings("SameParameterValue") String field, BindingResult bindingResult) {
         boolean invalid = false;
         try {
             int value = Integer.parseInt(part);
@@ -91,7 +91,8 @@ public class BirthCertificateCommandPartThreeValidator {
         }
     }
 
-    private void validateTime(String time, String whenBorn, BindingResult bindingResult) {
+    @SuppressWarnings("unused")
+    private void validateTime(String time, @SuppressWarnings("SameParameterValue") String whenBorn, BindingResult bindingResult) {
         String[] parts = time.split(":");
         if (parts.length != 2) {
             bindingResult.rejectValue("whenBorn", ApplicationConstants.EMPTY_STRING,

+ 1 - 0
src/test/java/scot/carricksoftware/grants/validators/certificates/BirthCertificateCommandValidatorPartSixTest.java

@@ -58,6 +58,7 @@ class BirthCertificateCommandValidatorPartSixTest {
     }
 
 
+    @SuppressWarnings("SpellCheckingInspection")
     @Test
     void whereBornInvalidDateTest() {
         birthCertificateCommand.setNewBorn(GetRandomPerson());