Marriage Validation Fixes (2)

src/main/java/scot/carricksoftware/grants/constants/ValidationConstants.java

@@ -24,6 +24,7 @@ public class ValidationConstants {
     public static final String BRIDE_RANK_IS_NULL = "The bride rank cannot be null.";
     public static final String BRIDE_CONDITION_IS_NULL = "The bride condition cannot be null.";
     public static final String BRIDE_FATHER_AND_UNTRACKED_FATHER = "One and only one bride father and untracked bride father may be specified.";
+    public static final String BRIDE_FATHER_RANK_IS_NULL = "The bride's father's rank cannot be null.";
     public static final String BRIDE_USUAL_RESIDENCE_AND_UNTRACKED_USUAL_RESIDENCE = "One and only one bride residence and untracked groom residence may be specified.";
     public static final String CENSUS_IS_NULL = "The census should be specified";
     public static final String CAUSE_OF_DEATH_IS_NULL = "The cause of death should be specified.";
@@ -45,6 +46,7 @@ public class ValidationConstants {
     public static final String FIRST_PARTY_IS_NULL = "The first party cannot be null.";
     public static final String GROOM_IS_NULL = "The groom cannot be null.";
     public static final String GROOM_AGE_IS_NULL = "The groom age cannot be null.";
+    public static final String GROOM_FATHER_RANK_IS_NULL = "The groom's father's rank cannot be null.";
     public static final String GROOM_RANK_IS_NULL = "The groom rank cannot be null.";
     public static final String GROOM_CONDITION_IS_NULL = "The groom condition cannot be null.";
     public static final String GROOM_FATHER_AND_UNTRACKED_FATHER = "One and only one groom father and untracked groom father may be specified.";

src/main/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateCommandValidatorImpl.java

@@ -32,6 +32,7 @@ public class MarriageCertificateCommandValidatorImpl implements MarriageCertific
 
     @Override
     public void validate(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
+        marriageCertificateBaseFieldsValidator.validate(marriageCertificateCommand, bindingResult);
         marriageCertificateNullFieldsValidator.validate(marriageCertificateCommand, bindingResult);
         marriageCertificateUntrackedFieldsValidator.validate(marriageCertificateCommand, bindingResult);
     }

src/main/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateNullFieldsValidatorImpl.java

@@ -28,12 +28,14 @@ public class MarriageCertificateNullFieldsValidatorImpl implements MarriageCerti
     public void validate(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         validateGroom(marriageCertificateCommand, bindingResult);
         validateBride(marriageCertificateCommand, bindingResult);
+        validateBrideCondition(marriageCertificateCommand, bindingResult);
+        validateBrideRank(marriageCertificateCommand, bindingResult);
         validateGroomAge(marriageCertificateCommand, bindingResult);
         validateBrideAge(marriageCertificateCommand, bindingResult);
         validateGroomRank(marriageCertificateCommand, bindingResult);
-        validateBrideRank(marriageCertificateCommand, bindingResult);
         validateGroomCondition(marriageCertificateCommand, bindingResult);
-        validateBrideCondition(marriageCertificateCommand, bindingResult);
+        validateGroomFatherRank(marriageCertificateCommand, bindingResult);
+        validateBrideFatherRank(marriageCertificateCommand, bindingResult);
         validateWhenMarried(marriageCertificateCommand, bindingResult);
     }
 
@@ -52,37 +54,47 @@ public class MarriageCertificateNullFieldsValidatorImpl implements MarriageCerti
         validateTypes.validatePerson(marriageCertificateCommand.getGroom(), "bride", ValidationConstants.BRIDE_IS_NULL, bindingResult);
     }
 
-
     private void validateGroomAge(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         logger.debug("MarriageCertificateNullFieldsValidator::validateGroomAge");
-        validateTypes.validatePerson(marriageCertificateCommand.getGroom(), "groomAge", ValidationConstants.GROOM_AGE_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getGroomAge(), "groomAge", ValidationConstants.GROOM_AGE_IS_NULL, bindingResult);
     }
 
     private void validateGroomRank(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         logger.debug("MarriageCertificateNullFieldsValidator::validateGroomRank");
-        validateTypes.validatePerson(marriageCertificateCommand.getGroom(), "groomRank", ValidationConstants.GROOM_RANK_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getGroomRank(), "groomRank", ValidationConstants.GROOM_RANK_IS_NULL, bindingResult);
     }
 
     private void validateGroomCondition(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         logger.debug("MarriageCertificateNullFieldsValidator::validateGroomCondition");
-        validateTypes.validatePerson(marriageCertificateCommand.getGroom(), "groomCondition", ValidationConstants.GROOM_CONDITION_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getGroomCondition(), "groomCondition", ValidationConstants.GROOM_CONDITION_IS_NULL, bindingResult);
     }
 
     private void validateBrideAge(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         logger.debug("MarriageCertificateNullFieldsValidator::validateBrideAge");
-        validateTypes.validatePerson(marriageCertificateCommand.getBride(), "brideAge", ValidationConstants.BRIDE_AGE_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getBrideAge(), "brideAge", ValidationConstants.BRIDE_AGE_IS_NULL, bindingResult);
     }
 
     private void validateBrideRank(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         logger.debug("MarriageCertificateNullFieldsValidator::validateBrideRank");
-        validateTypes.validatePerson(marriageCertificateCommand.getBride(), "brideRank", ValidationConstants.BRIDE_RANK_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getBrideRank(), "brideRank", ValidationConstants.BRIDE_RANK_IS_NULL, bindingResult);
     }
 
     private void validateBrideCondition(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         logger.debug("MarriageCertificateNullFieldsValidator::validateBrideCondition");
-        validateTypes.validatePerson(marriageCertificateCommand.getBride(), "brideCondition", ValidationConstants.BRIDE_CONDITION_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getBrideCondition(), "brideCondition", ValidationConstants.BRIDE_CONDITION_IS_NULL, bindingResult);
     }
 
+    private void validateBrideFatherRank(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
+        logger.debug("MarriageCertificateNullFieldsValidator::validateBrideFatherRank");
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getBrideFatherRank(), "brideFatherRank", ValidationConstants.BRIDE_FATHER_RANK_IS_NULL, bindingResult);
+    }
+
+    private void validateGroomFatherRank(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
+        logger.debug("MarriageCertificateNullFieldsValidator::validateGroomFatherRank");
+        validateTypes.validateNullOrEmptyString(marriageCertificateCommand.getGroomFatherRank(), "groomFatherRank", ValidationConstants.BRIDE_FATHER_RANK_IS_NULL, bindingResult);
+    }
+
+
 
 
 }

src/main/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateUntrackedFieldsValidatorImpl.java

@@ -107,8 +107,8 @@ public class MarriageCertificateUntrackedFieldsValidatorImpl implements Marriage
         logger.debug("MarriageCertificateUntrackedFieldsValidatorImp::validateUntrackedSecondWitness");
         validateTwoFieldTypes.validatePersonAndUntrackedPerson(marriageCertificateCommand.getSecondWitness(),
                 marriageCertificateCommand.getUntrackedSecondWitness(),
-                "firstWitness",
-                "untrackedFirstWitness",
+                "secondWitness",
+                "untrackedSecondWitness",
                 ValidationConstants.WITNESS_AND_UNTRACKED_SECOND_WITNESS,
                 bindingResult);
     }