DocumentText domain and command

pom.xml

@@ -176,8 +176,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.liquibase.ext</groupId>
-                        <artifactId>liquibase-hibernate6</artifactId>
-                        <version>4.31.1</version>
+                        <artifactId>liquibase-hibernate</artifactId>
+                        <version>5.0.1</version>
                     </dependency>
                     <dependency>
                         <groupId>org.springframework.data</groupId>

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 28/03/2025, 09:58. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.commands.images;
+
+import scot.carricksoftware.grants.domains.images.Image;
+
+public interface DocumentImageCommand {
+    Long getId();
+
+    void setId(Long id);
+
+    Image getImage();
+
+    void setImage(Image image);
+
+    String getLevel();
+
+    void setLevel(String level);
+
+    String getOrder();
+
+    void setOrder(String order);
+
+    String getCaption();
+
+    void setCaption(String caption);
+
+    String getHeight();
+
+    void setHeight(String height);
+
+    String getWidth();
+
+    void setWidth(String width);
+}

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

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 28/03/2025, 09:59. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.commands.images;
+
+import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.domains.images.Image;
+
+@Component
+public class DocumentImageCommandImpl implements DocumentImageCommand{
+
+    private Long Id;
+    private Image image;
+    private String level;
+    private String order;
+    private String caption;
+    private String height;
+    private String width;
+
+    @Override
+    public Long getId() {
+        return Id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        Id = id;
+    }
+
+    @Override
+    public Image getImage() {
+        return image;
+    }
+
+    @Override
+    public void setImage(Image image) {
+        this.image = image;
+    }
+
+    @Override
+    public String getLevel() {
+        return level;
+    }
+
+    @Override
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    @Override
+    public String getOrder() {
+        return order;
+    }
+
+    @Override
+    public void setOrder(String order) {
+        this.order = order;
+    }
+
+    @Override
+    public String getCaption() {
+        return caption;
+    }
+
+    @Override
+    public void setCaption(String caption) {
+        this.caption = caption;
+    }
+
+    @Override
+    public String getHeight() {
+        return height;
+    }
+
+    @Override
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    @Override
+    public String getWidth() {
+        return width;
+    }
+
+    @Override
+    public void setWidth(String width) {
+        this.width = width;
+    }
+}

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

@@ -27,7 +27,6 @@ import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.census.census.CensusCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class CensusFormControllerImpl implements CensusFormController {
 
@@ -96,7 +95,7 @@ public class CensusFormControllerImpl implements CensusFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(CensusMappingConstants.CENSUS_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("CensusFormControllerImpl::saveOrUpdate");
+        logger.debug("CensusFormControllerImpl::showById");
         CensusCommand savedCommand = censusConverter.convert(censusService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.CENSUS_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PLACES, placeService.findAll());

src/main/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerImpl.java

@@ -29,7 +29,6 @@ import scot.carricksoftware.grants.services.census.censusentry.UpdateRecordedYea
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.validators.census.censusentry.CensusEntryCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class CensusEntryFormControllerImpl implements CensusEntryFormController {
 
@@ -106,7 +105,7 @@ public class CensusEntryFormControllerImpl implements CensusEntryFormController
     @SuppressWarnings("SameReturnValue")
     @GetMapping(CensusMappingConstants.CENSUS_ENTRY_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("CensusEntryFormControllerImpl::saveOrUpdate");
+        logger.debug("CensusEntryFormControllerImpl::showById");
         CensusEntryCommand savedCommand = censusEntryConverter.convert(censusEntryService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
         model.addAttribute(AttributeConstants.CENSUS_ENTRY_COMMAND, savedCommand);

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

@@ -29,7 +29,6 @@ import scot.carricksoftware.grants.services.certificates.birthcertificates.Birth
 import scot.carricksoftware.grants.services.certificates.birthcertificates.UpdateCertifiedYearOfBirth;
 import scot.carricksoftware.grants.validators.certificates.birthcertificate.BirthCertificateCommandValidatorImpl;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class BirthCertificateFormControllerImpl implements BirthCertificateFormController {
 
@@ -110,7 +109,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     @GetMapping(CertificateMappingConstants.BIRTH_CERTIFICATE_SHOW)
     @Override
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");
+        logger.debug("BirthCertificateFormControllerImpl::showById");
         BirthCertificateCommand savedCommand = birthCertificateConverter.convert(birthCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, savedCommand);
         addAttributes.AddBMDCertificate(model);

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

@@ -29,7 +29,6 @@ import scot.carricksoftware.grants.services.certificates.deathcertificates.Death
 import scot.carricksoftware.grants.services.certificates.deathcertificates.UpdateCertifiedYearOfDeath;
 import scot.carricksoftware.grants.validators.certificates.deathcertificate.DeathCertificateCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class DeathCertificateFormControllerImpl implements DeathCertificateFormController {
 
@@ -108,7 +107,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     @GetMapping(CertificateMappingConstants.DEATH_CERTIFICATE_SHOW)
     @Override
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("DeathCertificateFormControllerImpl::saveOrUpdate");
+        logger.debug("DeathCertificateFormControllerImpl::showById");
         DeathCertificateCommand savedCommand = deathCertificateConverter.convert(deathCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.DEATH_CERTIFICATE_COMMAND, savedCommand);
         addAttributes.AddBMDCertificate(model);

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

@@ -28,7 +28,6 @@ import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.validators.certificates.divorcecertificate.DivorceCertificateCommandValidatorImpl;
 
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class DivorceCertificateFormControllerImpl implements DivorceCertificateFormController {
 
@@ -100,7 +99,7 @@ public class DivorceCertificateFormControllerImpl implements DivorceCertificateF
     @GetMapping(CertificateMappingConstants.DIVORCE_CERTIFICATE_SHOW)
     @Override
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("DivorceCertificateFormControllerImpl::saveOrUpdate");
+        logger.debug("DivorceCertificateFormControllerImpl::showById");
         DivorceCertificateCommand savedCommand = divorceCertificateConverter.convert(divorceCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.DIVORCE_CERTIFICATE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());

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

@@ -30,7 +30,6 @@ import scot.carricksoftware.grants.services.certificates.marriagecertificates.Ma
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.helpers.SetYearMarried;
 import scot.carricksoftware.grants.validators.certificates.marriagecertificate.MarriageCertificateCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class MarriageCertificateFormControllerImpl implements MarriageCertificateFormController {
 
@@ -116,7 +115,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
     @GetMapping(CertificateMappingConstants.MARRIAGE_CERTIFICATE_SHOW)
     @Override
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("MarriageCertificateFormControllerImpl::saveOrUpdate");
+        logger.debug("MarriageCertificateFormControllerImpl::showById");
         MarriageCertificateCommand savedCommand = marriageCertificateConverter.convert(marriageCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.MARRIAGE_CERTIFICATE_COMMAND, savedCommand);
         addAttributes.AddBMDCertificate(model);

src/main/java/scot/carricksoftware/grants/controllers/images/appendixImages/AppendixImageFormControllerImpl.java

@@ -30,7 +30,6 @@ import scot.carricksoftware.grants.services.images.image.ImageService;
 import scot.carricksoftware.grants.validators.images.AppendixImageCommandValidatorImpl;
 
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class AppendixImageFormControllerImpl implements AppendixImageFormController {
 
@@ -100,7 +99,7 @@ public class AppendixImageFormControllerImpl implements AppendixImageFormControl
     @SuppressWarnings("SameReturnValue")
     @GetMapping(ImageMappingConstants.APPENDIX_IMAGE_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("AppendixImageFormControllerImpl::saveOrUpdate");
+        logger.debug("AppendixImageFormControllerImpl::showById");
         AppendixImageCommand savedCommand = appendixImageConverter.convert(appendixImageService.findById(Long.valueOf(id)));
         model.addAttribute(ImageAttributeConstants.APPENDIX_IMAGE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.IMAGES, imageService.findAll());

src/main/java/scot/carricksoftware/grants/controllers/images/images/ImageFormControllerImpl.java

@@ -28,7 +28,6 @@ import scot.carricksoftware.grants.validators.images.ImageCommandValidatorImpl;
 
 import java.io.IOException;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class ImageFormControllerImpl implements ImageFormController {
 
@@ -99,7 +98,7 @@ public class ImageFormControllerImpl implements ImageFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(ImageMappingConstants.IMAGE_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("ImageFormControllerImpl::saveOrUpdate");
+        logger.debug("ImageFormControllerImpl::showById");
         ImageCommand savedCommand = imageConverter.convert(imageService.findById(Long.valueOf(id)));
         model.addAttribute(ImageAttributeConstants.IMAGE_COMMAND, savedCommand);
         return ViewConstants.IMAGE_FORM;

src/main/java/scot/carricksoftware/grants/controllers/images/personImages/PersonImageFormControllerImpl.java

@@ -26,7 +26,6 @@ import scot.carricksoftware.grants.services.images.personimage.PersonImageServic
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.validators.images.PersonImageCommandValidatorImpl;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class PersonImageFormControllerImpl implements PersonImageFormController {
 
@@ -108,7 +107,7 @@ public class PersonImageFormControllerImpl implements PersonImageFormController
     @SuppressWarnings("SameReturnValue")
     @GetMapping(ImageMappingConstants.PERSON_IMAGE_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("PersonImageFormControllerImpl::saveOrUpdate");
+        logger.debug("PersonImageFormControllerImpl::showById");
         PersonImageCommand savedCommand = personImageConverter.convert(personImageService.findById(Long.valueOf(id)));
         model.addAttribute(ImageAttributeConstants.PERSON_IMAGE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());

src/main/java/scot/carricksoftware/grants/controllers/images/placeimages/PlaceImageFormControllerImpl.java

@@ -24,7 +24,6 @@ import scot.carricksoftware.grants.services.images.placeimage.PlaceImageService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.images.PlaceImageCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class PlaceImageFormControllerImpl implements PlaceImageFormController {
 
@@ -94,7 +93,7 @@ public class PlaceImageFormControllerImpl implements PlaceImageFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(ImageMappingConstants.PLACE_IMAGE_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("PlaceImageFormControllerImpl::saveOrUpdate");
+        logger.debug("PlaceImageFormControllerImpl::showById");
         PlaceImageCommand savedCommand = placeImageConverter.convert(placeImageService.findById(Long.valueOf(id)));
         model.addAttribute(ImageAttributeConstants.PLACE_IMAGE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PLACES, placeService.findAll());

src/main/java/scot/carricksoftware/grants/controllers/people/PersonFormControllerImpl.java

@@ -28,7 +28,6 @@ import scot.carricksoftware.grants.services.images.image.ImageService;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.validators.people.PersonCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class PersonFormControllerImpl implements PersonFormController {
 
@@ -51,7 +50,6 @@ public class PersonFormControllerImpl implements PersonFormController {
                                     ImageService imageService) {
         this.personService = personService;
 
-
         this.personConverter = personConverter;
         this.capitalisePerson = capitalisePerson;
         this.personCommandValidator = personCommandValidator;
@@ -102,7 +100,7 @@ public class PersonFormControllerImpl implements PersonFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(MappingConstants.PERSON_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("PersonFormControllerImpl::saveOrUpdate");
+        logger.debug("PersonFormControllerImpl::showById");
         PersonCommand savedCommand = personConverter.convert(personService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.PERSON_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.IMAGES, imageService.findAll());

src/main/java/scot/carricksoftware/grants/controllers/places/countries/CountryFormControllerImpl.java

@@ -28,7 +28,6 @@ import scot.carricksoftware.grants.converters.places.countries.CountryConverterI
 import scot.carricksoftware.grants.services.places.countries.CountryService;
 import scot.carricksoftware.grants.validators.places.CountryCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class CountryFormControllerImpl implements CountryFormController {
 
@@ -90,7 +89,7 @@ public class CountryFormControllerImpl implements CountryFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(MappingConstants.COUNTRY_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("CountryFormControllerImpl::saveOrUpdate");
+        logger.debug("CountryFormControllerImpl::showById");
         CountryCommand savedCommand = countryConverter.convert(countryService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.COUNTRY_COMMAND, savedCommand);
         return ViewConstants.COUNTRY_FORM;

src/main/java/scot/carricksoftware/grants/controllers/places/places/PlaceFormControllerImpl.java

@@ -28,7 +28,6 @@ import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.services.places.regions.RegionService;
 import scot.carricksoftware.grants.validators.places.PlaceCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class PlaceFormControllerImpl implements PlaceFormController {
 
@@ -104,7 +103,7 @@ public class PlaceFormControllerImpl implements PlaceFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(MappingConstants.PLACE_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("PlaceFormControllerImpl::saveOrUpdate");
+        logger.debug("PlaceFormControllerImpl::showById");
         PlaceCommand savedCommand = placeConverter.convert(placeService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.PLACE_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.REGIONS, regionService.findAll());

src/main/java/scot/carricksoftware/grants/controllers/places/regions/RegionFormControllerImpl.java

@@ -27,7 +27,6 @@ import scot.carricksoftware.grants.services.places.countries.CountryService;
 import scot.carricksoftware.grants.services.places.regions.RegionService;
 import scot.carricksoftware.grants.validators.places.RegionCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class RegionFormControllerImpl implements RegionFormController {
 
@@ -97,7 +96,7 @@ public class RegionFormControllerImpl implements RegionFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(MappingConstants.REGION_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("RegionFormControllerImpl::saveOrUpdate");
+        logger.debug("RegionFormControllerImpl::showById");
         RegionCommand regionCommand = regionConverter.convert(regionService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.REGION_COMMAND, regionCommand);
         model.addAttribute(AttributeConstants.COUNTRIES, countryService.findAll());

src/main/java/scot/carricksoftware/grants/controllers/text/appendixtext/AppendixTextFormControllerImpl.java

@@ -27,7 +27,6 @@ import scot.carricksoftware.grants.commands.text.AppendixTextCommand;
 import scot.carricksoftware.grants.services.text.appendixtext.AppendixTextService;
 import scot.carricksoftware.grants.validators.text.AppendixTextCommandValidatorImpl;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class AppendixTextFormControllerImpl implements AppendixTextFormController {
 
@@ -91,7 +90,7 @@ public class AppendixTextFormControllerImpl implements AppendixTextFormControlle
     @SuppressWarnings("SameReturnValue")
     @GetMapping(TextMappingConstants.APPENDIX_TEXT_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("AppendixTextFormControllerImpl::saveOrUpdate");
+        logger.debug("AppendixTextFormControllerImpl::showById");
         AppendixTextCommand convertedCommand =  appendixTextConverter.convert(appendixTextService.findById(Long.valueOf(id)));
         model.addAttribute(TextAttributeConstants.APPENDIX_TEXT_COMMAND, convertedCommand);
         return ViewConstants.APPENDIX_TEXT_FORM;

src/main/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextFormControllerImpl.java

@@ -23,7 +23,6 @@ import scot.carricksoftware.grants.converters.text.documenttext.DocumentTextConv
 import scot.carricksoftware.grants.services.text.documenttext.DocumentTextService;
 import scot.carricksoftware.grants.validators.text.DocumentTextCommandValidatorImpl;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class DocumentTextFormControllerImpl implements DocumentTextFormController {
 
@@ -87,7 +86,7 @@ public class DocumentTextFormControllerImpl implements DocumentTextFormControlle
     @SuppressWarnings("SameReturnValue")
     @GetMapping(TextMappingConstants.DOCUMENT_TEXT_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("DocumentTextFormControllerImpl::saveOrUpdate");
+        logger.debug("DocumentTextFormControllerImpl::showById");
         DocumentTextCommand savedCommand = documentTextConverter.convert(documentTextService.findById(Long.valueOf(id)));
         model.addAttribute(TextAttributeConstants.DOCUMENT_TEXT_COMMAND, savedCommand);
         return ViewConstants.DOCUMENT_TEXT_FORM;

src/main/java/scot/carricksoftware/grants/controllers/text/persontext/PersonTextFormControllerImpl.java

@@ -24,7 +24,6 @@ import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.text.persontext.PersonTextService;
 import scot.carricksoftware.grants.validators.text.PersonTextCommandValidatorImpl;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class PersonTextFormControllerImpl implements PersonTextFormController {
 
@@ -95,7 +94,7 @@ public class PersonTextFormControllerImpl implements PersonTextFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(TextMappingConstants.PERSON_TEXT_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("PersonTextFormControllerImpl::saveOrUpdate");
+        logger.debug("PersonTextFormControllerImpl::showById");
         PersonTextCommand savedCommand = personTextConverter.convert(personTextService.findById(Long.valueOf(id)));
         model.addAttribute(TextAttributeConstants.PERSON_TEXT_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());

src/main/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceTextFormControllerImpl.java

@@ -24,7 +24,6 @@ import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.services.text.placetext.PlaceTextService;
 import scot.carricksoftware.grants.validators.text.PlaceTextCommandValidator;
 
-@SuppressWarnings("LoggingSimilarMessage")
 @Controller
 public class PlaceTextFormControllerImpl implements PlaceTextFormController {
 
@@ -95,7 +94,7 @@ public class PlaceTextFormControllerImpl implements PlaceTextFormController {
     @SuppressWarnings("SameReturnValue")
     @GetMapping(TextMappingConstants.PLACE_TEXT_SHOW)
     public String showById(@PathVariable String id, Model model) {
-        logger.debug("PlaceTextFormControllerImpl::saveOrUpdate");
+        logger.debug("PlaceTextFormControllerImpl::showById");
         PlaceTextCommand savedCommand = placeTextConverter.convert(placeTextService.findById(Long.valueOf(id)));
         model.addAttribute(TextAttributeConstants.PLACE_TEXT_COMMAND, savedCommand);
         model.addAttribute(AttributeConstants.PLACES, placeService.findAll());

src/main/java/scot/carricksoftware/grants/domains/census/Census.java

@@ -25,7 +25,6 @@ import java.util.List;
 @Entity(name="`census`")
 public class Census extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`census_date`")
     private CensusDate censusDate;
@@ -33,45 +32,35 @@ public class Census extends BaseEntity {
     @OneToMany(mappedBy = "census", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<CensusEntry> censusEntries = new ArrayList<>();
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`place_id`")
     private Place place;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`boundary_type`")
     private CensusBoundaryType boundaryType;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`inhabited_rooms`")
     private String inhabitedRooms;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`rooms_with_windows`")
     private String roomsWithWindows;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`filled_in_by`")
     private String filledInBy;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`total_rooms`")
     private String totalRooms;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name= "`rooms_occupied`")
     private String roomsOccupied;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`inhabited_houses`")
     private String inhabitedHouses;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`uninhabited_houses`")
     private String uninhabitedHouses;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`people_in_houses`")
     private String peopleInHouses;
 

src/main/java/scot/carricksoftware/grants/domains/census/CensusEntry.java

@@ -17,88 +17,69 @@ public class CensusEntry extends BaseEntity {
 
     private String name;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`census_id`")
     private Census census;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`person_id`")
     private Person person;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`relationship`")
     private CensusEntryRelationship relationship;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`gaelic`")
     private CensusEntryGaelic gaelic;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`condition`")
     private CensusEntryCondition condition;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`worker`")
     private CensusEntryWorker worker;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`sex`")
     private Sex sex;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`age`")
     private String age;
 
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`where_born`")
     private String whereBorn;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`birth_day`")
     private String birthDay;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`birth_year`")
     private String birthYear;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`personal_occupation`")
     private String personalOccupation;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`notes`")
     private String notes;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`children_who_have_died`")
     private String childrenWhoHaveDied;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`children_still_alive`")
     private String childrenStillAlive;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`children_born_alive`")
     private String childrenBornAlive;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`years_Completed_Marriage`")
     private String yearsCompletedMarriage;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`working_at_home`")
     private YesNo workingAtHome;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`industry_or_service`")
     private String industryOrService;
 

src/main/java/scot/carricksoftware/grants/domains/certificates/BirthCertificate.java

@@ -21,100 +21,78 @@ import scot.carricksoftware.grants.enums.general.Sex;
 @Entity(name="`birth_certificate`")
 public class BirthCertificate extends BaseCertificate {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne()
     @JoinColumn(name = "`new_born_id`")
     private Person newBorn;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`when_born`")
     @DateTimeFormat(pattern = ApplicationConstants.DATE_TIME_FORMAT)
     private String whenBorn;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`where_born_id`")
     private Place whereBorn;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_where_born`")
     private String untrackedWhereBorn;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`sex`")
     private Sex sex;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne()
     @JoinColumn(name = "`father_id`")
     private Person father;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_father`")
     private String untrackedFather;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`father_rank`")
     private String fatherRank;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne()
     @JoinColumn(name = "`mother_id`")
     private Person mother;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`date_and_place_of_marriage`")
     private String dateAndPlaceOfMarriage;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne()
     @JoinColumn(name = "`informant_id`")
     private Person informant;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_informant`")
     private String untrackedInformant;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`informant_qualification`")
     private String informantQualification;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`when_registered`")
     private String whenRegistered;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`where_registered`")
     private String whereRegistered;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne()
     @JoinColumn(name = "`father_usual_residence_id`")
     private Place fatherUsualResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name="`untracked_father_usual_residence`")
     private String untrackedFatherUsualResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name="`informant_residence`")
     private String informantResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne()
     @JoinColumn(name = "`mother_usual_residence_id`")
     private Place motherUsualResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name="`untracked_mother_usual_residence`")
     private String untrackedMotherUsualResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name="`father_place_of_birth`")
     private String fatherPlaceOfBirth;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name="`mother_place_of_birth`")
     private String motherPlaceOfBirth;
 

src/main/java/scot/carricksoftware/grants/domains/certificates/DeathCertificate.java

@@ -21,135 +21,105 @@ import scot.carricksoftware.grants.enums.general.Sex;
 @Entity(name="`death_certificate`")
 public class DeathCertificate extends BaseCertificate {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`person_id`")
     private Person deceased;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`sex`")
     private Sex sex;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`occupation`")
     private String occupation;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`when_born`")
     @DateTimeFormat(pattern = ApplicationConstants.DATE_TIME_FORMAT)
     private String whenBorn;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`age`")
     @DateTimeFormat(pattern = ApplicationConstants.DATE_TIME_FORMAT)
     private String age;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`marital_status`")
     private String maritalStatus;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`when_died`")
     @DateTimeFormat(pattern = ApplicationConstants.DATE_TIME_FORMAT)
     private String whenDied;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`where_died_id`")
     private Place whereDied;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_where_died`")
     private String untrackedWhereDied;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`usual_residence_id`")
     private Place usualResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_usual_residence`")
     private String untrackedUsualResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`cause_of_death`")
     @Lob
     private String causeOfDeath;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`spouse_id`")
     private Person spouse;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_spouse`")
     private String untrackedSpouse;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`spouse_occupation`")
     private String spouseOccupation;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`father_id`")
     private Person father;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @JoinColumn(name = "`untracked_father`")
     private String untrackedFather;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @JoinColumn(name = "`father_occupation`")
     private String fatherOccupation;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`mother_id`")
     private Person mother;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @JoinColumn(name = "`untracked_mother`")
     private String untrackedMother;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @JoinColumn(name = "`mother_occupation`")
     private String motherOccupation;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne()
     @JoinColumn(name = "`informant_id`")
     private Person informant;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @JoinColumn(name = "`informant_address`")
     private String informantAddress;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_informant`")
     private String untrackedInformant;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`informant_qualification`")
     private String informantQualification;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`when_registered`")
     private String whenRegistered;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`where_registered`")
     private String whereRegistered;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`regiment`")
     private String regiment;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`service_number`")
     private String serviceNumber;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`service_rank`")
     private String serviceRank;
 

src/main/java/scot/carricksoftware/grants/domains/certificates/DivorceCertificate.java

@@ -17,27 +17,22 @@ import scot.carricksoftware.grants.domains.people.Person;
 @Entity(name="`divorce_certificate`")
 public class DivorceCertificate extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`first_party_id`")
     private Person firstParty;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`second_party_id`")
     private Person secondParty;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name= "`registered_date`")
     @DateTimeFormat(pattern = ApplicationConstants.DATE_FORMAT)
     private String registeredDate;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name= "`first_party_date`")
     @DateTimeFormat(pattern = ApplicationConstants.DATE_FORMAT)
     private String firstPartyDate;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name= "`second_party_date`")
     @DateTimeFormat(pattern = ApplicationConstants.DATE_FORMAT)
     private String secondPartyDate;

src/main/java/scot/carricksoftware/grants/domains/certificates/MarriageCertificate.java

@@ -17,125 +17,97 @@ import scot.carricksoftware.grants.domains.places.Place;
 @Entity(name="`marriage_certificate`")
 public class MarriageCertificate extends BaseCertificate {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`bride_id`")
     private Person bride;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`groom_id`")
     private Person groom;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`when_married`")
     @DateTimeFormat(pattern = ApplicationConstants.DATE_TIME_FORMAT)
     private String whenMarried;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`where_married_id`")
     private Place whereMarried;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_where_married`")
     private String untrackedWhereMarried;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`groom_age`")
     private String groomAge;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`bride_age`")
     private String brideAge;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`groom_condition`")
     private String groomCondition;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`bride_condition`")
     private String brideCondition;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`groom_rank`")
     private String groomRank;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`bride_rank`")
     private String brideRank;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`groom_residence_id`")
     private Place groomUsualResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`bride_residence_id`")
     private Place brideUsualResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`groom_untracked_residence`")
     private String groomUntrackedResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`bride_untracked_residence`")
     private String brideUntrackedResidence;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`groom_father`")
     private Person groomFather;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`bride_father`")
     private Person brideFather;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`groom_untracked_father`")
     private String groomUntrackedFather;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`bride_untracked_father`")
     private String brideUntrackedFather;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`groom_father_rank`")
     private String groomFatherRank;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`bride_father_rank`")
     private String brideFatherRank;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`first_witness`")
     private Person firstWitness;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`second_witness`")
     private Person secondWitness;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_first_witness`")
     private String untrackedFirstWitness;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`untracked_second_witness`")
     private String untrackedSecondWitness;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`year_married`")
     private String yearMarried;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`month_married`")
     private String monthMarried;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`day_married`")
     private String dayMarried;
 

src/main/java/scot/carricksoftware/grants/domains/images/DocumentImage.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:50. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.domains.images;
+
+import jakarta.persistence.Entity;
+
+@Entity(name="`document_image`")
+public class DocumentImage extends BaseImage {
+
+
+}

src/main/java/scot/carricksoftware/grants/domains/images/Image.java

@@ -14,15 +14,12 @@ import scot.carricksoftware.grants.BaseEntity;
 @Entity(name="`image`")
 public class Image extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`name`")
     private String name;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name= "`file_name`")
     private String fileName;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Lob
     @Column(name = "`imageData`")
     private String imageData;

src/main/java/scot/carricksoftware/grants/domains/images/PersonImage.java

@@ -13,7 +13,6 @@ import scot.carricksoftware.grants.domains.people.Person;
 @Entity(name="`person_image`")
 public class PersonImage extends BaseImage {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "person_id")
     private Person person;

src/main/java/scot/carricksoftware/grants/domains/images/PlaceImage.java

@@ -14,7 +14,6 @@ import scot.carricksoftware.grants.domains.places.Place;
 public class PlaceImage extends BaseImage {
 
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "place_id")
     private Place place;

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

@@ -27,28 +27,22 @@ import java.util.List;
 @Entity(name="`person`")
 public class Person extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`image_id`")
     private Image image;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`first_name`")
     private String firstName;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`last_name`")
     String lastName;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`recorded_year_of_birth`")
     String recordedYearOfBirth;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`certified_year_of_birth`")
     String certifiedYearOfBirth;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`certified_year_of_death`")
     String certifiedYearOfDeath;
 

src/main/java/scot/carricksoftware/grants/domains/places/Organisation.java

@@ -13,7 +13,6 @@ import scot.carricksoftware.grants.BaseEntity;
 @Entity(name="`organisation`")
 public class Organisation extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`name`")
     private String name;
 

src/main/java/scot/carricksoftware/grants/domains/places/Place.java

@@ -18,11 +18,9 @@ import java.util.List;
 @Entity(name="`place`")
 public class Place extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`name`")
     private String name;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`region_id`")
     private Region region;

src/main/java/scot/carricksoftware/grants/domains/places/Region.java

@@ -15,11 +15,9 @@ import java.util.List;
 @Entity(name="`region`")
 public class Region extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`name`")
     private String name;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`country_id`")
     private Country country;

src/main/java/scot/carricksoftware/grants/domains/text/PersonText.java

@@ -13,7 +13,6 @@ import scot.carricksoftware.grants.domains.people.Person;
 @Entity(name="`person_text`")
 public class PersonText extends BaseText {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`person_id`")
     private Person person;

src/main/java/scot/carricksoftware/grants/domains/text/PlaceText.java

@@ -14,7 +14,6 @@ import scot.carricksoftware.grants.domains.places.Place;
 @Entity(name="`place_text`")
 public class PlaceText extends BaseText {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`place_id`")
     private Place place;

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 28/03/2025, 09:54. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.commands.images;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import scot.carricksoftware.grants.domains.images.Image;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
+
+class DocumentImageCommandTest {
+
+    private DocumentImageCommand command;
+
+    @BeforeEach
+    void setUp() {
+        command = new DocumentImageCommandImpl();
+    }
+
+    @Test
+    public void getIdTest() {
+        assertNull(command.getId());
+    }
+
+    @Test
+    public void setIdTest() {
+        Long id = GetRandomLong();
+        command.setId(id);
+        assertEquals(id, command.getId());
+    }
+
+    @Test
+    public void getCaptionTest() {
+        assertNull(command.getCaption());
+    }
+
+    @Test
+    public void setCaptionTest() {
+        String caption = GetRandomString();
+        command.setCaption(caption);
+        assertEquals(caption, command.getCaption());
+    }
+
+    @Test
+    public void getHeightTest() {
+        assertNull(command.getHeight());
+    }
+
+    @Test
+    public void setHeightTest() {
+        String height = GetRandomString();
+        command.setHeight(height);
+        assertEquals(height, command.getHeight());
+    }
+
+    @Test
+    public void getWidthTest() {
+        assertNull(command.getWidth());
+    }
+
+    @Test
+    public void setWidthTest() {
+        String width = GetRandomString();
+        command.setWidth(width);
+        assertEquals(width, command.getWidth());
+    }
+
+    @Test
+    public void getImageTest() {
+        assertNull(command.getImage());
+    }
+
+    @Test
+    public void setImageTest() {
+        Image image = new Image();
+        command.setImage(image);
+        assertEquals(image, command.getImage());
+    }
+
+    @Test
+    public void getOrderTest() {
+        assertNull(command.getOrder());
+    }
+
+    @Test
+    public void setOrderTest() {
+        String order = GetRandomString();
+        command.setOrder(order);
+        assertEquals(order, command.getOrder());
+    }
+
+    @Test
+    public void getLevelTest() {
+        assertNull(command.getLevel());
+    }
+
+    @Test
+    public void setLevelTest() {
+        String level = GetRandomString();
+        command.setLevel(level);
+        assertEquals(level, command.getLevel());
+    }
+
+}

src/test/java/scot/carricksoftware/grants/commands/text/AppendixBaseTextCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/text/AppendixTextCommandTest.java

@@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
-class AppendixBaseTextCommandTest {
+class AppendixTextCommandTest {
 
     private AppendixTextCommand appendixTextCommand;
 

src/test/java/scot/carricksoftware/grants/commands/text/DocumentBaseTextCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/text/DocumentTextCommandTest.java

@@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
-class DocumentBaseTextCommandTest {
+class DocumentTextCommandTest {
 
     private DocumentTextCommand documentTextCommand;
 

src/test/java/scot/carricksoftware/grants/commands/text/PersonBaseTextCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/text/PersonTextCommandTest.java

@@ -15,7 +15,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
-class PersonBaseTextCommandTest {
+class PersonTextCommandTest {
 
     private PersonTextCommand personTextCommand;
 

src/test/java/scot/carricksoftware/grants/commands/text/PlaceBaseTextCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/text/PlaceTextCommandTest.java

@@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
-class PlaceBaseTextCommandTest {
+class PlaceTextCommandTest {
 
     private PlaceTextCommand placeTextCommand;
 

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

@@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
-class AppendixBaseTextTest {
+class AppendixTextTest {
 
     private AppendixText appendixText;
 

src/test/java/scot/carricksoftware/grants/domains/text/DocumentBaseTextTest.java → src/test/java/scot/carricksoftware/grants/domains/text/DocumentTextTest.java

@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
-class DocumentBaseTextTest {
+class DocumentTextTest {
 
     private DocumentText documentText;
 

src/test/java/scot/carricksoftware/grants/domains/text/PersonBaseTextTest.java → src/test/java/scot/carricksoftware/grants/domains/text/PersonTextTest.java

@@ -14,7 +14,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
-class PersonBaseTextTest {
+class PersonTextTest {
 
     private PersonText personText;
 

src/test/java/scot/carricksoftware/grants/domains/text/PlaceBaseTextTest.java → src/test/java/scot/carricksoftware/grants/domains/text/PlaceTextTest.java

@@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.*;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
-class PlaceBaseTextTest {
+class PlaceTextTest {
 
     private PlaceText placeText;