Souse made optional in death certificate

src/main/java/scot/carricksoftware/grants/constants/ValidationConstants.java

@@ -58,7 +58,7 @@ public class ValidationConstants {
     public static final String SAME_TWO_PARTIES = "The two parties cannot be the same person.";
     public static final String SECOND_PARTY_IS_NULL = "The second party cannot be null.";
     public static final String SEX_IS_NULL = "Sex cannot be null.";
-    public static final String SPOUSE_AND_UNTRACKED_SPOUSE = "One and only one spouse and untracked spouse must be specified.";
+    public static final String SPOUSE_AND_UNTRACKED_SPOUSE = "One and only one spouse and untracked spouse may be specified.";
     public static final String TOTAL_ROOMS_AND_INHABITED_ROOMS_CANNOT_COEXIST =  "Total Rooms and Inhabited Rooms cannot coexist.";
     public static final String TOTAL_ROOMS_AND_ROOMS_WITH_WINDOWS_CANNOT_COEXIST =  "Total Rooms and Rooms With Windows cannot coexist.";
     public static final String USUAL_RESIDENCE_AND_UNTRACKED_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence may be specified.";

src/main/java/scot/carricksoftware/grants/domains/people/Person.java

@@ -36,7 +36,6 @@ public class Person extends BaseEntity {
     @Column(name = "`certified_year_of_birth`")
     String certifiedYearOfBirth;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`certified_year_of_death`")
     String certifiedYearOfDeath;
 

src/main/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DeathCertificateUntrackedFieldsValidatorImpl.java

@@ -60,7 +60,7 @@ public class DeathCertificateUntrackedFieldsValidatorImpl implements DeathCertif
     @Override
     public void validateSpouse(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateUntrackedFieldsValidatorImp::validateSpouse");
-        validateTwoFieldTypes.validatePersonAndUntrackedPerson(deathCertificateCommand.getSpouse(),
+        validateTwoFieldTypes.validateOptionalPersonAndUntrackedPerson(deathCertificateCommand.getSpouse(),
                 deathCertificateCommand.getUntrackedSpouse(),
                 "spouse",
                 "untrackedSpouse",
@@ -82,7 +82,7 @@ public class DeathCertificateUntrackedFieldsValidatorImpl implements DeathCertif
     @Override
     public void validateMother(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateUntrackedFieldsValidatorImp::validateMother");
-        validateTwoFieldTypes.validatePersonAndUntrackedPerson(deathCertificateCommand.getMother(),
+        validateTwoFieldTypes.validateOptionalPersonAndUntrackedPerson(deathCertificateCommand.getMother(),
                 deathCertificateCommand.getUntrackedMother(),
                 "mother",
                 "untrackedMother",

src/test/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DeathCertificateUntrackedFieldsValidatorTest.java

@@ -83,15 +83,15 @@ class DeathCertificateUntrackedFieldsValidatorTest {
     @Test
     void theTestAreRunTest() {
         deathCertificateUntrackedFieldsValidator.validate(deathCertificateCommand, bindingResultMock);
-        verify(validateTwoFieldTypesMock).validatePersonAndUntrackedPerson(spouse, untrackedSpouse, "spouse", "untrackedSpouse",
-                "One and only one spouse and untracked spouse must be specified.", bindingResultMock);
+        verify(validateTwoFieldTypesMock).validateOptionalPersonAndUntrackedPerson(spouse, untrackedSpouse, "spouse", "untrackedSpouse",
+                "One and only one spouse and untracked spouse may be specified.", bindingResultMock);
         verify(validateTwoFieldTypesMock).validateOptionalPersonAndUntrackedPerson(father, untrackedFather, "father", "untrackedFather",
                "One and only one father and untracked father may be specified.", bindingResultMock);
         verify(validateTwoFieldTypesMock).validatePlaceAndUntrackedPlace(whereDied, untrackedWhereDied, "whereDied", "untrackedWhereDied",
                "One and only one where died and untracked where died must be specified.", bindingResultMock);
         verify(validateTwoFieldTypesMock).validateOptionalPlaceAndUntrackedPlace(usualResidence, untrackedUsualResidence, "usualResidence", "untrackedUsualResidence",
                 "Only one usual residence and untracked usual residence may be specified.", bindingResultMock);
-        verify(validateTwoFieldTypesMock).validatePersonAndUntrackedPerson(mother, untrackedMother, "mother", "untrackedMother",
+        verify(validateTwoFieldTypesMock).validateOptionalPersonAndUntrackedPerson(mother, untrackedMother, "mother", "untrackedMother",
                 "One and only one mother and untracked mother may be specified.", bindingResultMock);
         verify(validateTwoFieldTypesMock).validatePersonAndUntrackedPerson(informant, untrackedInformant, "informant", "untrackedInformant",
                 "One and only one informant and untracked informant may be specified.", bindingResultMock);