CapitaliseBirthCertificate refactored

src/main/java/scot/carricksoftware/grants/capitalisation/Capitalise.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificate.java

@@ -3,12 +3,12 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
 
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 
-public interface Capitalise {
+public interface CapitaliseBirthCertificate {
 
     @SuppressWarnings({"unused", "EmptyMethod"})
-    void capitaliseBirthCertificateCommand(BirthCertificateCommand command);
+    void capitalise(BirthCertificateCommand command);
 }

src/main/java/scot/carricksoftware/grants/capitalisation/CapitaliseImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateImpl.java

@@ -3,22 +3,23 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
 
 import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 
 @Component
-public class CapitaliseImpl implements Capitalise {
+public class CapitaliseBirthCertificateImpl implements CapitaliseBirthCertificate {
 
    private final CapitaliseString capitaliseString;
 
-    public CapitaliseImpl(CapitaliseString capitaliseString) {
+    public CapitaliseBirthCertificateImpl(CapitaliseString capitaliseString) {
         this.capitaliseString = capitaliseString;
     }
 
     @Override
-    public void capitaliseBirthCertificateCommand(BirthCertificateCommand birthCertificateCommand) {
+    public void capitalise(BirthCertificateCommand birthCertificateCommand) {
         birthCertificateCommand.setInformantQualification(capitaliseString.capitalise(birthCertificateCommand.getInformantQualification()));
         birthCertificateCommand.setUntrackedWhereBorn(capitaliseString.capitalise(birthCertificateCommand.getUntrackedWhereBorn()));
         birthCertificateCommand.setUntrackedFather(capitaliseString.capitalise(birthCertificateCommand.getUntrackedFather()));

src/main/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.Capitalise;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
@@ -43,7 +43,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     private final PersonService personService;
     private final PlaceService placeService;
     private final OrganisationService organisationService;
-    private final Capitalise capitalise;
+    private final CapitaliseBirthCertificate capitaliseBirthCertificate;
 
 
     public BirthCertificateFormControllerImpl(BirthCertificateService birthCertificateService,
@@ -52,7 +52,8 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
                                               BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImpl,
                                               PersonService personService,
                                               PlaceService placeService,
-                                              OrganisationService organisationService, Capitalise capitalise) {
+                                              OrganisationService organisationService,
+                                              CapitaliseBirthCertificate capitaliseBirthCertificate) {
         this.birthCertificateService = birthCertificateService;
         this.birthCertificateCommandConverter = birthCertificateCommandConverter;
 
@@ -62,7 +63,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         this.personService = personService;
         this.placeService = placeService;
         this.organisationService = organisationService;
-        this.capitalise = capitalise;
+        this.capitaliseBirthCertificate = capitaliseBirthCertificate;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -96,7 +97,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");
 
         birthCertificateCommandValidatorImpl.validate(birthCertificateCommand, bindingResult);
-        capitalise.capitaliseBirthCertificateCommand(birthCertificateCommand);
+        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
 
 
         if (bindingResult.hasErrors()) {

src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseBirthCertificateCommandTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseBirthCertificateBirthCertificateCommandTest.java

@@ -9,22 +9,24 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseBirthCertificateCommandTest {
+class CapitaliseBirthCertificateBirthCertificateCommandTest {
 
     private final CapitaliseStringImpl capitaliseString = new CapitaliseStringImpl();
 
     @SuppressWarnings("unused")
-    private Capitalise capitalise;
+    private CapitaliseBirthCertificate capitaliseBirthCertificate;
 
     @BeforeEach
     void setUp() {
-        capitalise = new CapitaliseImpl(capitaliseString);
+        capitaliseBirthCertificate = new CapitaliseBirthCertificateImpl(capitaliseString);
     }
 
     @Test
@@ -37,7 +39,7 @@ class CapitaliseBirthCertificateCommandTest {
         command.setWhenBorn("lower5");
         command.setCertificateNumber("lower6");
 
-        capitalise.capitaliseBirthCertificateCommand(command);
+        capitaliseBirthCertificate.capitalise(command);
         assertEquals("Lower1", command.getInformantQualification());
         assertEquals("Lower2", command.getUntrackedInformant());
         assertEquals("Lower3", command.getUntrackedWhereBorn());

src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseLengthTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseBirthCertificateLengthTest.java

@@ -14,7 +14,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @ExtendWith(MockitoExtension.class)
-public class CapitaliseLengthTest {
+public class CapitaliseBirthCertificateLengthTest {
 
     private CapitaliseString capitaliseString;
 

src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseStringTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseBirthCertificateStringTest.java

@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-class CapitaliseStringTest {
+class CapitaliseBirthCertificateStringTest {
 
     private CapitaliseString capitaliseString;
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerCapitalisationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.Capitalise;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
@@ -57,7 +57,7 @@ public class BirthCertificateFormControllerCapitalisationTest {
     private OrganisationService organisationServiceMock;
 
     @Mock
-    private Capitalise capitaliseMock;
+    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
@@ -75,7 +75,7 @@ public class BirthCertificateFormControllerCapitalisationTest {
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock,
-                capitaliseMock);
+                capitaliseBirthCertificateMock);
     }
 
 
@@ -88,7 +88,7 @@ public class BirthCertificateFormControllerCapitalisationTest {
 
         birthCertificateController.saveOrUpdate(birthCertificateCommand, bindingResultMock, modelMock);
 
-        verify(capitaliseMock).capitaliseBirthCertificateCommand(birthCertificateCommand);
+        verify(capitaliseBirthCertificateMock).capitalise(birthCertificateCommand);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.Capitalise;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
@@ -53,7 +53,7 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
     private OrganisationService organisationServiceMock;
 
     @Mock
-    private Capitalise capitaliseMock;
+    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
     @Mock
     Model modelMock;
@@ -75,7 +75,7 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock,
-                capitaliseMock);
+                capitaliseBirthCertificateMock);
         birthCertificateCommand = new BirthCertificateCommandImpl();
     }
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerTest.java

@@ -13,7 +13,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.Capitalise;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
@@ -61,7 +61,7 @@ public class BirthCertificateFormControllerTest {
     private Model modelMock;
 
     @Mock
-    private Capitalise capitaliseMock;
+    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
@@ -76,7 +76,7 @@ public class BirthCertificateFormControllerTest {
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock,
-                capitaliseMock);
+                capitaliseBirthCertificateMock);
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerValidationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.Capitalise;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
@@ -57,7 +57,7 @@ public class BirthCertificateFormControllerValidationTest {
     private OrganisationService organisationServiceMock;
 
     @Mock
-    private Capitalise capitaliseMock;
+    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
@@ -75,7 +75,7 @@ public class BirthCertificateFormControllerValidationTest {
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock,
-                capitaliseMock);
+                capitaliseBirthCertificateMock);
     }