CertificateMappingConstants

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

@@ -57,4 +57,24 @@ public class CensusMappingConstants {
     @SuppressWarnings({"unused"})
     public static final String CENSUS_ENTRY_EDIT = "censusEntry/{id}/edit";
 
+
+    public static final String CENSUS_SELECTED_ENTRIES_LIST = "/censusSelectedEntries";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_NEXT = "/censusSelectedEntries/next";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_PREVIOUS = "/censusSelectedEntries/prev";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_REWIND = "/censusSelectedEntries/rewind";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_FF = "/censusSelectedEntries/ff";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_NEW = "/censusSelectedEntry/new";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_ENTRY = "/censusSelectedEntry";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_SHOW = "/censusSelectedEntry/{id}/show";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_DELETE = "/censusSelectedEntry/{id}/delete";
+    @SuppressWarnings({"unused"})
+    public static final String CENSUS_SELECTED_ENTRIES_EDIT = "censusSelectedEntry/{id}/edit";
 }

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

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c)  08 Feb 2025, Andrew Grant of Carrick Software .
+ * All rights reserved.
+ */
+
+package scot.carricksoftware.grants.constants;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class CertificateMappingConstants {
+
+    private CertificateMappingConstants() {
+        // to stop checkstyle complaining
+    }
+
+
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_LIST = "/birthCertificates";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_NEXT = "/birthCertificates/next";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_PREVIOUS = "/birthCertificates/prev";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_REWIND = "/birthCertificates/rewind";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_FF = "/birthCertificates/ff";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_NEW = "/birthCertificate/new";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE = "/birthCertificate";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_SHOW = "/birthCertificate/{id}/show";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_DELETE = "/birthCertificate/{id}/delete";
+    @SuppressWarnings({"unused"})
+    public static final String BIRTH_CERTIFICATE_EDIT = "birthCertificate/{id}/edit";
+
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_LIST = "/deathCertificates";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_NEXT = "/deathCertificates/next";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_PREVIOUS = "/deathCertificates/prev";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_REWIND = "/deathCertificates/rewind";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_FF = "/deathCertificates/ff";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_NEW = "/deathCertificate/new";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE = "/deathCertificate";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_SHOW = "/deathCertificate/{id}/show";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_DELETE = "/deathCertificate/{id}/delete";
+    @SuppressWarnings({"unused"})
+    public static final String DEATH_CERTIFICATE_EDIT = "deathCertificate/{id}/edit";
+
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_LIST = "/marriageCertificates";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_NEXT = "/marriageCertificates/next";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_PREVIOUS = "/marriageCertificates/prev";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_REWIND = "/marriageCertificates/rewind";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_FF = "/marriageCertificates/ff";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_NEW = "/marriageCertificate/new";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE = "/marriageCertificate";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_SHOW = "/marriageCertificate/{id}/show";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_DELETE = "/marriageCertificate/{id}/delete";
+    @SuppressWarnings({"unused"})
+    public static final String MARRIAGE_CERTIFICATE_EDIT = "marriageCertificate/{id}/edit";
+
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_LIST = "/divorceCertificates";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_NEXT = "/divorceCertificates/next";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_PREVIOUS = "/divorceCertificates/prev";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_REWIND = "/divorceCertificates/rewind";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_FF = "/divorceCertificates/ff";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_NEW = "/divorceCertificate/new";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE = "/divorceCertificate";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_SHOW = "/divorceCertificate/{id}/show";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_DELETE = "/divorceCertificate/{id}/delete";
+    @SuppressWarnings({"unused"})
+    public static final String DIVORCE_CERTIFICATE_EDIT = "divorceCertificate/{id}/edit";
+}

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

@@ -98,87 +98,5 @@ public class MappingConstants {
     @SuppressWarnings("unused")
     public static final String PLACE_EDIT = "place/{id}/edit";
 
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_LIST = "/birthCertificates";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_NEXT = "/birthCertificates/next";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_PREVIOUS = "/birthCertificates/prev";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_REWIND = "/birthCertificates/rewind";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_FF = "/birthCertificates/ff";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_NEW = "/birthCertificate/new";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE = "/birthCertificate";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_SHOW = "/birthCertificate/{id}/show";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_DELETE = "/birthCertificate/{id}/delete";
-    @SuppressWarnings({"unused"})
-    public static final String BIRTH_CERTIFICATE_EDIT = "birthCertificate/{id}/edit";
 
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_LIST = "/deathCertificates";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_NEXT = "/deathCertificates/next";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_PREVIOUS = "/deathCertificates/prev";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_REWIND = "/deathCertificates/rewind";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_FF = "/deathCertificates/ff";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_NEW = "/deathCertificate/new";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE = "/deathCertificate";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_SHOW = "/deathCertificate/{id}/show";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_DELETE = "/deathCertificate/{id}/delete";
-    @SuppressWarnings({"unused"})
-    public static final String DEATH_CERTIFICATE_EDIT = "deathCertificate/{id}/edit";
-
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_LIST = "/marriageCertificates";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_NEXT = "/marriageCertificates/next";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_PREVIOUS = "/marriageCertificates/prev";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_REWIND = "/marriageCertificates/rewind";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_FF = "/marriageCertificates/ff";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_NEW = "/marriageCertificate/new";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE = "/marriageCertificate";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_SHOW = "/marriageCertificate/{id}/show";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_DELETE = "/marriageCertificate/{id}/delete";
-    @SuppressWarnings({"unused"})
-    public static final String MARRIAGE_CERTIFICATE_EDIT = "marriageCertificate/{id}/edit";
-
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_LIST = "/divorceCertificates";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_NEXT = "/divorceCertificates/next";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_PREVIOUS = "/divorceCertificates/prev";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_REWIND = "/divorceCertificates/rewind";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_FF = "/divorceCertificates/ff";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_NEW = "/divorceCertificate/new";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE = "/divorceCertificate";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_SHOW = "/divorceCertificate/{id}/show";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_DELETE = "/divorceCertificate/{id}/delete";
-    @SuppressWarnings({"unused"})
-    public static final String DIVORCE_CERTIFICATE_EDIT = "divorceCertificate/{id}/edit";
 }

src/main/java/scot/carricksoftware/grants/controllers/census/census/CensusEntriesListControllerImpl.java

@@ -33,7 +33,7 @@ public class CensusEntriesListControllerImpl implements CensusListController {
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_LIST)
+    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_LIST)
     @Override
     public final String getListPage(final Model model) {
         logger.debug("PersonListControllerImpl::getCensusPage");
@@ -49,7 +49,7 @@ public class CensusEntriesListControllerImpl implements CensusListController {
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_NEXT)
+    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_NEXT)
     @Override
     public final String getNextPage(final Model model) {
         logger.debug("CensusListControllerImpl::getNextPage");
@@ -58,7 +58,7 @@ public class CensusEntriesListControllerImpl implements CensusListController {
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_PREVIOUS)
+    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_PREVIOUS)
     @Override
     public final String getPreviousPage(final Model model) {
         logger.debug("CensusListControllerImpl::getPreviousPage");
@@ -67,7 +67,7 @@ public class CensusEntriesListControllerImpl implements CensusListController {
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_REWIND)
+    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_REWIND)
     public final String getFirstPage(final Model model) {
         logger.debug("CensusListControllerImpl::getFirstPage");
         currentPage = 0;
@@ -75,7 +75,7 @@ public class CensusEntriesListControllerImpl implements CensusListController {
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_FF)
+    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_FF)
     @Override
     public final String getLastPage(final Model model) {
         logger.debug("CensusListControllerImpl::getLastPage");
@@ -86,12 +86,12 @@ public class CensusEntriesListControllerImpl implements CensusListController {
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_DELETE)
+    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_DELETE)
     @Override
     public final String censusDelete(@PathVariable final String id) {
         logger.debug("CensusListControllerImpl::censusDelete");
         censusService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + CensusMappingConstants.CENSUS_LIST;
+        return MappingConstants.REDIRECT + CensusMappingConstants.CENSUS_SELECTED_ENTRIES_LIST;
     }
 
     @Override

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

@@ -12,23 +12,23 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
-import scot.carricksoftware.grants.constants.MappingConstants;
+import scot.carricksoftware.grants.constants.CertificateMappingConstants;
 
 @SuppressWarnings("unused")
 
 public interface BirthCertificateFormController {
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_NEW)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_NEW)
     String getNewBirthCertificate(Model model);
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_EDIT)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_EDIT)
     String birthCertificateEdit(@Valid @PathVariable String id, Model model);
 
     String saveOrUpdate(@ModelAttribute BirthCertificateCommand countryCommand, BindingResult bindingResult, Model model);
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_SHOW)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_SHOW)
     String showById(@PathVariable String id, Model model);
 }

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 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.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
@@ -54,7 +55,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_NEW)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_NEW)
     @Override
     public final String getNewBirthCertificate(final Model model) {
         logger.debug("BirthCertificateFormControllerImpl::getNewBirthCertificate");
@@ -64,7 +65,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_EDIT)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_EDIT)
     @Override
     public final String birthCertificateEdit(@Valid @PathVariable final String id, Model model) {
         logger.debug("BirthCertificateFormControllerImpl::birthCertificateEdit");
@@ -75,7 +76,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
 
 
     @Override
-    @PostMapping(MappingConstants.BIRTH_CERTIFICATE)
+    @PostMapping(CertificateMappingConstants.BIRTH_CERTIFICATE)
     public String saveOrUpdate(@Valid @ModelAttribute BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult, Model model) {
         logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");
 
@@ -91,12 +92,12 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         BirthCertificateCommand savedCommand = birthCertificateService.saveBirthCertificateCommand(birthCertificateCommand);
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        return MappingConstants.REDIRECT + MappingConstants.BIRTH_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
+        return MappingConstants.REDIRECT + CertificateMappingConstants.BIRTH_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_SHOW)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_SHOW)
     @Override
     public String showById(@PathVariable String id, Model model) {
         logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");

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

@@ -11,10 +11,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.AttributeConstants;
-import scot.carricksoftware.grants.constants.MappingConstants;
-import scot.carricksoftware.grants.constants.ViewConstants;
+import scot.carricksoftware.grants.constants.*;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
 
@@ -36,7 +33,7 @@ public class BirthCertificateListControllerImpl implements BirthCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_LIST)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_LIST)
     @Override
     public final String getListPage(final Model model) {
         logger.debug("BirthCertificateListControllerImpl::getCensusPage");
@@ -52,7 +49,7 @@ public class BirthCertificateListControllerImpl implements BirthCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_NEXT)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_NEXT)
     @Override
     public final String getNextPage(final Model model) {
         logger.debug("BirthCertificateListControllerImpl::getNextPage");
@@ -61,7 +58,7 @@ public class BirthCertificateListControllerImpl implements BirthCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_PREVIOUS)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_PREVIOUS)
     @Override
     public final String getPreviousPage(final Model model) {
         logger.debug("BirthCertificateListControllerImpl::getPreviousPage");
@@ -70,7 +67,7 @@ public class BirthCertificateListControllerImpl implements BirthCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_REWIND)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_REWIND)
     public final String getFirstPage(final Model model) {
         logger.debug("BirthCertificateListControllerImpl::getFirstPage");
         currentPage = 0;
@@ -78,7 +75,7 @@ public class BirthCertificateListControllerImpl implements BirthCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_FF)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_FF)
     @Override
     public final String getLastPage(final Model model) {
         logger.debug("BirthCertificateListControllerImpl::getLastPage");
@@ -89,12 +86,12 @@ public class BirthCertificateListControllerImpl implements BirthCertificateListC
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.BIRTH_CERTIFICATE_DELETE)
+    @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_DELETE)
     @Override
     public final String birthCertificateDelete(@PathVariable final String id) {
         logger.debug("BirthCertificateControllerImpl::censusDelete");
         birthCertificateService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + MappingConstants.BIRTH_CERTIFICATE_LIST;
+        return MappingConstants.REDIRECT + CertificateMappingConstants.BIRTH_CERTIFICATE_LIST;
     }
 
     @Override

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

@@ -12,23 +12,23 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
-import scot.carricksoftware.grants.constants.MappingConstants;
+import scot.carricksoftware.grants.constants.CertificateMappingConstants;
 
 @SuppressWarnings("unused")
 
 public interface DeathCertificateFormController {
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_NEW)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_NEW)
     String getNewDeathCertificate(Model model);
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_EDIT)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_EDIT)
     String deathCertificateEdit(@Valid @PathVariable String id, Model model);
 
     String saveOrUpdate(@ModelAttribute DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult, Model model);
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_SHOW)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_SHOW)
     String showById(@PathVariable String id, Model model);
 }

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 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.certificates.deathcertificates.DeathCertificateCommandConverterImpl;
@@ -53,7 +54,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_NEW)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_NEW)
     @Override
     public final String getNewDeathCertificate(final Model model) {
         logger.debug("DeathCertificateFormControllerImpl::getNewDeathCertificate");
@@ -63,7 +64,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_EDIT)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_EDIT)
     @Override
     public final String deathCertificateEdit(@Valid @PathVariable final String id, Model model) {
         logger.debug("DeathCertificateFormControllerImpl::deathCertificateEdit");
@@ -74,7 +75,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
 
 
     @Override
-    @PostMapping(MappingConstants.DEATH_CERTIFICATE)
+    @PostMapping(CertificateMappingConstants.DEATH_CERTIFICATE)
     public String saveOrUpdate(@Valid @ModelAttribute DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult, Model model) {
         logger.debug("DeathCertificateFormControllerImpl::saveOrUpdate");
 
@@ -90,12 +91,12 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
         DeathCertificateCommand savedCommand = deathCertificateService.saveDeathCertificateCommand(deathCertificateCommand);
         model.addAttribute(AttributeConstants.DEATH_CERTIFICATE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        return MappingConstants.REDIRECT + MappingConstants.DEATH_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
+        return MappingConstants.REDIRECT + CertificateMappingConstants.DEATH_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_SHOW)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_SHOW)
     @Override
     public String showById(@PathVariable String id, Model model) {
         logger.debug("DeathCertificateFormControllerImpl::saveOrUpdate");

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

@@ -11,10 +11,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.AttributeConstants;
-import scot.carricksoftware.grants.constants.MappingConstants;
-import scot.carricksoftware.grants.constants.ViewConstants;
+import scot.carricksoftware.grants.constants.*;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
 import scot.carricksoftware.grants.services.certificates.deathcertificates.DeathCertificateService;
 
@@ -36,7 +33,7 @@ public class DeathCertificateListControllerImpl implements DeathCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_LIST)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_LIST)
     @Override
     public final String getListPage(final Model model) {
         logger.debug("DeathCertificateListControllerImpl::getCensusPage");
@@ -52,7 +49,7 @@ public class DeathCertificateListControllerImpl implements DeathCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_NEXT)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_NEXT)
     @Override
     public final String getNextPage(final Model model) {
         logger.debug("DeathCertificateListControllerImpl::getNextPage");
@@ -61,7 +58,7 @@ public class DeathCertificateListControllerImpl implements DeathCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_PREVIOUS)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_PREVIOUS)
     @Override
     public final String getPreviousPage(final Model model) {
         logger.debug("DeathCertificateListControllerImpl::getPreviousPage");
@@ -70,7 +67,7 @@ public class DeathCertificateListControllerImpl implements DeathCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_REWIND)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_REWIND)
     public final String getFirstPage(final Model model) {
         logger.debug("DeathCertificateListControllerImpl::getFirstPage");
         currentPage = 0;
@@ -78,7 +75,7 @@ public class DeathCertificateListControllerImpl implements DeathCertificateListC
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_FF)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_FF)
     @Override
     public final String getLastPage(final Model model) {
         logger.debug("DeathCertificateListControllerImpl::getLastPage");
@@ -89,12 +86,12 @@ public class DeathCertificateListControllerImpl implements DeathCertificateListC
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DEATH_CERTIFICATE_DELETE)
+    @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_DELETE)
     @Override
     public final String deathCertificateDelete(@PathVariable final String id) {
         logger.debug("DeathCertificateControllerImpl::censusDelete");
         deathCertificateService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + MappingConstants.DEATH_CERTIFICATE_LIST;
+        return MappingConstants.REDIRECT + CertificateMappingConstants.DEATH_CERTIFICATE_LIST;
     }
 
     @Override

src/main/java/scot/carricksoftware/grants/controllers/certificates/divorcecertificates/DivorceCertificateFormController.java

@@ -12,23 +12,23 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import scot.carricksoftware.grants.commands.certificates.divorcecertificates.DivorceCertificateCommand;
-import scot.carricksoftware.grants.constants.MappingConstants;
+import scot.carricksoftware.grants.constants.CertificateMappingConstants;
 
 @SuppressWarnings("unused")
 
 public interface DivorceCertificateFormController {
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_NEW)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_NEW)
     String getNewDivorceCertificate(Model model);
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_EDIT)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_EDIT)
     String divorceCertificateEdit(@Valid @PathVariable String id, Model model);
 
     String saveOrUpdate(@ModelAttribute DivorceCertificateCommand divorceCertificateCommand, BindingResult bindingResult, Model model);
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_SHOW)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_SHOW)
     String showById(@PathVariable String id, Model model);
 }

src/main/java/scot/carricksoftware/grants/controllers/certificates/divorcecertificates/DivorceCertificateFormControllerImpl.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import scot.carricksoftware.grants.commands.certificates.divorcecertificates.DivorceCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.divorcecertificates.DivorceCertificateCommandImpl;
 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.certificates.divorcecertificates.DivorceCertificateCommandConverterImpl;
@@ -26,6 +27,7 @@ import scot.carricksoftware.grants.services.certificates.divorcecertificates.Div
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.validators.certificates.DivorceCertificateCommandValidator;
 
+
 @SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class DivorceCertificateFormControllerImpl implements DivorceCertificateFormController {
@@ -53,7 +55,7 @@ public class DivorceCertificateFormControllerImpl implements DivorceCertificateF
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_NEW)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_NEW)
     @Override
     public final String getNewDivorceCertificate(final Model model) {
         logger.debug("DivorceCertificateFormControllerImpl::getNewDivorceCertificate");
@@ -63,7 +65,7 @@ public class DivorceCertificateFormControllerImpl implements DivorceCertificateF
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_EDIT)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_EDIT)
     @Override
     public final String divorceCertificateEdit(@Valid @PathVariable final String id, Model model) {
         logger.debug("DivorceCertificateFormControllerImpl::divorceCertificateEdit");
@@ -74,7 +76,7 @@ public class DivorceCertificateFormControllerImpl implements DivorceCertificateF
 
 
     @Override
-    @PostMapping(MappingConstants.DIVORCE_CERTIFICATE)
+    @PostMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE)
     public String saveOrUpdate(@Valid @ModelAttribute DivorceCertificateCommand divorceCertificateCommand, BindingResult bindingResult, Model model) {
         logger.debug("DivorceCertificateFormControllerImpl::saveOrUpdate");
 
@@ -90,12 +92,12 @@ public class DivorceCertificateFormControllerImpl implements DivorceCertificateF
         DivorceCertificateCommand savedCommand = divorceCertificateService.saveDivorceCertificateCommand(divorceCertificateCommand);
         model.addAttribute(AttributeConstants.DIVORCE_CERTIFICATE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        return MappingConstants.REDIRECT + MappingConstants.DIVORCE_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
+        return MappingConstants.REDIRECT + CertificateMappingConstants.DIVORCE_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_SHOW)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_SHOW)
     @Override
     public String showById(@PathVariable String id, Model model) {
         logger.debug("DivorceCertificateFormControllerImpl::saveOrUpdate");

src/main/java/scot/carricksoftware/grants/controllers/certificates/divorcecertificates/DivorceCertificateListControllerImpl.java

@@ -11,10 +11,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.AttributeConstants;
-import scot.carricksoftware.grants.constants.MappingConstants;
-import scot.carricksoftware.grants.constants.ViewConstants;
+import scot.carricksoftware.grants.constants.*;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
 import scot.carricksoftware.grants.services.certificates.divorcecertificates.DivorceCertificateService;
 
@@ -36,7 +33,7 @@ public class DivorceCertificateListControllerImpl implements DivorceCertificateL
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_LIST)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_LIST)
     @Override
     public final String getListPage(final Model model) {
         logger.debug("DivorceCertificateListControllerImpl::getCensusPage");
@@ -52,7 +49,7 @@ public class DivorceCertificateListControllerImpl implements DivorceCertificateL
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_NEXT)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_NEXT)
     @Override
     public final String getNextPage(final Model model) {
         logger.debug("DivorceCertificateListControllerImpl::getNextPage");
@@ -61,7 +58,7 @@ public class DivorceCertificateListControllerImpl implements DivorceCertificateL
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_PREVIOUS)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_PREVIOUS)
     @Override
     public final String getPreviousPage(final Model model) {
         logger.debug("DivorceCertificateListControllerImpl::getPreviousPage");
@@ -70,7 +67,7 @@ public class DivorceCertificateListControllerImpl implements DivorceCertificateL
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_REWIND)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_REWIND)
     public final String getFirstPage(final Model model) {
         logger.debug("DivorceCertificateListControllerImpl::getFirstPage");
         currentPage = 0;
@@ -78,7 +75,7 @@ public class DivorceCertificateListControllerImpl implements DivorceCertificateL
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_FF)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_FF)
     @Override
     public final String getLastPage(final Model model) {
         logger.debug("DivorceCertificateListControllerImpl::getLastPage");
@@ -89,12 +86,12 @@ public class DivorceCertificateListControllerImpl implements DivorceCertificateL
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.DIVORCE_CERTIFICATE_DELETE)
+    @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_DELETE)
     @Override
     public final String divorceCertificateDelete(@PathVariable final String id) {
         logger.debug("DivorceCertificateControllerImpl::censusDelete");
         divorceCertificateService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + MappingConstants.DIVORCE_CERTIFICATE_LIST;
+        return MappingConstants.REDIRECT + CertificateMappingConstants.DIVORCE_CERTIFICATE_LIST;
     }
 
     @Override

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
-import scot.carricksoftware.grants.constants.MappingConstants;
+import scot.carricksoftware.grants.constants.CertificateMappingConstants;
 
 @SuppressWarnings("unused")
 
@@ -20,16 +20,16 @@ public interface MarriageCertificateFormController {
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_NEW)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_NEW)
     String getNewMarriageCertificate(Model model);
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_EDIT)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_EDIT)
     String marriageCertificateEdit(@Valid @PathVariable String id, Model model);
 
     String saveOrUpdate(@ModelAttribute MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult, Model model);
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_SHOW)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_SHOW)
     String showById(@PathVariable String id, Model model);
 }

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 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.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
@@ -54,7 +55,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_NEW)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_NEW)
     @Override
     public final String getNewMarriageCertificate(final Model model) {
         logger.debug("MarriageCertificateFormControllerImpl::getNewMarriageCertificate");
@@ -64,7 +65,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_EDIT)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_EDIT)
     @Override
     public final String marriageCertificateEdit(@Valid @PathVariable final String id, Model model) {
         logger.debug("MarriageCertificateFormControllerImpl::marriageCertificateEdit");
@@ -75,7 +76,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
 
 
     @Override
-    @PostMapping(MappingConstants.MARRIAGE_CERTIFICATE)
+    @PostMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE)
     public String saveOrUpdate(@Valid @ModelAttribute MarriageCertificateCommand marriageCertificateCommand, BindingResult bindingResult, Model model) {
         logger.debug("MarriageCertificateFormControllerImpl::saveOrUpdate");
 
@@ -91,12 +92,12 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         MarriageCertificateCommand savedCommand = marriageCertificateService.saveMarriageCertificateCommand(marriageCertificateCommand);
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        return MappingConstants.REDIRECT + MappingConstants.MARRIAGE_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
+        return MappingConstants.REDIRECT + CertificateMappingConstants.MARRIAGE_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_SHOW)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_SHOW)
     @Override
     public String showById(@PathVariable String id, Model model) {
         logger.debug("MarriageCertificateFormControllerImpl::saveOrUpdate");

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

@@ -11,10 +11,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import scot.carricksoftware.grants.constants.ApplicationConstants;
-import scot.carricksoftware.grants.constants.AttributeConstants;
-import scot.carricksoftware.grants.constants.MappingConstants;
-import scot.carricksoftware.grants.constants.ViewConstants;
+import scot.carricksoftware.grants.constants.*;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
 
@@ -36,7 +33,7 @@ public class MarriageCertificateListControllerImpl implements MarriageCertificat
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_LIST)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_LIST)
     @Override
     public final String getListPage(final Model model) {
         logger.debug("MarriageCertificateListControllerImpl::getCensusPage");
@@ -52,7 +49,7 @@ public class MarriageCertificateListControllerImpl implements MarriageCertificat
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_NEXT)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_NEXT)
     @Override
     public final String getNextPage(final Model model) {
         logger.debug("MarriageCertificateListControllerImpl::getNextPage");
@@ -61,7 +58,7 @@ public class MarriageCertificateListControllerImpl implements MarriageCertificat
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_PREVIOUS)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_PREVIOUS)
     @Override
     public final String getPreviousPage(final Model model) {
         logger.debug("MarriageCertificateListControllerImpl::getPreviousPage");
@@ -70,7 +67,7 @@ public class MarriageCertificateListControllerImpl implements MarriageCertificat
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_REWIND)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_REWIND)
     public final String getFirstPage(final Model model) {
         logger.debug("MarriageCertificateListControllerImpl::getFirstPage");
         currentPage = 0;
@@ -78,7 +75,7 @@ public class MarriageCertificateListControllerImpl implements MarriageCertificat
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_FF)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_FF)
     @Override
     public final String getLastPage(final Model model) {
         logger.debug("MarriageCertificateListControllerImpl::getLastPage");
@@ -89,12 +86,12 @@ public class MarriageCertificateListControllerImpl implements MarriageCertificat
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(MappingConstants.MARRIAGE_CERTIFICATE_DELETE)
+    @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_DELETE)
     @Override
     public final String marriageCertificateDelete(@PathVariable final String id) {
         logger.debug("MarriageCertificateControllerImpl::censusDelete");
         marriageCertificateService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + MappingConstants.MARRIAGE_CERTIFICATE_LIST;
+        return MappingConstants.REDIRECT + CertificateMappingConstants.MARRIAGE_CERTIFICATE_LIST;
     }
 
     @Override