DocumentValidators refactored to include an interface

src/main/java/scot/carricksoftware/grants/controllers/text/appendixtext/AppendixTextFormControllerImpl.java

@@ -25,7 +25,7 @@ import scot.carricksoftware.grants.converters.text.appendixtext.AppendixTextConv
 import scot.carricksoftware.grants.commands.text.AppendixTextCommand;
 
 import scot.carricksoftware.grants.services.text.appendixtext.AppendixTextService;
-import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidatorImpl;
 
 @SuppressWarnings("LoggingSimilarMessage")
 @Controller
@@ -36,19 +36,19 @@ public class AppendixTextFormControllerImpl implements AppendixTextFormControlle
     @SuppressWarnings({"FieldCanBeLocal", "unused"})
     private final AppendixTextCommandConverterImpl appendixTextCommandConverter;
     private final AppendixTextConverterImpl appendixTextConverter;
-    private final AppendixTextCommandValidator appendixTextCommandValidator;
+    private final AppendixTextCommandValidatorImpl appendixTextCommandValidatorImpl;
 
 
     public AppendixTextFormControllerImpl(AppendixTextService appendixTextService,
                                           AppendixTextCommandConverterImpl appendixTextCommandConverter,
                                           AppendixTextConverterImpl appendixTextConverter,
-                                          AppendixTextCommandValidator appendixTextCommandValidator) {
+                                          AppendixTextCommandValidatorImpl appendixTextCommandValidatorImpl) {
         this.appendixTextService = appendixTextService;
         this.appendixTextCommandConverter = appendixTextCommandConverter;
 
 
         this.appendixTextConverter = appendixTextConverter;
-        this.appendixTextCommandValidator = appendixTextCommandValidator;
+        this.appendixTextCommandValidatorImpl = appendixTextCommandValidatorImpl;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -73,7 +73,7 @@ public class AppendixTextFormControllerImpl implements AppendixTextFormControlle
     public String saveOrUpdate(@Valid @ModelAttribute AppendixTextCommand appendixTextCommand, BindingResult bindingResult, Model model) {
         logger.debug("AppendixTextFormControllerImpl::saveOrUpdate");
 
-        appendixTextCommandValidator.validate(appendixTextCommand, bindingResult);
+        appendixTextCommandValidatorImpl.validate(appendixTextCommand, bindingResult);
 
 
         if (bindingResult.hasErrors()) {

src/main/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextFormControllerImpl.java

@@ -21,7 +21,7 @@ import scot.carricksoftware.grants.constants.*;
 import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextCommandConverterImpl;
 import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextConverterImpl;
 import scot.carricksoftware.grants.services.text.documenttext.DocumentTextService;
-import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidatorImpl;
 
 @SuppressWarnings("LoggingSimilarMessage")
 @Controller
@@ -32,19 +32,19 @@ public class DocumentTextFormControllerImpl implements DocumentTextFormControlle
     @SuppressWarnings({"FieldCanBeLocal", "unused"})
     private final DocumentTextCommandConverterImpl documentTextCommandConverter;
     private final DocumentTextConverterImpl documentTextConverter;
-    private final DocumentTextCommandValidator documentTextCommandValidator;
+    private final DocumentTextCommandValidatorImpl documentTextCommandValidatorImpl;
 
 
     public DocumentTextFormControllerImpl(DocumentTextService documentTextService,
                                           DocumentTextCommandConverterImpl documentTextCommandConverter,
                                           DocumentTextConverterImpl documentTextConverter,
-                                          DocumentTextCommandValidator documentTextCommandValidator) {
+                                          DocumentTextCommandValidatorImpl documentTextCommandValidatorImpl) {
         this.documentTextService = documentTextService;
         this.documentTextCommandConverter = documentTextCommandConverter;
 
 
         this.documentTextConverter = documentTextConverter;
-        this.documentTextCommandValidator = documentTextCommandValidator;
+        this.documentTextCommandValidatorImpl = documentTextCommandValidatorImpl;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -69,7 +69,7 @@ public class DocumentTextFormControllerImpl implements DocumentTextFormControlle
     public String saveOrUpdate(@Valid @ModelAttribute DocumentTextCommand documentTextCommand, BindingResult bindingResult, Model model) {
         logger.debug("DocumentTextFormControllerImpl::saveOrUpdate");
 
-        documentTextCommandValidator.validate(documentTextCommand, bindingResult);
+        documentTextCommandValidatorImpl.validate(documentTextCommand, bindingResult);
 
 
         if (bindingResult.hasErrors()) {

src/main/java/scot/carricksoftware/grants/controllers/text/persontext/PersonTextFormControllerImpl.java

@@ -22,7 +22,7 @@ import scot.carricksoftware.grants.converters.text.persontext.PersonTextCommandC
 import scot.carricksoftware.grants.converters.text.persontext.PersonTextConverterImpl;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.text.persontext.PersonTextService;
-import scot.carricksoftware.grants.validators.text.PersonTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.PersonTextCommandValidatorImpl;
 
 @SuppressWarnings("LoggingSimilarMessage")
 @Controller
@@ -33,21 +33,21 @@ public class PersonTextFormControllerImpl implements PersonTextFormController {
     @SuppressWarnings({"FieldCanBeLocal", "unused"})
     private final PersonTextCommandConverterImpl personTextCommandConverter;
     private final PersonTextConverterImpl personTextConverter;
-    private final PersonTextCommandValidator personTextCommandValidator;
+    private final PersonTextCommandValidatorImpl personTextCommandValidatorImpl;
     private final PersonService personService;
 
 
     public PersonTextFormControllerImpl(PersonTextService personTextService,
                                         PersonTextCommandConverterImpl personTextCommandConverter,
                                         PersonTextConverterImpl personTextConverter,
-                                        PersonTextCommandValidator personTextCommandValidator,
+                                        PersonTextCommandValidatorImpl personTextCommandValidatorImpl,
                                         PersonService personService) {
         this.personTextService = personTextService;
         this.personTextCommandConverter = personTextCommandConverter;
 
 
         this.personTextConverter = personTextConverter;
-        this.personTextCommandValidator = personTextCommandValidator;
+        this.personTextCommandValidatorImpl = personTextCommandValidatorImpl;
         this.personService = personService;
     }
 
@@ -75,7 +75,7 @@ public class PersonTextFormControllerImpl implements PersonTextFormController {
     public String saveOrUpdate(@Valid @ModelAttribute PersonTextCommand personTextCommand, BindingResult bindingResult, Model model) {
         logger.debug("PersonTextFormControllerImpl::saveOrUpdate");
 
-        personTextCommandValidator.validate(personTextCommand, bindingResult);
+        personTextCommandValidatorImpl.validate(personTextCommand, bindingResult);
 
 
         if (bindingResult.hasErrors()) {

src/main/java/scot/carricksoftware/grants/validators/text/AppendixTextCommandValidator.java

@@ -1,49 +1,13 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 09:50. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
 package scot.carricksoftware.grants.validators.text;
 
-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.text.AppendixTextCommand;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.ValidationConstants;
-import scot.carricksoftware.grants.validators.helpers.ValidateTypes;
-
-@SuppressWarnings("unused")
-@Component
-public class AppendixTextCommandValidator {
-
-    private static final Logger logger = LogManager.getLogger(AppendixTextCommandValidator.class);
-
-    private final ValidateTypes validateTypes;
-
-    public AppendixTextCommandValidator(ValidateTypes validateTypes) {
-        this.validateTypes = validateTypes;
-    }
-
-    public void validate(AppendixTextCommand appendixTextCommand, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validate");
-        validateOrder(appendixTextCommand.getOrder(), bindingResult);
-        validateLevel(appendixTextCommand.getLevel(), bindingResult);
-    }
-
-    private void validateLevel(String level, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validateLevel");
-        validateTypes.validateIntegerRange(level, ApplicationConstants.LATEX_BOOK, ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
-                ValidationConstants.LEVEL_IS_NULL, ValidationConstants.LEVEL_IS_INVALID, ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS, bindingResult);
-    }
-
-    private void validateOrder(String order, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validateOrder");
-        validateTypes.validateNonNegativeInteger(order, "order",ValidationConstants.ORDER_IS_NULL,
-                ValidationConstants.ORDER_IS_INVALID, ValidationConstants.ORDER_IS_NEGATIVE,bindingResult);
-    }
-
 
+public interface AppendixTextCommandValidator {
+    void validate(AppendixTextCommand appendixTextCommand, BindingResult bindingResult);
 }
-

src/main/java/scot/carricksoftware/grants/validators/text/AppendixTextCommandValidatorImpl.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 09:50. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.validators.text;
+
+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.text.AppendixTextCommand;
+import scot.carricksoftware.grants.constants.ApplicationConstants;
+import scot.carricksoftware.grants.constants.ValidationConstants;
+import scot.carricksoftware.grants.validators.helpers.ValidateTypes;
+
+@SuppressWarnings("unused")
+@Component
+public class AppendixTextCommandValidatorImpl implements AppendixTextCommandValidator {
+
+    private static final Logger logger = LogManager.getLogger(AppendixTextCommandValidatorImpl.class);
+
+    private final ValidateTypes validateTypes;
+
+    public AppendixTextCommandValidatorImpl(ValidateTypes validateTypes) {
+        this.validateTypes = validateTypes;
+    }
+
+    @Override
+    public void validate(AppendixTextCommand appendixTextCommand, BindingResult bindingResult) {
+        logger.debug("PersonTextCommandValidator::validate");
+        validateOrder(appendixTextCommand.getOrder(), bindingResult);
+        validateLevel(appendixTextCommand.getLevel(), bindingResult);
+    }
+
+    private void validateLevel(String level, BindingResult bindingResult) {
+        logger.debug("PersonTextCommandValidator::validateLevel");
+        validateTypes.validateIntegerRange(level, ApplicationConstants.LATEX_BOOK, ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
+                ValidationConstants.LEVEL_IS_NULL, ValidationConstants.LEVEL_IS_INVALID, ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS, bindingResult);
+    }
+
+    private void validateOrder(String order, BindingResult bindingResult) {
+        logger.debug("PersonTextCommandValidator::validateOrder");
+        validateTypes.validateNonNegativeInteger(order, "order",ValidationConstants.ORDER_IS_NULL,
+                ValidationConstants.ORDER_IS_INVALID, ValidationConstants.ORDER_IS_NEGATIVE,bindingResult);
+    }
+
+
+}
+

src/main/java/scot/carricksoftware/grants/validators/text/DocumentTextCommandValidator.java

@@ -5,23 +5,15 @@
 
 package scot.carricksoftware.grants.validators.text;
 
-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.text.DocumentTextCommand;
 
 @SuppressWarnings("unused")
 @Component
-public class DocumentTextCommandValidator {
-
-    private static final Logger logger = LogManager.getLogger(DocumentTextCommandValidator.class);
-
-    public void validate(DocumentTextCommand documentTextCommand, BindingResult bindingResult) {
-      logger.debug("DocumentTextCommandValidator::validate");
-
-    }
+public interface DocumentTextCommandValidator {
 
+    void validate(DocumentTextCommand documentTextCommand, BindingResult bindingResult);
 
 }
 

src/main/java/scot/carricksoftware/grants/validators/text/DocumentTextCommandValidatorImpl.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 09:50. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.validators.text;
+
+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.text.DocumentTextCommand;
+
+@SuppressWarnings("unused")
+@Component
+public class DocumentTextCommandValidatorImpl implements DocumentTextCommandValidator {
+
+    private static final Logger logger = LogManager.getLogger(DocumentTextCommandValidatorImpl.class);
+
+    @Override
+    public void validate(DocumentTextCommand documentTextCommand, BindingResult bindingResult) {
+      logger.debug("DocumentTextCommandValidator::validate");
+
+    }
+
+
+}
+

src/main/java/scot/carricksoftware/grants/validators/text/PersonTextCommandValidator.java

@@ -5,51 +5,15 @@
 
 package scot.carricksoftware.grants.validators.text;
 
-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.text.PersonTextCommand;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.ValidationConstants;
-import scot.carricksoftware.grants.domains.people.Person;
-import scot.carricksoftware.grants.validators.helpers.ValidateTypes;
 
-@SuppressWarnings("unused")
-@Component
-public class PersonTextCommandValidator {
-
-    private static final Logger logger = LogManager.getLogger(PersonTextCommandValidator.class);
-
-    private final ValidateTypes validateTypes;
-
-    public PersonTextCommandValidator(ValidateTypes validateTypes) {
-        this.validateTypes = validateTypes;
-    }
 
-    public void validate(PersonTextCommand personTextCommand, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validate");
-        validatePerson(personTextCommand.getPerson(), bindingResult);
-        validateOrder(personTextCommand.getOrder(), bindingResult);
-        validateLevel(personTextCommand.getLevel(), bindingResult);
-    }
-
-    private void validateLevel(String level, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validateLevel");
-        validateTypes.validateIntegerRange(level, ApplicationConstants.LATEX_BOOK, ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
-                ValidationConstants.LEVEL_IS_NULL, ValidationConstants.LEVEL_IS_INVALID, ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS, bindingResult);
-    }
-
-    private void validatePerson(Person person, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validatePerson");
-        validateTypes.validatePerson(person, "person", ValidationConstants.PERSON_IS_NULL, bindingResult);
-    }
+@Component
+public interface PersonTextCommandValidator {
 
-    private void validateOrder(String order, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validateOrder");
-        validateTypes.validateNonNegativeInteger(order, "order",ValidationConstants.ORDER_IS_NULL,
-                ValidationConstants.ORDER_IS_INVALID, ValidationConstants.ORDER_IS_NEGATIVE,bindingResult);
-    }
+    void validate(PersonTextCommand personTextCommand, BindingResult bindingResult);
 
 }
 

src/main/java/scot/carricksoftware/grants/validators/text/PersonTextCommandValidatorImpl.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 09:50. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.validators.text;
+
+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.text.PersonTextCommand;
+import scot.carricksoftware.grants.constants.ApplicationConstants;
+import scot.carricksoftware.grants.constants.ValidationConstants;
+import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.validators.helpers.ValidateTypes;
+
+
+@Component
+public class PersonTextCommandValidatorImpl implements PersonTextCommandValidator {
+
+    private static final Logger logger = LogManager.getLogger(PersonTextCommandValidatorImpl.class);
+
+    private final ValidateTypes validateTypes;
+
+    public PersonTextCommandValidatorImpl(ValidateTypes validateTypes) {
+        this.validateTypes = validateTypes;
+    }
+
+    @Override
+    public void validate(PersonTextCommand personTextCommand, BindingResult bindingResult) {
+        logger.debug("PersonTextCommandValidator::validate");
+        validatePerson(personTextCommand.getPerson(), bindingResult);
+        validateOrder(personTextCommand.getOrder(), bindingResult);
+        validateLevel(personTextCommand.getLevel(), bindingResult);
+    }
+
+    private void validateLevel(String level, BindingResult bindingResult) {
+        logger.debug("PersonTextCommandValidator::validateLevel");
+        validateTypes.validateIntegerRange(level, ApplicationConstants.LATEX_BOOK, ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
+                ValidationConstants.LEVEL_IS_NULL, ValidationConstants.LEVEL_IS_INVALID, ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS, bindingResult);
+    }
+
+    private void validatePerson(Person person, BindingResult bindingResult) {
+        logger.debug("PersonTextCommandValidator::validatePerson");
+        validateTypes.validatePerson(person, "person", ValidationConstants.PERSON_IS_NULL, bindingResult);
+    }
+
+    private void validateOrder(String order, BindingResult bindingResult) {
+        logger.debug("PersonTextCommandValidator::validateOrder");
+        validateTypes.validateNonNegativeInteger(order, "order",ValidationConstants.ORDER_IS_NULL,
+                ValidationConstants.ORDER_IS_INVALID, ValidationConstants.ORDER_IS_NEGATIVE,bindingResult);
+    }
+
+}
+

src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/AppendixTextControllerSaveOrUpdateTest.java

@@ -18,7 +18,7 @@ import scot.carricksoftware.grants.controllers.text.appendixtext.AppendixTextFor
 import scot.carricksoftware.grants.converters.text.appendixtext.AppendixTextCommandConverterImpl;
 import scot.carricksoftware.grants.converters.text.appendixtext.AppendixTextConverterImpl;
 import scot.carricksoftware.grants.services.text.appendixtext.AppendixTextService;
-import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -47,7 +47,7 @@ public class AppendixTextControllerSaveOrUpdateTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private AppendixTextCommandValidator appendixTextCommandValidatorMock;
+    private AppendixTextCommandValidatorImpl appendixTextCommandValidatorImplMock;
 
 
     private AppendixTextCommand appendixTextCommand;
@@ -58,7 +58,7 @@ public class AppendixTextControllerSaveOrUpdateTest {
         appendixTextController = new AppendixTextFormControllerImpl(appendixTextServiceMock,
                 appendixTextCommandConverterMock,
                 appendixTextConverterMock,
-                appendixTextCommandValidatorMock);
+                appendixTextCommandValidatorImplMock);
         appendixTextCommand = new AppendixTextCommandImpl();
     }
 

src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/AppendixTextFormControllerTest.java

@@ -20,7 +20,7 @@ import scot.carricksoftware.grants.converters.text.appendixtext.AppendixTextComm
 import scot.carricksoftware.grants.converters.text.appendixtext.AppendixTextConverterImpl;
 import scot.carricksoftware.grants.domains.text.AppendixText;
 import scot.carricksoftware.grants.services.text.appendixtext.AppendixTextService;
-import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -51,14 +51,14 @@ public class AppendixTextFormControllerTest {
     private Model modelMock;
 
     @Mock
-    private AppendixTextCommandValidator appendixTextCommandValidatorMock;
+    private AppendixTextCommandValidatorImpl appendixTextCommandValidatorImplMock;
 
     @BeforeEach
     public void setUp() {
         appendixTextController = new AppendixTextFormControllerImpl(appendixTextServiceMock,
                 appendixTextCommandConverterMock,
                 appendixTextConverterMock,
-                appendixTextCommandValidatorMock);
+                appendixTextCommandValidatorImplMock);
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/AppendixTextFormControllerValidationTest.java

@@ -18,7 +18,7 @@ import scot.carricksoftware.grants.controllers.text.appendixtext.AppendixTextFor
 import scot.carricksoftware.grants.converters.text.appendixtext.AppendixTextCommandConverterImpl;
 import scot.carricksoftware.grants.converters.text.appendixtext.AppendixTextConverterImpl;
 import scot.carricksoftware.grants.services.text.appendixtext.AppendixTextService;
-import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidatorImpl;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
@@ -48,7 +48,7 @@ public class AppendixTextFormControllerValidationTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private AppendixTextCommandValidator appendixTextCommandValidatorMock;
+    private AppendixTextCommandValidatorImpl appendixTextCommandValidatorImplMock;
 
     @Mock
     private Model modelMock;
@@ -60,7 +60,7 @@ public class AppendixTextFormControllerValidationTest {
         appendixTextController = new AppendixTextFormControllerImpl(appendixTextServiceMock,
                 appendixTextCommandConverterMock,
                 appendixTextConverterMock,
-                appendixTextCommandValidatorMock);
+                appendixTextCommandValidatorImplMock);
     }
 
 
@@ -68,7 +68,7 @@ public class AppendixTextFormControllerValidationTest {
     public void saveOrUpdateValidationTest() {
         when(appendixTextServiceMock.saveAppendixTextCommand(any())).thenReturn(appendixTextCommandMock);
         appendixTextController.saveOrUpdate(appendixTextCommandMock, bindingResultMock, modelMock);
-        verify(appendixTextCommandValidatorMock).validate(appendixTextCommandMock, bindingResultMock);
+        verify(appendixTextCommandValidatorImplMock).validate(appendixTextCommandMock, bindingResultMock);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextControllerSaveOrUpdateTest.java

@@ -17,7 +17,7 @@ import scot.carricksoftware.grants.commands.text.DocumentTextCommandImpl;
 import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextCommandConverterImpl;
 import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextConverterImpl;
 import scot.carricksoftware.grants.services.text.documenttext.DocumentTextService;
-import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -46,7 +46,7 @@ public class DocumentTextControllerSaveOrUpdateTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private DocumentTextCommandValidator documentTextCommandValidatorMock;
+    private DocumentTextCommandValidatorImpl documentTextCommandValidatorImplMock;
 
     private DocumentTextCommand documentTextCommand;
 
@@ -56,7 +56,7 @@ public class DocumentTextControllerSaveOrUpdateTest {
         documentTextController = new DocumentTextFormControllerImpl(documentTextServiceMock,
                 documentTextCommandConverterMock,
                 documentTextConverterMock,
-                documentTextCommandValidatorMock);
+                documentTextCommandValidatorImplMock);
         documentTextCommand = new DocumentTextCommandImpl();
     }
 

src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextFormControllerTest.java

@@ -19,7 +19,7 @@ import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextComm
 import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextConverterImpl;
 import scot.carricksoftware.grants.domains.text.DocumentText;
 import scot.carricksoftware.grants.services.text.documenttext.DocumentTextService;
-import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.verify;
@@ -48,7 +48,7 @@ public class DocumentTextFormControllerTest {
     private Model modelMock;
 
     @Mock
-    private DocumentTextCommandValidator documentTextCommandValidatorMock;
+    private DocumentTextCommandValidatorImpl documentTextCommandValidatorImplMock;
 
 
     @BeforeEach
@@ -56,7 +56,7 @@ public class DocumentTextFormControllerTest {
         documentTextController = new DocumentTextFormControllerImpl(documentTextServiceMock,
                 documentTextCommandConverterMock,
                 documentTextConverterMock,
-                documentTextCommandValidatorMock);
+                documentTextCommandValidatorImplMock);
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextFormControllerValidationTest.java

@@ -17,7 +17,7 @@ import scot.carricksoftware.grants.commands.text.DocumentTextCommand;
 import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextCommandConverterImpl;
 import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextConverterImpl;
 import scot.carricksoftware.grants.services.text.documenttext.DocumentTextService;
-import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidatorImpl;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
@@ -47,7 +47,7 @@ public class DocumentTextFormControllerValidationTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private DocumentTextCommandValidator documentTextCommandValidatorMock;
+    private DocumentTextCommandValidatorImpl documentTextCommandValidatorImplMock;
 
     @Mock
     private Model modelMock;
@@ -58,7 +58,7 @@ public class DocumentTextFormControllerValidationTest {
         documentTextController = new DocumentTextFormControllerImpl(documentTextServiceMock,
                 documentTextCommandConverterMock,
                 documentTextConverterMock,
-                documentTextCommandValidatorMock);
+                documentTextCommandValidatorImplMock);
     }
 
 
@@ -66,7 +66,7 @@ public class DocumentTextFormControllerValidationTest {
     public void saveOrUpdateValidationTest() {
         when(documentTextServiceMock.saveDocumentTextCommand(any())).thenReturn(documentTextCommandMock);
         documentTextController.saveOrUpdate(documentTextCommandMock, bindingResultMock, modelMock);
-        verify(documentTextCommandValidatorMock).validate(documentTextCommandMock, bindingResultMock);
+        verify(documentTextCommandValidatorImplMock).validate(documentTextCommandMock, bindingResultMock);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonTextControllerSaveOrUpdateTest.java

@@ -19,7 +19,7 @@ import scot.carricksoftware.grants.converters.text.persontext.PersonTextCommandC
 import scot.carricksoftware.grants.converters.text.persontext.PersonTextConverterImpl;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.text.persontext.PersonTextService;
-import scot.carricksoftware.grants.validators.text.PersonTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.PersonTextCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -48,7 +48,7 @@ public class PersonTextControllerSaveOrUpdateTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private PersonTextCommandValidator personTextCommandValidatorMock;
+    private PersonTextCommandValidatorImpl personTextCommandValidatorImplMock;
 
     @Mock
     private PersonService personServiceMock;
@@ -61,7 +61,7 @@ public class PersonTextControllerSaveOrUpdateTest {
         personTextController = new PersonTextFormControllerImpl(personTextServiceMock,
                 personTextCommandConverterMock,
                 personTextConverterMock,
-                personTextCommandValidatorMock,
+                personTextCommandValidatorImplMock,
                 personServiceMock);
         personTextCommand = new PersonTextCommandImpl();
     }

src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonTextFormControllerTest.java

@@ -21,7 +21,7 @@ import scot.carricksoftware.grants.converters.text.persontext.PersonTextConverte
 import scot.carricksoftware.grants.domains.text.PersonText;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.text.persontext.PersonTextService;
-import scot.carricksoftware.grants.validators.text.PersonTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.PersonTextCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -49,7 +49,7 @@ public class PersonTextFormControllerTest {
     private Model modelMock;
 
     @Mock
-    private PersonTextCommandValidator personTextCommandValidatorMock;
+    private PersonTextCommandValidatorImpl personTextCommandValidatorImplMock;
 
     @Mock
     private PersonService personServiceMock;
@@ -60,7 +60,7 @@ public class PersonTextFormControllerTest {
         personTextController = new PersonTextFormControllerImpl(personTextServiceMock,
                 personTextCommandConverterMock,
                 personTextConverterMock,
-                personTextCommandValidatorMock,
+                personTextCommandValidatorImplMock,
                 personServiceMock);
     }
 

src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonTextFormControllerValidationTest.java

@@ -19,7 +19,7 @@ import scot.carricksoftware.grants.converters.text.persontext.PersonTextCommandC
 import scot.carricksoftware.grants.converters.text.persontext.PersonTextConverterImpl;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.text.persontext.PersonTextService;
-import scot.carricksoftware.grants.validators.text.PersonTextCommandValidator;
+import scot.carricksoftware.grants.validators.text.PersonTextCommandValidatorImpl;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
@@ -49,7 +49,7 @@ public class PersonTextFormControllerValidationTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private PersonTextCommandValidator personTextCommandValidatorMock;
+    private PersonTextCommandValidatorImpl personTextCommandValidatorImplMock;
 
     @Mock
     private Model modelMock;
@@ -63,7 +63,7 @@ public class PersonTextFormControllerValidationTest {
         personTextController = new PersonTextFormControllerImpl(personTextServiceMock,
                 personTextCommandConverterMock,
                 personTextConverterMock,
-                personTextCommandValidatorMock,
+                personTextCommandValidatorImplMock,
                 personServiceMock);
     }
 
@@ -72,7 +72,7 @@ public class PersonTextFormControllerValidationTest {
     public void saveOrUpdateValidationTest() {
         when(personTextServiceMock.savePersonTextCommand(any())).thenReturn(personTextCommandMock);
         personTextController.saveOrUpdate(personTextCommandMock, bindingResultMock, modelMock);
-        verify(personTextCommandValidatorMock).validate(personTextCommandMock, bindingResultMock);
+        verify(personTextCommandValidatorImplMock).validate(personTextCommandMock, bindingResultMock);
     }
 
 

src/test/java/scot/carricksoftware/grants/validators/text/PersonTextCommandValidatorImplTest.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.validators.text;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import scot.carricksoftware.grants.validators.helpers.ValidateTypes;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+class PersonTextCommandValidatorImplTest {
+
+    private PersonTextCommandValidatorImpl validator;
+
+    @Mock
+    ValidateTypes validateTypesMock;
+
+
+    @BeforeEach
+    void setUp() {
+        validator = new PersonTextCommandValidatorImpl(validateTypesMock);
+    }
+
+    @Test
+    void constructorTest() {
+        assertNotNull(validator);
+    }
+}