Images: fileName added to domain and command

src/main/java/scot/carricksoftware/grants/commands/images/ImageCommand.java

@@ -21,4 +21,8 @@ public interface ImageCommand {
 
     @SuppressWarnings("unused")
     void setImageData(byte[] imageData);
+
+    String getFilename();
+
+    void setFilename(String filename);
 }

src/main/java/scot/carricksoftware/grants/commands/images/ImageCommandImpl.java

@@ -13,6 +13,7 @@ public class ImageCommandImpl implements ImageCommand{
     Long Id;
     private String name;
     private byte[] imageData;
+    private String filename;
 
     @Override
     public Long getId() {
@@ -43,4 +44,14 @@ public class ImageCommandImpl implements ImageCommand{
     public void setImageData(byte[] imageData) {
         this.imageData = imageData;
     }
+
+    @Override
+    public String getFilename() {
+        return filename;
+    }
+
+    @Override
+    public void setFilename(String filename) {
+        this.filename = filename;
+    }
 }

src/test/java/scot/carricksoftware/grants/GenerateRandomTextValues.java

@@ -78,5 +78,4 @@ public class GenerateRandomTextValues {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/cache/BMDOrganisationsCacheTest.java

@@ -26,7 +26,7 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrg
 
 @ExtendWith(MockitoExtension.class)
 public class BMDOrganisationsCacheTest {
-    
+
     @Mock
     PersonService personServiceMock;
 
@@ -50,22 +50,22 @@ public class BMDOrganisationsCacheTest {
 
     @Test
     void nullOrganisationsTest() {
-        assertEquals(organisationsList,cache.getOrganisations());
+        assertEquals(organisationsList, cache.getOrganisations());
         verify(organisationServiceMock).findAll();
     }
 
     @Test
     void alreadyExistsTest() {
-        assertEquals(organisationsList,cache.getOrganisations());
-        assertEquals(organisationsList,cache.getOrganisations());
+        assertEquals(organisationsList, cache.getOrganisations());
+        assertEquals(organisationsList, cache.getOrganisations());
         verify(organisationServiceMock, times(1)).findAll();
     }
 
     @Test
     void invalidateTest() {
-        assertEquals(organisationsList,cache.getOrganisations());
+        assertEquals(organisationsList, cache.getOrganisations());
         cache.invalidateOrganisations();
-        assertEquals(organisationsList,cache.getOrganisations());
+        assertEquals(organisationsList, cache.getOrganisations());
         verify(organisationServiceMock, times(2)).findAll();
     }
 }

src/test/java/scot/carricksoftware/grants/cache/BMDPeopleCacheTest.java

@@ -50,22 +50,22 @@ public class BMDPeopleCacheTest {
 
     @Test
     void nullPeopleTest() {
-        assertEquals(peopleList,cache.getPeople());
+        assertEquals(peopleList, cache.getPeople());
         verify(personServiceMock).findAll();
     }
 
     @Test
     void alreadyExistsTest() {
-        assertEquals(peopleList,cache.getPeople());
-        assertEquals(peopleList,cache.getPeople());
+        assertEquals(peopleList, cache.getPeople());
+        assertEquals(peopleList, cache.getPeople());
         verify(personServiceMock, times(1)).findAll();
     }
 
     @Test
     void invalidateTest() {
-        assertEquals(peopleList,cache.getPeople());
+        assertEquals(peopleList, cache.getPeople());
         cache.invalidatePeople();
-        assertEquals(peopleList,cache.getPeople());
+        assertEquals(peopleList, cache.getPeople());
         verify(personServiceMock, times(2)).findAll();
     }
 }

src/test/java/scot/carricksoftware/grants/cache/BMDPlacesCacheTest.java

@@ -51,22 +51,22 @@ public class BMDPlacesCacheTest {
 
     @Test
     void nullPlacesTest() {
-        assertEquals(placesList,cache.getPlaces());
+        assertEquals(placesList, cache.getPlaces());
         verify(placeServiceMock).findAll();
     }
 
     @Test
     void alreadyExistsTest() {
-        assertEquals(placesList,cache.getPlaces());
-        assertEquals(placesList,cache.getPlaces());
+        assertEquals(placesList, cache.getPlaces());
+        assertEquals(placesList, cache.getPlaces());
         verify(placeServiceMock, times(1)).findAll();
     }
 
     @Test
     void invalidateTest() {
-        assertEquals(placesList,cache.getPlaces());
+        assertEquals(placesList, cache.getPlaces());
         cache.invalidatePlaces();
-        assertEquals(placesList,cache.getPlaces());
+        assertEquals(placesList, cache.getPlaces());
         verify(placeServiceMock, times(2)).findAll();
     }
 }

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificatesPartOneTest.java

@@ -88,5 +88,4 @@ class CapitaliseMarriageCertificatesPartOneTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificatesPartTwoTest.java

@@ -59,6 +59,4 @@ class CapitaliseMarriageCertificatesPartTwoTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/commands/images/ImageCommandTest.java

@@ -57,6 +57,17 @@ class ImageCommandTest {
         assertArrayEquals(string.getBytes(), imageCommand.getImageData());
     }
 
+    @Test
+    public void getFilenameTest() {
+        assertNull(imageCommand.getFilename());
+    }
+
+    @Test
+    public void setFilenameTest() {
+        String filename = GetRandomString();
+        imageCommand.setFilename(filename);
+        assertEquals(filename, imageCommand.getFilename());
+    }
 
 
 }

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

@@ -79,13 +79,13 @@ public class BirthCertificateFormControllerAttributesTest {
 
     @Test
     public void newCertificateTest() {
-        assertEquals("certificates/birthCertificate/form",birthCertificateFormController.getNewBirthCertificate(modelMock));
+        assertEquals("certificates/birthCertificate/form", birthCertificateFormController.getNewBirthCertificate(modelMock));
         verify(addAttributesMock).AddBMDCertificate(modelMock);
     }
 
     @Test
     public void editCertificateTest() {
-        assertEquals("certificates/birthCertificate/form",birthCertificateFormController.birthCertificateEdit(GetRandomLong().toString(), modelMock));
+        assertEquals("certificates/birthCertificate/form", birthCertificateFormController.birthCertificateEdit(GetRandomLong().toString(), modelMock));
         verify(addAttributesMock).AddBMDCertificate(modelMock);
     }
 

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

@@ -64,7 +64,6 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
     private BirthCertificateCommand birthCertificateCommand;
 
 
-
     @BeforeEach
     public void setUp() {
         birthCertificateController = new BirthCertificateFormControllerImpl(birthCertificateServiceMock,

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

@@ -97,5 +97,4 @@ public class BirthCertificateFormControllerTest {
     }
 
 
-
 }

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

@@ -79,13 +79,13 @@ public class DeathCertificateFormControllerAttributesTest {
 
     @Test
     public void newCertificateTest() {
-        assertEquals("certificates/deathCertificate/form",deathCertificateFormController.getNewDeathCertificate(modelMock));
+        assertEquals("certificates/deathCertificate/form", deathCertificateFormController.getNewDeathCertificate(modelMock));
         verify(addAttributesMock).AddBMDCertificate(modelMock);
     }
 
     @Test
     public void editCertificateTest() {
-        assertEquals("certificates/deathCertificate/form",deathCertificateFormController.deathCertificateEdit(GetRandomLong().toString(), modelMock));
+        assertEquals("certificates/deathCertificate/form", deathCertificateFormController.deathCertificateEdit(GetRandomLong().toString(), modelMock));
         verify(addAttributesMock).AddBMDCertificate(modelMock);
     }
 

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

@@ -79,13 +79,13 @@ public class MarriageCertificateFormControllerAttributesTest {
 
     @Test
     public void newCertificateTest() {
-        assertEquals("certificates/marriageCertificate/form",marriageCertificateFormController.getNewMarriageCertificate(modelMock));
+        assertEquals("certificates/marriageCertificate/form", marriageCertificateFormController.getNewMarriageCertificate(modelMock));
         verify(addAttributesMock).AddBMDCertificate(modelMock);
     }
 
     @Test
     public void editCertificateTest() {
-        assertEquals("certificates/marriageCertificate/form",marriageCertificateFormController.marriageCertificateEdit(GetRandomLong().toString(), modelMock));
+        assertEquals("certificates/marriageCertificate/form", marriageCertificateFormController.marriageCertificateEdit(GetRandomLong().toString(), modelMock));
         verify(addAttributesMock).AddBMDCertificate(modelMock);
     }
 

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

@@ -54,7 +54,6 @@ public class AppendixTextFormControllerValidationTest {
     private Model modelMock;
 
 
-
     @BeforeEach
     public void setUp() {
         appendixTextController = new AppendixTextFormControllerImpl(appendixTextServiceMock,

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/certificate/MarriageCertificateBrideConverterTest.java

@@ -20,7 +20,7 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 class MarriageCertificateBrideConverterTest {
 
     private MarriageCertificateBrideConverter converter;
-   
+
     private MarriageCertificate source;
     private MarriageCertificateCommand target;
 
@@ -46,18 +46,17 @@ class MarriageCertificateBrideConverterTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getBride(),target.getBride());
-        assertEquals(source.getBrideUsualResidence(),target.getBrideUsualResidence());
-        assertEquals(source.getBrideAge(),target.getBrideAge());
-        assertEquals(source.getBrideCondition(),target.getBrideCondition());
-        assertEquals(source.getBrideFather(),target.getBrideFather());
-        assertEquals(source.getBrideFatherRank(),target.getBrideFatherRank());
-        assertEquals(source.getBrideRank(),target.getBrideRank());
-        assertEquals(source.getBrideUntrackedFather(),target.getBrideUntrackedFather());
-        assertEquals(source.getBrideUntrackedResidence(),target.getBrideUntrackedResidence());
-        assertEquals(source.getBrideUsualResidence(),target.getBrideUsualResidence());
-        
-  
+        assertEquals(source.getBride(), target.getBride());
+        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
+        assertEquals(source.getBrideAge(), target.getBrideAge());
+        assertEquals(source.getBrideCondition(), target.getBrideCondition());
+        assertEquals(source.getBrideFather(), target.getBrideFather());
+        assertEquals(source.getBrideFatherRank(), target.getBrideFatherRank());
+        assertEquals(source.getBrideRank(), target.getBrideRank());
+        assertEquals(source.getBrideUntrackedFather(), target.getBrideUntrackedFather());
+        assertEquals(source.getBrideUntrackedResidence(), target.getBrideUntrackedResidence());
+        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
+
 
     }
 

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/certificate/MarriageCertificateCertificateConverterTest.java

@@ -22,7 +22,7 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 class MarriageCertificateCertificateConverterTest {
 
     private MarriageCertificateCertificateConverter converter;
-   
+
     private MarriageCertificate source;
     private MarriageCertificateCommand target;
 
@@ -49,17 +49,17 @@ class MarriageCertificateCertificateConverterTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getId(),target.getId());
-        assertEquals(source.getNumber(),target.getNumber());
-        assertEquals(source.getRegistrationAuthority(),target.getRegistrationAuthority());
-        assertEquals(source.getCertificateNumber(),target.getCertificateNumber());
-        assertEquals(source.getCertificateDate(),target.getCertificateDate());
-        assertEquals(source.getCertificateType(),target.getCertificateType());
-        assertEquals(source.getCertificateSource(),target.getCertificateSource());
-        assertEquals(source.getUntrackedWhereMarried(),target.getUntrackedWhereMarried());
-        assertEquals(source.getVolume(),target.getVolume());
-        assertEquals(source.getWhenMarried(),target.getWhenMarried());
-        assertEquals(source.getWhereMarried(),target.getWhereMarried());
+        assertEquals(source.getId(), target.getId());
+        assertEquals(source.getNumber(), target.getNumber());
+        assertEquals(source.getRegistrationAuthority(), target.getRegistrationAuthority());
+        assertEquals(source.getCertificateNumber(), target.getCertificateNumber());
+        assertEquals(source.getCertificateDate(), target.getCertificateDate());
+        assertEquals(source.getCertificateType(), target.getCertificateType());
+        assertEquals(source.getCertificateSource(), target.getCertificateSource());
+        assertEquals(source.getUntrackedWhereMarried(), target.getUntrackedWhereMarried());
+        assertEquals(source.getVolume(), target.getVolume());
+        assertEquals(source.getWhenMarried(), target.getWhenMarried());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
     }
 
 }

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/certificate/MarriageCertificateDateConverterTest.java

@@ -19,7 +19,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 class MarriageCertificateDateConverterTest {
 
     private MarriageCertificateDateConverter converter;
-   
+
     private MarriageCertificate source;
     private MarriageCertificateCommand target;
 
@@ -38,9 +38,9 @@ class MarriageCertificateDateConverterTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getYearMarried(),target.getYearMarried());
-        assertEquals(source.getMonthMarried(),target.getMonthMarried());
-        assertEquals(source.getDayMarried(),target.getDayMarried());
+        assertEquals(source.getYearMarried(), target.getYearMarried());
+        assertEquals(source.getMonthMarried(), target.getMonthMarried());
+        assertEquals(source.getDayMarried(), target.getDayMarried());
     }
 
 }

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/certificate/MarriageCertificateGroomConverterTest.java

@@ -20,7 +20,7 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 class MarriageCertificateGroomConverterTest {
 
     private MarriageCertificateGroomConverter converter;
-   
+
     private MarriageCertificate source;
     private MarriageCertificateCommand target;
 
@@ -46,18 +46,17 @@ class MarriageCertificateGroomConverterTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getGroom(),target.getGroom());
-        assertEquals(source.getGroomUsualResidence(),target.getGroomUsualResidence());
-        assertEquals(source.getGroomAge(),target.getGroomAge());
-        assertEquals(source.getGroomCondition(),target.getGroomCondition());
-        assertEquals(source.getGroomFather(),target.getGroomFather());
-        assertEquals(source.getGroomFatherRank(),target.getGroomFatherRank());
-        assertEquals(source.getGroomRank(),target.getGroomRank());
-        assertEquals(source.getGroomUntrackedFather(),target.getGroomUntrackedFather());
-        assertEquals(source.getGroomUntrackedResidence(),target.getGroomUntrackedResidence());
-        assertEquals(source.getGroomUsualResidence(),target.getGroomUsualResidence());
-        
-  
+        assertEquals(source.getGroom(), target.getGroom());
+        assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
+        assertEquals(source.getGroomAge(), target.getGroomAge());
+        assertEquals(source.getGroomCondition(), target.getGroomCondition());
+        assertEquals(source.getGroomFather(), target.getGroomFather());
+        assertEquals(source.getGroomFatherRank(), target.getGroomFatherRank());
+        assertEquals(source.getGroomRank(), target.getGroomRank());
+        assertEquals(source.getGroomUntrackedFather(), target.getGroomUntrackedFather());
+        assertEquals(source.getGroomUntrackedResidence(), target.getGroomUntrackedResidence());
+        assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
+
 
     }
 

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/certificate/MarriageCertificateWitnessConverterTest.java

@@ -19,7 +19,7 @@ import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPe
 class MarriageCertificateWitnessConverterTest {
 
     private MarriageCertificateWitnessConverter converter;
-   
+
     private MarriageCertificate source;
     private MarriageCertificateCommand target;
 
@@ -39,10 +39,10 @@ class MarriageCertificateWitnessConverterTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getFirstWitness(),target.getFirstWitness());
-        assertEquals(source.getSecondWitness(),target.getSecondWitness());
-        assertEquals(source.getUntrackedFirstWitness(),target.getUntrackedFirstWitness());
-        assertEquals(source.getUntrackedSecondWitness(),target.getUntrackedSecondWitness());
+        assertEquals(source.getFirstWitness(), target.getFirstWitness());
+        assertEquals(source.getSecondWitness(), target.getSecondWitness());
+        assertEquals(source.getUntrackedFirstWitness(), target.getUntrackedFirstWitness());
+        assertEquals(source.getUntrackedSecondWitness(), target.getUntrackedSecondWitness());
     }
 
 }

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/command/MarriageCertificateBrideCommandConverterTest.java

@@ -20,7 +20,7 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 class MarriageCertificateBrideCommandConverterTest {
 
     private MarriageCertificateBrideCommandConverter converter;
-   
+
     private MarriageCertificateCommand source;
     private MarriageCertificate target;
 
@@ -46,18 +46,17 @@ class MarriageCertificateBrideCommandConverterTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getBride(),target.getBride());
-        assertEquals(source.getBrideUsualResidence(),target.getBrideUsualResidence());
-        assertEquals(source.getBrideAge(),target.getBrideAge());
-        assertEquals(source.getBrideCondition(),target.getBrideCondition());
-        assertEquals(source.getBrideFather(),target.getBrideFather());
-        assertEquals(source.getBrideFatherRank(),target.getBrideFatherRank());
-        assertEquals(source.getBrideRank(),target.getBrideRank());
-        assertEquals(source.getBrideUntrackedFather(),target.getBrideUntrackedFather());
-        assertEquals(source.getBrideUntrackedResidence(),target.getBrideUntrackedResidence());
-        assertEquals(source.getBrideUsualResidence(),target.getBrideUsualResidence());
-        
-  
+        assertEquals(source.getBride(), target.getBride());
+        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
+        assertEquals(source.getBrideAge(), target.getBrideAge());
+        assertEquals(source.getBrideCondition(), target.getBrideCondition());
+        assertEquals(source.getBrideFather(), target.getBrideFather());
+        assertEquals(source.getBrideFatherRank(), target.getBrideFatherRank());
+        assertEquals(source.getBrideRank(), target.getBrideRank());
+        assertEquals(source.getBrideUntrackedFather(), target.getBrideUntrackedFather());
+        assertEquals(source.getBrideUntrackedResidence(), target.getBrideUntrackedResidence());
+        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
+
 
     }
 

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/command/MarriageCertificateCertificateConverterCommandTest.java

@@ -22,7 +22,7 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 class MarriageCertificateCertificateConverterCommandTest {
 
     private MarriageCertificateCertificateCommandConverter converter;
-   
+
     private MarriageCertificateCommand source;
     private MarriageCertificate target;
 
@@ -49,17 +49,17 @@ class MarriageCertificateCertificateConverterCommandTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getId(),target.getId());
-        assertEquals(source.getNumber(),target.getNumber());
-        assertEquals(source.getRegistrationAuthority(),target.getRegistrationAuthority());
-        assertEquals(source.getCertificateNumber(),target.getCertificateNumber());
-        assertEquals(source.getCertificateDate(),target.getCertificateDate());
-        assertEquals(source.getCertificateType(),target.getCertificateType());
-        assertEquals(source.getCertificateSource(),target.getCertificateSource());
-        assertEquals(source.getUntrackedWhereMarried(),target.getUntrackedWhereMarried());
-        assertEquals(source.getVolume(),target.getVolume());
-        assertEquals(source.getWhenMarried(),target.getWhenMarried());
-        assertEquals(source.getWhereMarried(),target.getWhereMarried());
+        assertEquals(source.getId(), target.getId());
+        assertEquals(source.getNumber(), target.getNumber());
+        assertEquals(source.getRegistrationAuthority(), target.getRegistrationAuthority());
+        assertEquals(source.getCertificateNumber(), target.getCertificateNumber());
+        assertEquals(source.getCertificateDate(), target.getCertificateDate());
+        assertEquals(source.getCertificateType(), target.getCertificateType());
+        assertEquals(source.getCertificateSource(), target.getCertificateSource());
+        assertEquals(source.getUntrackedWhereMarried(), target.getUntrackedWhereMarried());
+        assertEquals(source.getVolume(), target.getVolume());
+        assertEquals(source.getWhenMarried(), target.getWhenMarried());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
     }
 
 }

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/command/MarriageCertificateDateCommandConverterTest.java

@@ -18,7 +18,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 class MarriageCertificateDateCommandConverterTest {
 
     private MarriageCertificateDateCommandConverter converter;
-   
+
     private MarriageCertificateCommand source;
     private MarriageCertificate target;
 
@@ -37,9 +37,9 @@ class MarriageCertificateDateCommandConverterTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getYearMarried(),target.getYearMarried());
-        assertEquals(source.getMonthMarried(),target.getMonthMarried());
-        assertEquals(source.getDayMarried(),target.getDayMarried());
+        assertEquals(source.getYearMarried(), target.getYearMarried());
+        assertEquals(source.getMonthMarried(), target.getMonthMarried());
+        assertEquals(source.getDayMarried(), target.getDayMarried());
     }
 
 }

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/command/MarriageCertificateGroomConverterCommandTest.java

@@ -20,7 +20,7 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 class MarriageCertificateGroomConverterCommandTest {
 
     private MarriageCertificateGroomCommandConverter converter;
-   
+
     private MarriageCertificateCommand source;
     private MarriageCertificate target;
 
@@ -46,18 +46,17 @@ class MarriageCertificateGroomConverterCommandTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getGroom(),target.getGroom());
-        assertEquals(source.getGroomUsualResidence(),target.getGroomUsualResidence());
-        assertEquals(source.getGroomAge(),target.getGroomAge());
-        assertEquals(source.getGroomCondition(),target.getGroomCondition());
-        assertEquals(source.getGroomFather(),target.getGroomFather());
-        assertEquals(source.getGroomFatherRank(),target.getGroomFatherRank());
-        assertEquals(source.getGroomRank(),target.getGroomRank());
-        assertEquals(source.getGroomUntrackedFather(),target.getGroomUntrackedFather());
-        assertEquals(source.getGroomUntrackedResidence(),target.getGroomUntrackedResidence());
-        assertEquals(source.getGroomUsualResidence(),target.getGroomUsualResidence());
-        
-  
+        assertEquals(source.getGroom(), target.getGroom());
+        assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
+        assertEquals(source.getGroomAge(), target.getGroomAge());
+        assertEquals(source.getGroomCondition(), target.getGroomCondition());
+        assertEquals(source.getGroomFather(), target.getGroomFather());
+        assertEquals(source.getGroomFatherRank(), target.getGroomFatherRank());
+        assertEquals(source.getGroomRank(), target.getGroomRank());
+        assertEquals(source.getGroomUntrackedFather(), target.getGroomUntrackedFather());
+        assertEquals(source.getGroomUntrackedResidence(), target.getGroomUntrackedResidence());
+        assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
+
 
     }
 

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/helpers/command/MarriageCertificateWitnessConverterCommandTest.java

@@ -19,7 +19,7 @@ import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPe
 class MarriageCertificateWitnessConverterCommandTest {
 
     private MarriageCertificateWitnessCommandConverter converter;
-   
+
     private MarriageCertificateCommand source;
     private MarriageCertificate target;
 
@@ -39,10 +39,10 @@ class MarriageCertificateWitnessConverterCommandTest {
 
         converter.convert(source, target);
 
-        assertEquals(source.getFirstWitness(),target.getFirstWitness());
-        assertEquals(source.getSecondWitness(),target.getSecondWitness());
-        assertEquals(source.getUntrackedFirstWitness(),target.getUntrackedFirstWitness());
-        assertEquals(source.getUntrackedSecondWitness(),target.getUntrackedSecondWitness());
+        assertEquals(source.getFirstWitness(), target.getFirstWitness());
+        assertEquals(source.getSecondWitness(), target.getSecondWitness());
+        assertEquals(source.getUntrackedFirstWitness(), target.getUntrackedFirstWitness());
+        assertEquals(source.getUntrackedSecondWitness(), target.getUntrackedSecondWitness());
     }
 
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/divorce/DivorceCertificateDateTest.java

@@ -60,8 +60,4 @@ class DivorceCertificateDateTest {
     }
 
 
-
-
-
-
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/divorce/DivorceCertificateIDTest.java

@@ -36,5 +36,4 @@ class DivorceCertificateIDTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/divorce/DivorceCertificatePeopleTest.java

@@ -49,6 +49,4 @@ class DivorceCertificatePeopleTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/marriage/MarriageCertificateDatesMarriedTestTest.java

@@ -59,6 +59,4 @@ class MarriageCertificateDatesMarriedTestTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/domains/images/ImageTest.java

@@ -59,7 +59,7 @@ class ImageTest {
 
     @Test
     public void getFileNameTest() {
-       assertNull(image.getFileName());
+        assertNull(image.getFileName());
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/domains/text/AppendixTextTest.java

@@ -15,7 +15,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
 class AppendixTextTest {
-    
+
     private AppendixText appendixText;
 
     @BeforeEach
@@ -85,5 +85,5 @@ class AppendixTextTest {
         appendixText.setContent(content);
         assertEquals(content, appendixText.getContent());
     }
-    
+
 }

src/test/java/scot/carricksoftware/grants/validators/certificates/divorcecertificate/DivorceCertificateDateFieldsValidatorTest.java

@@ -38,11 +38,11 @@ class DivorceCertificateDateFieldsValidatorTest {
     @Test
     void validateDateFieldsTest() {
         verify(validateDateTypesMock).validatePastDate(divorceCertificateCommand.getFirstPartyDate(), "firstPartyDate",
-                "The first party date cannot be null.", "The format should be dd/MM/yyyy.", "Date should not be in the future.",bindingResultMock);
+                "The first party date cannot be null.", "The format should be dd/MM/yyyy.", "Date should not be in the future.", bindingResultMock);
         verify(validateDateTypesMock).validatePastDate(divorceCertificateCommand.getSecondPartyDate(), "secondPartyDate",
-                "The second party date cannot be null.", "The format should be dd/MM/yyyy.", "Date should not be in the future.",bindingResultMock);
+                "The second party date cannot be null.", "The format should be dd/MM/yyyy.", "Date should not be in the future.", bindingResultMock);
         verify(validateDateTypesMock).validatePastDate(divorceCertificateCommand.getRegisteredDate(), "registeredDate",
-                "The registered date cannot be null.", "The format should be dd/MM/yyyy.", "Date should not be in the future.",bindingResultMock);
+                "The registered date cannot be null.", "The format should be dd/MM/yyyy.", "Date should not be in the future.", bindingResultMock);
     }
 
 }

src/test/java/scot/carricksoftware/grants/validators/certificates/divorcecertificate/DivorceCertificatePeopleValidatorTest.java

@@ -46,5 +46,5 @@ class DivorceCertificatePeopleValidatorTest {
         verify(validateTwoFieldTypesMock).validateNotSamePerson(divorceCertificateCommand.getFirstParty(), divorceCertificateCommand.getSecondParty(),
                 "firstParty", "secondParty", "The two parties cannot be the same person.", bindingResultMock);
     }
-    
+
 }

src/test/java/scot/carricksoftware/grants/validators/certificates/marriagecertificate/MarriageCertificateBaseFieldsValidatorTest.java

@@ -75,5 +75,4 @@ class MarriageCertificateBaseFieldsValidatorTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateIntegerRangeTest.java

@@ -43,7 +43,7 @@ class ValidateIntegerRangeTest {
     public void validateNullInteger() {
         String nullMessage = GetRandomString();
 
-        validateTypes.validateIntegerRange(null, null, null,fieldName, nullMessage, "", "", bindingResultMock);
+        validateTypes.validateIntegerRange(null, null, null, fieldName, nullMessage, "", "", bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, nullMessage);
     }
 

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

@@ -41,12 +41,12 @@ class AppendixTextCommandValidatorImplTest {
     void validateRangeIsCalledTest() {
         String order = GetRandomString();
         appendixTextCommand.setOrder(order);
-       validator.validate(appendixTextCommand, bindingResultMock);
-       verify(validateTypesMock).validateNonNegativeInteger(order,
-               "order",
-               "Order must exist.",
-               "The order must be an integer.",
-               "The order must be non-negative.", bindingResultMock);
+        validator.validate(appendixTextCommand, bindingResultMock);
+        verify(validateTypesMock).validateNonNegativeInteger(order,
+                "order",
+                "Order must exist.",
+                "The order must be an integer.",
+                "The order must be non-negative.", bindingResultMock);
     }
 
     @Test

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

@@ -43,12 +43,12 @@ class PersonTextCommandValidatorImplTest {
     void validateRangeIsCalledTest() {
         String order = GetRandomString();
         personTextCommand.setOrder(order);
-       validator.validate(personTextCommand, bindingResultMock);
-       verify(validateTypesMock).validateNonNegativeInteger(order,
-               "order",
-               "Order must exist.",
-               "The order must be an integer.",
-               "The order must be non-negative.", bindingResultMock);
+        validator.validate(personTextCommand, bindingResultMock);
+        verify(validateTypesMock).validateNonNegativeInteger(order,
+                "order",
+                "Order must exist.",
+                "The order must be an integer.",
+                "The order must be non-negative.", bindingResultMock);
     }
 
     @Test
@@ -67,7 +67,7 @@ class PersonTextCommandValidatorImplTest {
 
     @Test
     void validatePersonIsCalledTest() {
-        Person person  = GetRandomPerson();
+        Person person = GetRandomPerson();
         personTextCommand.setPerson(person);
         validator.validate(personTextCommand, bindingResultMock);
         verify(validateTypesMock).validatePerson(person,