BirthCertificateCommand Validators refactor(2)

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

@@ -5,12 +5,9 @@
 
 package scot.carricksoftware.grants.validators.certificates.birthcertificate;
 
-import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 
-
-@Component
 public interface BirthCertificateCommandPartOneValidator {
 
 

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartThreeValidator.java

@@ -5,12 +5,9 @@
 
 package scot.carricksoftware.grants.validators.certificates.birthcertificate;
 
-import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 
-
-@Component
 public interface BirthCertificateCommandPartThreeValidator {
 
 

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartTwoValidator.java

@@ -5,11 +5,12 @@
 
 package scot.carricksoftware.grants.validators.certificates.birthcertificate;
 
-import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 
-@Component
 public interface BirthCertificateCommandPartTwoValidator {
 
 
+    void validate(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult);
 }
 

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartTwoValidatorImpl.java

@@ -24,6 +24,7 @@ public class BirthCertificateCommandPartTwoValidatorImpl implements BirthCertifi
         this.validateTypes = validateTypes;
     }
 
+    @Override
     public void validate(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating birth certificate command (part two)");
 

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandValidator.java

@@ -5,10 +5,12 @@
 
 package scot.carricksoftware.grants.validators.certificates.birthcertificate;
 
-import org.springframework.stereotype.Component;
 
-@Component
+import org.springframework.validation.BindingResult;
+import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
+
 public interface BirthCertificateCommandValidator {
 
+    void validate(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult);
 }
 

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandValidatorImpl.java

@@ -15,19 +15,19 @@ import scot.carricksoftware.grants.commands.certificates.birthcertificates.Birth
 public class BirthCertificateCommandValidatorImpl implements BirthCertificateCommandValidator {
     private static final Logger logger = LogManager.getLogger(BirthCertificateCommandValidatorImpl.class);
 
-    private final BirthCertificateCommandPartOneValidatorImpl partOneValidator;
-    private final BirthCertificateCommandPartTwoValidatorImpl partTwoValidator;
-    private final BirthCertificateCommandPartThreeValidatorImpl partThreeValidator;
+    private final BirthCertificateCommandPartOneValidator partOneValidator;
+    private final BirthCertificateCommandPartTwoValidator partTwoValidator;
+    private final BirthCertificateCommandPartThreeValidator partThreeValidator;
 
-    public BirthCertificateCommandValidatorImpl(BirthCertificateCommandPartOneValidatorImpl partOneValidator,
-                                                BirthCertificateCommandPartTwoValidatorImpl partTwoValidator,
-                                                BirthCertificateCommandPartThreeValidatorImpl partThreeValidator) {
+    public BirthCertificateCommandValidatorImpl(BirthCertificateCommandPartOneValidator partOneValidator,
+                                                BirthCertificateCommandPartTwoValidator partTwoValidator,
+                                                BirthCertificateCommandPartThreeValidator partThreeValidator) {
         this.partOneValidator = partOneValidator;
         this.partTwoValidator = partTwoValidator;
         this.partThreeValidator = partThreeValidator;
     }
 
-
+    @Override
     public void validate(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating birth certificate command");
 
@@ -37,6 +37,5 @@ public class BirthCertificateCommandValidatorImpl implements BirthCertificateCom
     }
 
 
-
 }