Validation of when married (2)

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

@@ -12,24 +12,24 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.constants.ValidationConstants;
 import scot.carricksoftware.grants.validators.helpers.ValidateDateTypes;
-import scot.carricksoftware.grants.validators.helpers.ValidateTypesImpl;
+import scot.carricksoftware.grants.validators.helpers.ValidateTypes;
 
 @Component
 public class MarriageCertificateNullFieldsValidatorImpl implements MarriageCertificateNullFieldsValidator {
 
     private static final Logger logger = LogManager.getLogger(MarriageCertificateNullFieldsValidatorImpl.class);
 
-    private final ValidateTypesImpl validateTypes;
+    private final ValidateTypes validateTypes;
     private final ValidateDateTypes validateDateTypes;
 
-    public MarriageCertificateNullFieldsValidatorImpl(ValidateTypesImpl validateTypes, ValidateDateTypes validateDateTypes) {
+    public MarriageCertificateNullFieldsValidatorImpl(ValidateTypes validateTypes, ValidateDateTypes validateDateTypes) {
         this.validateTypes = validateTypes;
         this.validateDateTypes = validateDateTypes;
     }
 
+
     @Override
     public void validate(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
-        validateGroom(marriageCertificateCommand, bindingResult);
         validateGroom(marriageCertificateCommand, bindingResult);
         validateBride(marriageCertificateCommand, bindingResult);
         validateBrideCondition(marriageCertificateCommand, bindingResult);
@@ -52,7 +52,6 @@ public class MarriageCertificateNullFieldsValidatorImpl implements MarriageCerti
                 bindingResult);
     }
 
-
     private void validateGroom(MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult) {
         logger.debug("MarriageCertificateNullFieldsValidator::validateGroom");
         validateTypes.validatePerson(marriageCertificateCommand.getGroom(), "groom", ValidationConstants.GROOM_IS_NULL, bindingResult);

src/test/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateNullFieldsValidatorTest.java

@@ -13,6 +13,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
+import scot.carricksoftware.grants.validators.helpers.ValidateDateTypesImpl;
 import scot.carricksoftware.grants.validators.helpers.ValidateTypesImpl;
 
 import static org.mockito.Mockito.verify;
@@ -26,19 +27,22 @@ class MarriageCertificateNullFieldsValidatorTest {
     @Mock
     private ValidateTypesImpl validateTypesMock;
 
+    @Mock
+    private ValidateDateTypesImpl validateDateTypesMock;
+
     private MarriageCertificateCommand marriageCertificateCommand;
 
     @BeforeEach
     void setUp() {
-        MarriageCertificateNullFieldsValidator marriageCertificateNullFieldsValidator = new MarriageCertificateNullFieldsValidatorImpl(validateTypesMock);
+        MarriageCertificateNullFieldsValidator marriageCertificateNullFieldsValidator = new MarriageCertificateNullFieldsValidatorImpl(
+                validateTypesMock,
+                validateDateTypesMock);
         marriageCertificateCommand = new MarriageCertificateCommandImpl();
         marriageCertificateNullFieldsValidator.validate(marriageCertificateCommand, bindingResultMock);
     }
 
     @Test
     void validateNullOrEmptyStringTest() {
-        verify(validateTypesMock).validateNullOrEmptyString(marriageCertificateCommand.getWhenMarried(),
-                "whenMarried", "When married cannot be null.", bindingResultMock);
         verify(validateTypesMock).validateNullOrEmptyString(marriageCertificateCommand.getGroomAge(),
                 "groomAge", "The groom age cannot be null.", bindingResultMock);
         verify(validateTypesMock).validateNullOrEmptyString(marriageCertificateCommand.getGroomRank(),