AddAttributes BMDCertificate

src/main/java/scot/carricksoftware/grants/controllers/AddAttributes.java

@@ -8,7 +8,6 @@ package scot.carricksoftware.grants.controllers;
 import org.springframework.ui.Model;
 
 public interface AddAttributes {
-    void AddDeathCertificate(Model model);
-    void AddMarriageCertificate(Model model);
-    void AddBirthCertificate(Model model);
+    void AddBMDCertificate(Model model);
+
 }

src/main/java/scot/carricksoftware/grants/controllers/AddAttributesImpl.java

@@ -26,23 +26,10 @@ public class AddAttributesImpl implements AddAttributes {
     }
 
     @Override
-    public void AddDeathCertificate(Model model) {
+    public void AddBMDCertificate(Model model) {
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
         model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
         model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
     }
 
-    @Override
-    public void AddMarriageCertificate(Model model) {
-        model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
-        model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
-    }
-
-    @Override
-    public void AddBirthCertificate(Model model) {
-        model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
-        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
-    }
 }

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

@@ -68,7 +68,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     public final String getNewBirthCertificate(final Model model) {
         logger.debug("BirthCertificateFormControllerImpl::getNewBirthCertificate");
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, new BirthCertificateCommandImpl());
-        addAttributes.AddBirthCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return ViewConstants.BIRTH_CERTIFICATE_FORM;
     }
 
@@ -78,7 +78,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     public final String birthCertificateEdit(@Valid @PathVariable final String id, Model model) {
         logger.debug("BirthCertificateFormControllerImpl::birthCertificateEdit");
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, birthCertificateService.findById(Long.valueOf(id)));
-        addAttributes.AddBirthCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return ViewConstants.BIRTH_CERTIFICATE_FORM;
     }
 
@@ -94,14 +94,14 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
 
         if (bindingResult.hasErrors()) {
             bindingResult.getAllErrors().forEach(error -> logger.debug(error.getDefaultMessage()));
-            addAttributes.AddBirthCertificate(model);
+            addAttributes.AddBMDCertificate(model);
             return ViewConstants.BIRTH_CERTIFICATE_FORM;
         }
 
         BirthCertificateCommand savedCommand = birthCertificateService.saveBirthCertificateCommand(birthCertificateCommand);
         updateCertifiedYearOfBirth.updateCertifiedYearOfBirth(savedCommand);
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, savedCommand);
-        addAttributes.AddBirthCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return MappingConstants.REDIRECT + CertificateMappingConstants.BIRTH_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
@@ -113,7 +113,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");
         BirthCertificateCommand savedCommand = birthCertificateConverter.convert(birthCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, savedCommand);
-        addAttributes.AddBirthCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return ViewConstants.BIRTH_CERTIFICATE_FORM;
     }
 

src/main/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerImpl.java

@@ -67,7 +67,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     @Override
     public final String getNewDeathCertificate(final Model model) {
         logger.debug("DeathCertificateFormControllerImpl::getNewDeathCertificate");
-        addAttributes.AddDeathCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         model.addAttribute(AttributeConstants.DEATH_CERTIFICATE_COMMAND, new DeathCertificateCommandImpl());
         return ViewConstants.DEATH_CERTIFICATE_FORM;
     }
@@ -77,7 +77,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     @Override
     public final String deathCertificateEdit(@Valid @PathVariable final String id, Model model) {
         logger.debug("DeathCertificateFormControllerImpl::deathCertificateEdit");
-        addAttributes.AddDeathCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         model.addAttribute(AttributeConstants.DEATH_CERTIFICATE_COMMAND, deathCertificateService.findById(Long.valueOf(id)));
         return ViewConstants.DEATH_CERTIFICATE_FORM;
     }
@@ -93,13 +93,13 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
 
         if (bindingResult.hasErrors()) {
             bindingResult.getAllErrors().forEach(error -> logger.debug(error.getDefaultMessage()));
-            addAttributes.AddDeathCertificate(model);
+            addAttributes.AddBMDCertificate(model);
             return ViewConstants.DEATH_CERTIFICATE_FORM;
         }
 
         DeathCertificateCommand savedCommand = deathCertificateService.saveDeathCertificateCommand(deathCertificateCommand);
         updateCertifiedYearOfDeath.updateCertifiedYearOfDeath(savedCommand);
-        addAttributes.AddDeathCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return MappingConstants.REDIRECT + CertificateMappingConstants.DEATH_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
@@ -111,7 +111,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
         logger.debug("DeathCertificateFormControllerImpl::saveOrUpdate");
         DeathCertificateCommand savedCommand = deathCertificateConverter.convert(deathCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.DEATH_CERTIFICATE_COMMAND, savedCommand);
-        addAttributes.AddDeathCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return ViewConstants.DEATH_CERTIFICATE_FORM;
     }
 

src/main/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerImpl.java

@@ -68,7 +68,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
     public final String getNewMarriageCertificate(final Model model) {
         logger.debug("MarriageCertificateFormControllerImpl::getNewMarriageCertificate");
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, new MarriageCertificateCommandImpl());
-        addAttributes.AddMarriageCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return ViewConstants.MARRIAGE_CERTIFICATE_FORM;
     }
 
@@ -80,10 +80,11 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         return getString(id, model);
     }
 
+    @SuppressWarnings("SameReturnValue")
     @NotNull
     private String getString(String id, Model model) {
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, marriageCertificateService.findById(Long.valueOf(id)));
-        addAttributes.AddMarriageCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return ViewConstants.MARRIAGE_CERTIFICATE_FORM;
     }
 
@@ -100,13 +101,13 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
 
         if (bindingResult.hasErrors()) {
             bindingResult.getAllErrors().forEach(error -> logger.debug(error.getDefaultMessage()));
-            addAttributes.AddMarriageCertificate(model);
+            addAttributes.AddBMDCertificate(model);
             return ViewConstants.MARRIAGE_CERTIFICATE_FORM;
         }
 
         MarriageCertificateCommand savedCommand = marriageCertificateService.saveMarriageCertificateCommand(marriageCertificateCommand);
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, savedCommand);
-        addAttributes.AddMarriageCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return MappingConstants.REDIRECT + CertificateMappingConstants.MARRIAGE_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
@@ -118,7 +119,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         logger.debug("MarriageCertificateFormControllerImpl::saveOrUpdate");
         MarriageCertificateCommand savedCommand = marriageCertificateConverter.convert(marriageCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, savedCommand);
-        addAttributes.AddMarriageCertificate(model);
+        addAttributes.AddBMDCertificate(model);
         return ViewConstants.MARRIAGE_CERTIFICATE_FORM;
     }