Refactored certificate validators

src/main/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerImpl.java

@@ -27,7 +27,7 @@ import scot.carricksoftware.grants.services.certificates.deathcertificates.Death
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidatorImpl;
 
 @SuppressWarnings("LoggingSimilarMessage")
 @Controller
@@ -38,7 +38,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     @SuppressWarnings({"FieldCanBeLocal", "unused"})
     private final DeathCertificateCommandConverterImpl deathCertificateCommandConverter;
     private final DeathCertificateConverterImpl deathCertificateConverter;
-    private final DeathCertificateCommandValidator deathCertificateCommandValidator;
+    private final DeathCertificateCommandValidatorImpl deathCertificateCommandValidatorImpl;
     private final PersonService personService;
     private final PlaceService placeService;
     private final OrganisationService organisationService;
@@ -47,7 +47,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     public DeathCertificateFormControllerImpl(DeathCertificateService deathCertificateService,
                                               DeathCertificateCommandConverterImpl deathCertificateCommandConverter,
                                               DeathCertificateConverterImpl deathCertificateConverter,
-                                              DeathCertificateCommandValidator deathCertificateCommandValidator,
+                                              DeathCertificateCommandValidatorImpl deathCertificateCommandValidatorImpl,
                                               PersonService personService,
                                               PlaceService placeService,
                                               OrganisationService organisationService) {
@@ -56,7 +56,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
 
 
         this.deathCertificateConverter = deathCertificateConverter;
-        this.deathCertificateCommandValidator = deathCertificateCommandValidator;
+        this.deathCertificateCommandValidatorImpl = deathCertificateCommandValidatorImpl;
         this.personService = personService;
         this.placeService = placeService;
 
@@ -93,7 +93,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     public String saveOrUpdate(@Valid @ModelAttribute DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult, Model model) {
         logger.debug("DeathCertificateFormControllerImpl::saveOrUpdate");
 
-        deathCertificateCommandValidator.validate(deathCertificateCommand, bindingResult);
+        deathCertificateCommandValidatorImpl.validate(deathCertificateCommand, bindingResult);
 
 
         if (bindingResult.hasErrors()) {

src/main/java/scot/carricksoftware/grants/controllers/certificates/divorcecertificates/DivorceCertificateFormControllerImpl.java

@@ -25,7 +25,7 @@ import scot.carricksoftware.grants.converters.certificates.divorcecertificates.D
 import scot.carricksoftware.grants.converters.certificates.divorcecertificates.DivorceCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.divorcecertificates.DivorceCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DivorceCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.divorcecertificate.DivorceCertificateCommandValidator;
 
 
 @SuppressWarnings("LoggingSimilarMessage")

src/main/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerImpl.java

@@ -25,7 +25,7 @@ import scot.carricksoftware.grants.converters.certificates.marriagecertificates.
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.MarriageCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.marriagecertificate.MarriageCertificateCommandValidator;
 
 @SuppressWarnings("LoggingSimilarMessage")
 @Controller

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

@@ -5,28 +5,13 @@
 
 package scot.carricksoftware.grants.validators.certificates.deathcertificate;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.stereotype.Component;
+
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.ValidationConstants;
-
-
-@Component
-public class DeathCertificateCommandValidator {
-    private static final Logger logger = LogManager.getLogger(DeathCertificateCommandValidator.class);
-
-    public void validate(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
-        logger.debug("Validating death certificate command");
-        if (deathCertificateCommand.getDeceased() == null) {
-            bindingResult.rejectValue("deceased", ApplicationConstants.EMPTY_STRING,
-                    null,
-                    ValidationConstants.PERSON_IS_NULL);
-        }
-    }
 
+public interface DeathCertificateCommandValidator {
 
+    @SuppressWarnings("unused")
+    void validate(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult);
 }
 

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.validators.certificates.deathcertificate;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
+import scot.carricksoftware.grants.constants.ApplicationConstants;
+import scot.carricksoftware.grants.constants.ValidationConstants;
+
+
+@Component
+public class DeathCertificateCommandValidatorImpl implements DeathCertificateCommandValidator {
+    private static final Logger logger = LogManager.getLogger(DeathCertificateCommandValidatorImpl.class);
+
+    public void validate(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
+        logger.debug("Validating death certificate command");
+        if (deathCertificateCommand.getDeceased() == null) {
+            bindingResult.rejectValue("deceased", ApplicationConstants.EMPTY_STRING,
+                    null,
+                    ValidationConstants.PERSON_IS_NULL);
+        }
+    }
+
+}
+

src/main/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DivorceCertificateCommandValidator.java → src/main/java/scot/carricksoftware/grants/validators/certificates/divorcecertificate/DivorceCertificateCommandValidator.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.validators.certificates.deathcertificate;
+package scot.carricksoftware.grants.validators.certificates.divorcecertificate;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/MarriageCertificateCommandValidator.java → src/main/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateCommandValidator.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.validators.certificates.deathcertificate;
+package scot.carricksoftware.grants.validators.certificates.marriagecertificate;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerSaveOrUpdateTest.java

@@ -20,7 +20,7 @@ import scot.carricksoftware.grants.services.certificates.deathcertificates.Death
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -58,7 +58,7 @@ public class DeathCertificateFormControllerSaveOrUpdateTest {
     BindingResult bindingResultMock;
 
     @Mock
-    private DeathCertificateCommandValidator deathCertificateCommandValidatorMock;
+    private DeathCertificateCommandValidatorImpl deathCertificateCommandValidatorImplMock;
 
     private DeathCertificateCommand deathCertificateCommand;
 
@@ -68,7 +68,7 @@ public class DeathCertificateFormControllerSaveOrUpdateTest {
         deathCertificateController = new DeathCertificateFormControllerImpl(deathCertificateServiceMock,
                 deathCertificateCommandConverterMock,
                 deathCertificateConverterMock,
-                deathCertificateCommandValidatorMock,
+                deathCertificateCommandValidatorImplMock,
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock);

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerTest.java

@@ -22,7 +22,7 @@ import scot.carricksoftware.grants.services.certificates.deathcertificates.Death
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -59,7 +59,7 @@ public class DeathCertificateFormControllerTest {
     private OrganisationService organisationServiceMock;
 
     @Mock
-    private DeathCertificateCommandValidator deathCertificateCommandValidatorMock;
+    private DeathCertificateCommandValidatorImpl deathCertificateCommandValidatorImplMock;
 
 
     @BeforeEach
@@ -67,7 +67,7 @@ public class DeathCertificateFormControllerTest {
         deathCertificateFormController = new DeathCertificateFormControllerImpl(deathCertificateServiceMock,
                 deathCertificateCommandConverterMock,
                 deathCertificateConverterMock,
-                deathCertificateCommandValidatorMock,
+                deathCertificateCommandValidatorImplMock,
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock);

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerValidationTest.java

@@ -21,7 +21,7 @@ import scot.carricksoftware.grants.services.certificates.deathcertificates.Death
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidatorImpl;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -57,7 +57,7 @@ public class DeathCertificateFormControllerValidationTest {
     private OrganisationService organisationServiceMock;
 
     @Mock
-    private DeathCertificateCommandValidator deathCertificateCommandValidatorMock;
+    private DeathCertificateCommandValidatorImpl deathCertificateCommandValidatorImplMock;
 
     @Mock
     private Model modelMock;
@@ -68,7 +68,7 @@ public class DeathCertificateFormControllerValidationTest {
         deathCertificateController = new DeathCertificateFormControllerImpl(deathCertificateServiceMock,
                 deathCertificateCommandConverterMock,
                 deathCertificateConverterMock,
-                deathCertificateCommandValidatorMock,
+                deathCertificateCommandValidatorImplMock,
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock);
@@ -84,7 +84,7 @@ public class DeathCertificateFormControllerValidationTest {
 
         deathCertificateController.saveOrUpdate(deathCertificateCommand, bindingResultMock, modelMock);
 
-        verify(deathCertificateCommandValidatorMock).validate(deathCertificateCommand, bindingResultMock);
+        verify(deathCertificateCommandValidatorImplMock).validate(deathCertificateCommand, bindingResultMock);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/divorcecertificates/DivorceCertificateFormControllerSaveOrUpdateTest.java

@@ -18,7 +18,7 @@ import scot.carricksoftware.grants.converters.certificates.divorcecertificates.D
 import scot.carricksoftware.grants.converters.certificates.divorcecertificates.DivorceCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.divorcecertificates.DivorceCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DivorceCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.divorcecertificate.DivorceCertificateCommandValidator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;

src/test/java/scot/carricksoftware/grants/controllers/certificates/divorcecertificates/DivorceCertificateFormControllerTest.java

@@ -20,7 +20,7 @@ import scot.carricksoftware.grants.converters.certificates.divorcecertificates.D
 import scot.carricksoftware.grants.domains.certificates.DivorceCertificate;
 import scot.carricksoftware.grants.services.certificates.divorcecertificates.DivorceCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DivorceCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.divorcecertificate.DivorceCertificateCommandValidator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/scot/carricksoftware/grants/controllers/certificates/divorcecertificates/DivorceCertificateFormControllerValidationTest.java

@@ -19,7 +19,7 @@ import scot.carricksoftware.grants.converters.certificates.divorcecertificates.D
 import scot.carricksoftware.grants.converters.certificates.divorcecertificates.DivorceCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.divorcecertificates.DivorceCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DivorceCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.divorcecertificate.DivorceCertificateCommandValidator;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerSaveOrUpdateTest.java

@@ -18,7 +18,7 @@ import scot.carricksoftware.grants.converters.certificates.marriagecertificates.
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.MarriageCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.marriagecertificate.MarriageCertificateCommandValidator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerTest.java

@@ -20,7 +20,7 @@ import scot.carricksoftware.grants.converters.certificates.marriagecertificates.
 import scot.carricksoftware.grants.domains.certificates.MarriageCertificate;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.MarriageCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.marriagecertificate.MarriageCertificateCommandValidator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerValidationTest.java

@@ -19,7 +19,7 @@ import scot.carricksoftware.grants.converters.certificates.marriagecertificates.
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.MarriageCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.marriagecertificate.MarriageCertificateCommandValidator;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/scot/carricksoftware/grants/validators/certificates/DeathCertificateCommandValidatorTest.java → src/test/java/scot/carricksoftware/grants/validators/certificates/DeathCertificateCommandValidatorImplTest.java

@@ -15,7 +15,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.verify;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
 @ExtendWith(MockitoExtension.class)
-class DeathCertificateCommandValidatorTest {
+class DeathCertificateCommandValidatorImplTest {
 
-    private DeathCertificateCommandValidator commandValidator;
+    private DeathCertificateCommandValidatorImpl commandValidator;
 
     private ArgumentCaptor<String> stringArgumentCaptor;
     private ArgumentCaptor<String> stringArgumentCaptor2;
@@ -39,7 +39,7 @@ class DeathCertificateCommandValidatorTest {
 
     @BeforeEach
     void setUp() {
-        commandValidator = new DeathCertificateCommandValidator();
+        commandValidator = new DeathCertificateCommandValidatorImpl();
         stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
         stringArgumentCaptor2 = ArgumentCaptor.forClass(String.class);
         stringArgumentCaptor3 = ArgumentCaptor.forClass(String.class);

src/test/java/scot/carricksoftware/grants/validators/certificates/DivorceCertificateCommandValidatorTest.java

@@ -15,7 +15,7 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.divorcecertificates.DivorceCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.divorcecertificates.DivorceCertificateCommandImpl;
 import scot.carricksoftware.grants.domains.people.Person;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.DivorceCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.divorcecertificate.DivorceCertificateCommandValidator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/scot/carricksoftware/grants/validators/certificates/MarriageCertificateCommandValidatorTest.java

@@ -15,7 +15,7 @@ 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.domains.people.Person;
-import scot.carricksoftware.grants.validators.certificates.deathcertificate.MarriageCertificateCommandValidator;
+import scot.carricksoftware.grants.validators.certificates.marriagecertificate.MarriageCertificateCommandValidator;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;