DeathCertificate Validation Informant fixes

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

@@ -41,27 +41,27 @@ public class DeathCertificateNullFieldsValidatorImpl implements DeathCertificate
 
     private void validateCertificateNumber(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateCertificateNumber");
-        validateTypes.validateString(deathCertificateCommand.getCertificateNumber(), "certificateNumber","Certificate number must exist", bindingResult);
+        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getCertificateNumber(), "certificateNumber","Certificate number must exist", bindingResult);
     }
 
     private void validateVolume(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateVolume");
-        validateTypes.validateString(deathCertificateCommand.getVolume(), "volume","Volume must exist", bindingResult);
+        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getVolume(), "volume","Volume must exist", bindingResult);
     }
 
     private void validateNumber(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateNumber");
-        validateTypes.validateString(deathCertificateCommand.getNumber(), "number","Number must exist", bindingResult);
+        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getNumber(), "number","Number must exist", bindingResult);
     }
 
     private void validateCauseOfDeath(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateCauseOfDeath");
-        validateTypes.validateString(deathCertificateCommand.getCauseOfDeath(), "causeOfDeath","Cause of Death must exist", bindingResult);
+        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getCauseOfDeath(), "causeOfDeath","Cause of Death must exist", bindingResult);
     }
 
     private void validateInformantQualification(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateInformantQualification");
-        validateTypes.validateString(deathCertificateCommand.getInformantQualification(), "informantQualification","Informant Qualification must exist", bindingResult);
+        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getInformantQualification(), "informantQualification","Informant Qualification must exist", bindingResult);
     }
 
     private void validateSex(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {

src/main/java/scot/carricksoftware/grants/validators/helpers/ValidateTypes.java

@@ -13,9 +13,6 @@ import scot.carricksoftware.grants.enums.certificates.CertificateType;
 
 public interface ValidateTypes {
 
-    @SuppressWarnings("unused")
-    void validateString(String string, String fieldName, String message, BindingResult bindingResult);
-
     void validatePerson(Person person, String field, String message, BindingResult bindingResult);
 
     void validateOrganisation(Organisation organisation, String field, String message, BindingResult bindingResult);

src/main/java/scot/carricksoftware/grants/validators/helpers/ValidateTypesImpl.java

@@ -16,12 +16,6 @@ import scot.carricksoftware.grants.enums.certificates.CertificateType;
 @Component
 public class ValidateTypesImpl implements ValidateTypes {
 
-    @Override
-    public void validateString(String string, String fieldName, String message, BindingResult bindingResult) {
-        if (string == null  || string.isEmpty()) {
-            bindingResult.rejectValue(fieldName, ApplicationConstants.EMPTY_STRING, null, message);
-        }
-    }
 
     @Override
     public void validatePerson(Person person, String fieldName, String message, BindingResult bindingResult) {

src/main/resources/templates/certificates/deathCertificate/form.html

@@ -507,7 +507,7 @@
                 </td>
 
                 <td style="text-align: left;">
-                    <select id="informant" name="informant" th:field="*{mother}">
+                    <select id="informant" name="informant" th:field="*{informant}">
                         <option th:value="${''}" th:text="${''}"></option>
                         <option th:each="person : ${people}"
                                 th:value="${person.id}" th:text="${person.toString()}"></option>