DeathCertificate Validation Certificate Source and Registration Authority

src/main/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DeathCertificateNullFieldsValidatorImpl.java

@@ -32,6 +32,8 @@ public class DeathCertificateNullFieldsValidatorImpl implements DeathCertificate
         validateSex(deathCertificateCommand, bindingResult);
         validateCauseOfDeath(deathCertificateCommand, bindingResult);
         validateInformantQualification(deathCertificateCommand, bindingResult);
+        validateCertificateSource(deathCertificateCommand, bindingResult);
+        validateRegistrationAuthority(deathCertificateCommand, bindingResult);
     }
 
     private void validateDeceased(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
@@ -69,7 +71,15 @@ public class DeathCertificateNullFieldsValidatorImpl implements DeathCertificate
         validateTypes.validateSex(deathCertificateCommand.getSex(), "sex","Sex cannot be null", bindingResult);
     }
 
+    private void validateCertificateSource(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
+        logger.debug("DeathCertificateNullFieldsValidator::validateCertificateSource");
+        validateTypes.validateOrganisation(deathCertificateCommand.getCertificateSource(), "certificateSource","Certificate source must exist", bindingResult);
+    }
 
+    private void validateRegistrationAuthority(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
+        logger.debug("DeathCertificateNullFieldsValidator::validateRegistrationAuthority");
+        validateTypes.validateOrganisation(deathCertificateCommand.getRegistrationAuthority(), "registrationAuthority","Certificate source must exist", bindingResult);
+    }
 
 
 }

src/main/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DeathCertificateUntrackedFieldsValidator.java

@@ -14,16 +14,22 @@ public interface DeathCertificateUntrackedFieldsValidator {
     @SuppressWarnings("unused")
     void validate(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult);
 
+    @SuppressWarnings("unused")
     void validateUntrackedWhereDied(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult);
 
+    @SuppressWarnings("unused")
     void validateUsualResidence(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult);
 
+    @SuppressWarnings("unused")
     void validateSpouse(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult);
 
+    @SuppressWarnings("unused")
     void validateFather(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult);
 
+    @SuppressWarnings("unused")
     void validateMother(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult);
 
+    @SuppressWarnings("unused")
     void validateInformant(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult);
 }