CapitaliseString of BirthCertificateFormControllerImpl

src/main/java/scot/carricksoftware/grants/capitalisation/CapitaliseImpl.java

@@ -5,16 +5,27 @@
 
 package scot.carricksoftware.grants.capitalisation;
 
+import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 
+@Component
 public class CapitaliseImpl implements Capitalise {
 
    @SuppressWarnings("unused")
-   private  CapitaliseString capitaliseString;
+   private final CapitaliseString capitaliseString;
 
-    @Override
-    public void capitalise(BirthCertificateCommand command) {
+    public CapitaliseImpl(CapitaliseString capitaliseString) {
+        this.capitaliseString = capitaliseString;
+    }
 
+    @Override
+    public void capitalise(BirthCertificateCommand birthCertificateCommand) {
+        birthCertificateCommand.setInformantQualification(capitaliseString.capitalise(birthCertificateCommand.getInformantQualification()));
+        birthCertificateCommand.setUntrackedWhereBorn(capitaliseString.capitalise(birthCertificateCommand.getUntrackedWhereBorn()));
+        birthCertificateCommand.setUntrackedFather(capitaliseString.capitalise(birthCertificateCommand.getUntrackedFather()));
+        birthCertificateCommand.setUntrackedInformant(capitaliseString.capitalise(birthCertificateCommand.getUntrackedInformant()));
+        birthCertificateCommand.setWhenBorn(capitaliseString.capitalise(birthCertificateCommand.getWhenBorn()));
+        birthCertificateCommand.setCertificateNumber(capitaliseString.capitalise(birthCertificateCommand.getCertificateNumber()));
     }
 
 

src/main/java/scot/carricksoftware/grants/capitalisation/CapitaliseStringImpl.java

@@ -7,9 +7,11 @@ package scot.carricksoftware.grants.capitalisation;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
 
 import java.util.Locale;
 
+@Component
 public class CapitaliseStringImpl implements CapitaliseString {
 
     private static final Logger logger = LogManager.getLogger(CapitaliseStringImpl.class);

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

@@ -15,13 +15,13 @@ 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.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.constants.CertificateMappingConstants;
 import scot.carricksoftware.grants.constants.MappingConstants;
 import scot.carricksoftware.grants.constants.ViewConstants;
-import scot.carricksoftware.grants.converters.Capitalisation;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
@@ -43,7 +43,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     private final PersonService personService;
     private final PlaceService placeService;
     private final OrganisationService organisationService;
-    private final Capitalisation capitalisation;
+    private final Capitalise capitalise;
 
 
     public BirthCertificateFormControllerImpl(BirthCertificateService birthCertificateService,
@@ -52,8 +52,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
                                               BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImpl,
                                               PersonService personService,
                                               PlaceService placeService,
-                                              OrganisationService organisationService,
-                                              Capitalisation capitalisation) {
+                                              OrganisationService organisationService, Capitalise capitalise) {
         this.birthCertificateService = birthCertificateService;
         this.birthCertificateCommandConverter = birthCertificateCommandConverter;
 
@@ -63,7 +62,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         this.personService = personService;
         this.placeService = placeService;
         this.organisationService = organisationService;
-        this.capitalisation = capitalisation;
+        this.capitalise = capitalise;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -97,8 +96,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");
 
         birthCertificateCommandValidatorImpl.validate(birthCertificateCommand, bindingResult);
-        birthCertificateCommand.setUntrackedWhereBorn(capitalisation.getCapitalisation(birthCertificateCommand.getUntrackedWhereBorn()));
-        birthCertificateCommand.setUntrackedFather(capitalisation.getCapitalisation(birthCertificateCommand.getUntrackedFather()));
+        capitalise.capitalise(birthCertificateCommand);
 
 
         if (bindingResult.hasErrors()) {

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

@@ -12,10 +12,9 @@ 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.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
-import scot.carricksoftware.grants.converters.Capitalisation;
-import scot.carricksoftware.grants.converters.CapitalisationImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
@@ -53,6 +52,8 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
     @Mock
     private OrganisationService organisationServiceMock;
 
+    @Mock
+    private Capitalise capitaliseMock;
 
     @Mock
     Model modelMock;
@@ -65,10 +66,8 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
 
     private BirthCertificateCommand birthCertificateCommand;
 
-
     @BeforeEach
     public void setUp() {
-        Capitalisation capitalisation = new CapitalisationImpl();
         birthCertificateController = new BirthCertificateFormControllerImpl(birthCertificateServiceMock,
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
@@ -76,7 +75,7 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock,
-                capitalisation);
+                capitaliseMock);
         birthCertificateCommand = new BirthCertificateCommandImpl();
     }
 
@@ -97,7 +96,7 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
     }
 
     @Test
-    public void capitalisationIsAppliedIsAppliedTest() {
+    public void capitalisationIsAppliedTest() {
         String whereBorn = "where born";
         String untrackedFather = "untracked father";
         birthCertificateCommand.setUntrackedWhereBorn(whereBorn);
@@ -105,8 +104,8 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
         when(birthCertificateServiceMock.saveBirthCertificateCommand(any(BirthCertificateCommand.class))).thenReturn(birthCertificateCommand);
 
         birthCertificateController.saveOrUpdate(birthCertificateCommand, bindingResultMock, modelMock);
-        assertEquals("Where Born", birthCertificateCommand.getUntrackedWhereBorn());
-        assertEquals("Untracked Father", birthCertificateCommand.getUntrackedFather());
+        assertEquals("where born", birthCertificateCommand.getUntrackedWhereBorn());
+        assertEquals("untracked father", birthCertificateCommand.getUntrackedFather());
     }
 
 

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

@@ -13,9 +13,9 @@ 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.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
-import scot.carricksoftware.grants.converters.Capitalisation;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.domains.certificates.BirthCertificate;
@@ -61,7 +61,7 @@ public class BirthCertificateFormControllerTest {
     private Model modelMock;
 
     @Mock
-    private Capitalisation capitalisationMock;
+    private Capitalise capitaliseMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
@@ -76,7 +76,7 @@ public class BirthCertificateFormControllerTest {
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock,
-                capitalisationMock);
+                capitaliseMock);
     }
 
     @Test

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

@@ -13,9 +13,9 @@ 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.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
-import scot.carricksoftware.grants.converters.Capitalisation;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
@@ -57,7 +57,7 @@ public class BirthCertificateFormControllerValidationTest {
     private OrganisationService organisationServiceMock;
 
     @Mock
-    private Capitalisation capitalisationMock;
+    private Capitalise capitaliseMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
@@ -75,7 +75,7 @@ public class BirthCertificateFormControllerValidationTest {
                 personServiceMock,
                 placeServiceMock,
                 organisationServiceMock,
-                capitalisationMock);
+                capitaliseMock);
     }