ValidateTypes::validateOrganisation

src/main/java/scot/carricksoftware/grants/validators/certificates/BirthCertificateCommandPartOneValidator.java

@@ -47,24 +47,14 @@ public class BirthCertificateCommandPartOneValidator {
     }
 
 
-    private void validateNullOrEmptyString(String string, @SuppressWarnings("SameParameterValue") String field, @SuppressWarnings("SameParameterValue") String message, BindingResult bindingResult) {
-        if (string == null||string.isEmpty()) {
-            bindingResult.rejectValue(field, ApplicationConstants.EMPTY_STRING, null, message);
-        }
-    }
-
     private void validateCertificateNumber(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating birth certificate Certificate Number");
-        validateNullOrEmptyString(birthCertificateCommand.getCertificateNumber(), "certificateNumber", ValidationConstants.CERTIFICATE_NUMBER_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(birthCertificateCommand.getCertificateNumber(), "certificateNumber", ValidationConstants.CERTIFICATE_NUMBER_IS_NULL, bindingResult);
     }
 
     private void validateCertificateSource(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating birth certificate Certificate Source");
-        if (birthCertificateCommand.getCertificateSource() == null ) {
-            bindingResult.rejectValue("certificateSource", ApplicationConstants.EMPTY_STRING,
-                    null,
-                    ValidationConstants.SOURCE_IS_NULL);
-        }
+        validateTypes.validateOrganisation(birthCertificateCommand.getCertificateSource(), "certificateSource", ValidationConstants.SOURCE_IS_NULL, bindingResult);
     }
 
     private void validateCertificateType(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {

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

@@ -7,7 +7,12 @@ package scot.carricksoftware.grants.validators.helpers;
 
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.domains.places.Organisation;
 
 public interface ValidateTypes {
     void validatePerson(Person person, String field, String message, BindingResult bindingResult);
+
+    void validateOrganisation(Organisation organisation, String field, String message, BindingResult bindingResult);
+
+    void validateNullOrEmptyString(String string, @SuppressWarnings("SameParameterValue") String field, @SuppressWarnings("SameParameterValue") String message, BindingResult bindingResult);
 }

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

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.domains.places.Organisation;
 
 @Component
 public class ValidateTypesImpl implements ValidateTypes {
@@ -19,4 +20,18 @@ public class ValidateTypesImpl implements ValidateTypes {
             bindingResult.rejectValue(field, ApplicationConstants.EMPTY_STRING, null, message);
         }
     }
+
+    @Override
+    public void validateOrganisation(Organisation organisation, String field, String message, BindingResult bindingResult) {
+        if (organisation == null ) {
+            bindingResult.rejectValue(field, ApplicationConstants.EMPTY_STRING, null, message);
+        }
+    }
+
+    @Override
+    public void validateNullOrEmptyString(String string, @SuppressWarnings("SameParameterValue") String field, @SuppressWarnings("SameParameterValue") String message, BindingResult bindingResult) {
+        if (string == null||string.isEmpty()) {
+            bindingResult.rejectValue(field, ApplicationConstants.EMPTY_STRING, null, message);
+        }
+    }
 }