Database entities better defined

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

@@ -22,9 +22,10 @@ import scot.carricksoftware.grants.enums.census.CensusDate;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity
+@Entity(name="`census`")
 public class Census extends BaseEntity {
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
     @Column(name = "`census_date`")
     private CensusDate censusDate;
@@ -32,35 +33,45 @@ 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

@@ -12,7 +12,7 @@ import scot.carricksoftware.grants.enums.censusentry.*;
 import scot.carricksoftware.grants.enums.general.Sex;
 import scot.carricksoftware.grants.enums.general.YesNo;
 
-@Entity
+@Entity(name="`census_entry`")
 public class CensusEntry extends BaseEntity {
 
     private String name;

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

@@ -18,7 +18,7 @@ import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.enums.general.Sex;
 
-@Entity
+@Entity(name="`birth_certificate`")
 public class BirthCertificate extends BaseCertificate {
 
     @SuppressWarnings("JpaDataSourceORMInspection")

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

@@ -18,7 +18,7 @@ import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.enums.general.Sex;
 
-@Entity
+@Entity(name="`death_certificate`")
 public class DeathCertificate extends BaseCertificate {
 
     @SuppressWarnings("JpaDataSourceORMInspection")

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

@@ -14,7 +14,7 @@ import scot.carricksoftware.grants.BaseEntity;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.domains.people.Person;
 
-@Entity
+@Entity(name="`divorce_certificate`")
 public class DivorceCertificate extends BaseEntity {
 
     @SuppressWarnings("JpaDataSourceORMInspection")

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

@@ -14,7 +14,7 @@ import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.domains.places.Place;
 
-@Entity
+@Entity(name="`marriage_certificate`")
 public class MarriageCertificate extends BaseCertificate {
 
     @SuppressWarnings("JpaDataSourceORMInspection")

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

@@ -7,7 +7,7 @@ package scot.carricksoftware.grants.domains.images;
 
 import jakarta.persistence.Entity;
 
-@Entity
+@Entity(name="`appendix_image`")
 public class AppendixImage extends BaseImage {
 
 

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

@@ -6,36 +6,30 @@
 package scot.carricksoftware.grants.domains.images;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
 import scot.carricksoftware.grants.BaseEntity;
 
-@Entity
+@MappedSuperclass
 public class BaseImage extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`image_id`")
     private Image image;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`level`")
     private String level;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`order`")
     private String order;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`caption`")
     private String caption;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`height`")
     private String height;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`width`")
     private String width;
 

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

@@ -11,12 +11,14 @@ import jakarta.persistence.Lob;
 import scot.carricksoftware.grants.BaseEntity;
 
 
-@Entity
+@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;
 

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

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

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

@@ -10,7 +10,7 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import scot.carricksoftware.grants.domains.places.Place;
 
-@Entity
+@Entity(name="`place_image`")
 public class PlaceImage extends BaseImage {
 
 

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

@@ -24,25 +24,31 @@ import scot.carricksoftware.grants.domains.text.PersonText;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity
+@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/Country.java

@@ -14,13 +14,14 @@ import scot.carricksoftware.grants.BaseEntity;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity
+@Entity(name="`country`")
 public class Country extends BaseEntity {
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`name`")
     private String name;
 
-    @OneToMany(mappedBy = "country", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "`country`", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Region> regions = new ArrayList<>();
 
 

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

@@ -10,9 +10,10 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import scot.carricksoftware.grants.BaseEntity;
 
-@Entity
+@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

@@ -15,12 +15,14 @@ import scot.carricksoftware.grants.domains.text.PlaceText;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity
+@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

@@ -12,12 +12,14 @@ import scot.carricksoftware.grants.BaseEntity;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity
+@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/AppendixText.java

@@ -7,7 +7,7 @@ package scot.carricksoftware.grants.domains.text;
 
 import jakarta.persistence.Entity;
 
-@Entity
-public class AppendixText extends Text {
+@Entity(name="`appendix_text`")
+public class AppendixText extends BaseText {
 
 }

src/main/java/scot/carricksoftware/grants/domains/text/Text.java → src/main/java/scot/carricksoftware/grants/domains/text/BaseText.java

@@ -6,26 +6,22 @@
 package scot.carricksoftware.grants.domains.text;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
 import jakarta.persistence.Lob;
+import jakarta.persistence.MappedSuperclass;
 import scot.carricksoftware.grants.BaseEntity;
 
-@Entity
-public class Text extends BaseEntity {
+@MappedSuperclass
+public class BaseText extends BaseEntity {
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`level`")
     private String level;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`order`")
     private String order;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`heading`")
     private String heading;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`content`")
     @Lob
     private String content;

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

@@ -7,8 +7,8 @@ package scot.carricksoftware.grants.domains.text;
 
 import jakarta.persistence.Entity;
 
-@Entity
-public class DocumentText extends Text {
+@Entity(name="`document_text`")
+public class DocumentText extends BaseText {
 
 
 

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

@@ -10,8 +10,8 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import scot.carricksoftware.grants.domains.people.Person;
 
-@Entity
-public class PersonText extends Text {
+@Entity(name="`person_text`")
+public class PersonText extends BaseText {
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne

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

@@ -11,8 +11,8 @@ import jakarta.persistence.ManyToOne;
 import scot.carricksoftware.grants.domains.places.Place;
 
 
-@Entity
-public class PlaceText extends Text {
+@Entity(name="`place_text`")
+public class PlaceText extends BaseText {
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne

src/main/resources/db/changelog/2025/11/04-01-changelog.sql

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+-- changeset apg:1762255362349-1
+ALTER TABLE place_image
+    ADD caption  VARCHAR(255) NULL,
+    ADD height   VARCHAR(255) NULL,
+    ADD image_id BIGINT       NULL,
+    ADD level    VARCHAR(255) NULL,
+    ADD `order`  VARCHAR(255) NULL,
+    ADD width    VARCHAR(255) NULL;

src/main/resources/db/changelog/2025/11/04-02-changelog.sql

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+
+-- changeset apg:1762255362349-2
+ALTER TABLE document_text
+    ADD content LONGTEXT     NULL,
+    ADD heading VARCHAR(255) NULL,
+    ADD level   VARCHAR(255) NULL,
+    ADD `order` VARCHAR(255) NULL;
+
+

src/main/resources/db/changelog/2025/11/04-03-changelog.sql

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+
+-- changeset apg:1762255362349-3
+ALTER TABLE place_text
+    ADD content LONGTEXT     NULL,
+    ADD heading VARCHAR(255) NULL,
+    ADD level   VARCHAR(255) NULL,
+    ADD `order` VARCHAR(255) NULL;
+

src/main/resources/db/changelog/2025/11/04-04-changelog.sql

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+-- changeset apg:1762255362349-15
+ALTER TABLE place_image
+    ADD CONSTRAINT FK_PLACE_IMAGE_ON_IMAGE FOREIGN KEY (image_id) REFERENCES image (id);
+

src/main/resources/db/changelog/master.xml

@@ -65,6 +65,10 @@
     <include file="/db/changelog/2025/10/14-02-changelog.sql"/>
     <include file="/db/changelog/2025/11/02-01-changelog.sql"/>
     <include file="/db/changelog/2025/11/02-02-changelog.sql"/>
+    <include file="/db/changelog/2025/11/04-01-changelog.sql"/>
+    <include file="/db/changelog/2025/11/04-02-changelog.sql"/>
+    <include file="/db/changelog/2025/11/04-03-changelog.sql"/>
+    <include file="/db/changelog/2025/11/04-04-changelog.sql"/>
 
 
 </databaseChangeLog>

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadTextTest.java → src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadBaseTextTest.java

@@ -26,7 +26,7 @@ import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPe
 import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
 @ExtendWith(MockitoExtension.class)
-public class DataLoadTextTest {
+public class DataLoadBaseTextTest {
 
     private DataLoadTexts dataLoadTexts;
 

src/test/java/scot/carricksoftware/grants/commands/text/AppendixTextCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/text/AppendixBaseTextCommandTest.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 AppendixTextCommandTest {
+class AppendixBaseTextCommandTest {
 
     private AppendixTextCommand appendixTextCommand;
 

src/test/java/scot/carricksoftware/grants/commands/text/DocumentTextCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/text/DocumentBaseTextCommandTest.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 DocumentTextCommandTest {
+class DocumentBaseTextCommandTest {
 
     private DocumentTextCommand documentTextCommand;
 

src/test/java/scot/carricksoftware/grants/commands/text/PersonTextCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/text/PersonBaseTextCommandTest.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 PersonTextCommandTest {
+class PersonBaseTextCommandTest {
 
     private PersonTextCommand personTextCommand;
 

src/test/java/scot/carricksoftware/grants/commands/text/PlaceTextCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/text/PlaceBaseTextCommandTest.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 PlaceTextCommandTest {
+class PlaceBaseTextCommandTest {
 
     private PlaceTextCommand placeTextCommand;
 

src/test/java/scot/carricksoftware/grants/controllers/images/appendiximages/AppendixImageTextListControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/images/appendiximages/AppendixImageBaseTextListControllerTest.java

@@ -28,7 +28,7 @@ import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLo
 
 
 @ExtendWith(MockitoExtension.class)
-public class AppendixImageTextListControllerTest {
+public class AppendixImageBaseTextListControllerTest {
 
     private AppendixImageListControllerImpl controller;
 

src/test/java/scot/carricksoftware/grants/controllers/images/personimages/PersonImageTextListControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/images/personimages/PersonImageBaseTextListControllerTest.java

@@ -27,7 +27,7 @@ import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLo
 
 
 @ExtendWith(MockitoExtension.class)
-public class PersonImageTextListControllerTest {
+public class PersonImageBaseTextListControllerTest {
 
     private PersonImageListControllerImpl controller;
 

src/test/java/scot/carricksoftware/grants/controllers/images/placeimages/PlaceDocumentTextListControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/images/placeimages/PlaceDocumentBaseTextListControllerTest.java

@@ -26,7 +26,7 @@ import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLo
 
 
 @ExtendWith(MockitoExtension.class)
-public class PlaceDocumentTextListControllerTest {
+public class PlaceDocumentBaseTextListControllerTest {
 
     private PlaceImageListControllerImpl controller;
 

src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/AppendixTextControllerSaveOrUpdateTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/AppendixBaseTextControllerSaveOrUpdateTest.java

@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-public class AppendixTextControllerSaveOrUpdateTest {
+public class AppendixBaseTextControllerSaveOrUpdateTest {
 
     @SuppressWarnings("unused")
     private AppendixTextFormControllerImpl appendixTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/AppendixTextFormControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/AppendixBaseTextFormControllerTest.java

@@ -33,7 +33,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomAppe
 
 
 @ExtendWith(MockitoExtension.class)
-public class AppendixTextFormControllerTest {
+public class AppendixBaseTextFormControllerTest {
 
     @SuppressWarnings("unused")
     private AppendixTextFormControllerImpl appendixTextController;

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

@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-public class AppendixTextFormControllerValidationTest {
+public class AppendixBaseTextFormControllerValidationTest {
 
     @SuppressWarnings("unused")
     private AppendixTextFormControllerImpl appendixTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/PersonTextListControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/appendixtest/PersonBaseTextListControllerTest.java

@@ -29,7 +29,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomAppe
 
 
 @ExtendWith(MockitoExtension.class)
-public class PersonTextListControllerTest {
+public class PersonBaseTextListControllerTest {
 
     private AppendixTextListControllerImpl controller;
 

src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextControllerSaveOrUpdateTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentBaseTextControllerSaveOrUpdateTest.java

@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-public class DocumentTextControllerSaveOrUpdateTest {
+public class DocumentBaseTextControllerSaveOrUpdateTest {
 
     @SuppressWarnings("unused")
     private DocumentTextFormControllerImpl documentTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextFormControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentBaseTextFormControllerTest.java

@@ -30,7 +30,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomDocu
 
 
 @ExtendWith(MockitoExtension.class)
-public class DocumentTextFormControllerTest {
+public class DocumentBaseTextFormControllerTest {
 
     @SuppressWarnings("unused")
     private DocumentTextFormControllerImpl documentTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextFormControllerValidationTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentBaseTextFormControllerValidationTest.java

@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-public class DocumentTextFormControllerValidationTest {
+public class DocumentBaseTextFormControllerValidationTest {
 
     @SuppressWarnings("unused")
     private DocumentTextFormControllerImpl documentTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentTextListControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/documenttext/DocumentBaseTextListControllerTest.java

@@ -26,7 +26,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomDocu
 
 
 @ExtendWith(MockitoExtension.class)
-public class DocumentTextListControllerTest {
+public class DocumentBaseTextListControllerTest {
 
     private DocumentTextListControllerImpl controller;
 

src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonTextControllerSaveOrUpdateTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonBaseTextControllerSaveOrUpdateTest.java

@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-public class PersonTextControllerSaveOrUpdateTest {
+public class PersonBaseTextControllerSaveOrUpdateTest {
 
     @SuppressWarnings("unused")
     private PersonTextFormControllerImpl personTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonTextFormControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonBaseTextFormControllerTest.java

@@ -31,7 +31,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.*;
 
 
 @ExtendWith(MockitoExtension.class)
-public class PersonTextFormControllerTest {
+public class PersonBaseTextFormControllerTest {
 
     @SuppressWarnings("unused")
     private PersonTextFormControllerImpl personTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonTextFormControllerValidationTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonBaseTextFormControllerValidationTest.java

@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-public class PersonTextFormControllerValidationTest {
+public class PersonBaseTextFormControllerValidationTest {
 
     @SuppressWarnings("unused")
     private PersonTextFormControllerImpl personTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonTextListControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/persondocument/PersonBaseTextListControllerTest.java

@@ -27,7 +27,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomPers
 
 
 @ExtendWith(MockitoExtension.class)
-public class PersonTextListControllerTest {
+public class PersonBaseTextListControllerTest {
 
     private PersonTextListControllerImpl controller;
 

src/test/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceTextControllerSaveOrUpdateTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceBaseTextControllerSaveOrUpdateTest.java

@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-public class PlaceTextControllerSaveOrUpdateTest {
+public class PlaceBaseTextControllerSaveOrUpdateTest {
 
     @SuppressWarnings("unused")
     private PlaceTextFormControllerImpl placeTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceTextFormControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceBaseTextFormControllerTest.java

@@ -30,7 +30,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.*;
 
 
 @ExtendWith(MockitoExtension.class)
-public class PlaceTextFormControllerTest {
+public class PlaceBaseTextFormControllerTest {
 
     @SuppressWarnings("unused")
     private PlaceTextFormControllerImpl placeTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceTextFormControllerValidationTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceBaseTextFormControllerValidationTest.java

@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-public class PlaceTextFormControllerValidationTest {
+public class PlaceBaseTextFormControllerValidationTest {
 
     @SuppressWarnings("unused")
     private PlaceTextFormControllerImpl placeTextController;

src/test/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceTextListControllerTest.java → src/test/java/scot/carricksoftware/grants/controllers/text/placetext/PlaceBaseTextListControllerTest.java

@@ -26,7 +26,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomPlac
 
 
 @ExtendWith(MockitoExtension.class)
-public class PlaceTextListControllerTest {
+public class PlaceBaseTextListControllerTest {
 
     private PlaceTextListControllerImpl controller;
 

src/test/java/scot/carricksoftware/grants/converters/text/appendixtext/AppendixTextCommandConverterTest.java → src/test/java/scot/carricksoftware/grants/converters/text/appendixtext/AppendixBaseTextCommandConverterTest.java

@@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
-class AppendixTextCommandConverterTest {
+class AppendixBaseTextCommandConverterTest {
 
     private AppendixTextCommandConverter converter;
 

src/test/java/scot/carricksoftware/grants/converters/text/appendixtext/AppendixTextConverterTest.java → src/test/java/scot/carricksoftware/grants/converters/text/appendixtext/AppendixBaseTextConverterTest.java

@@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
-class AppendixTextConverterTest {
+class AppendixBaseTextConverterTest {
 
     private AppendixTextConverter converter;
 

src/test/java/scot/carricksoftware/grants/converters/text/documenttext/DocumentTextCommandConverterTest.java → src/test/java/scot/carricksoftware/grants/converters/text/documenttext/DocumentBaseTextCommandConverterTest.java

@@ -14,7 +14,7 @@ import scot.carricksoftware.grants.domains.text.DocumentText;
 import static org.junit.jupiter.api.Assertions.*;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
-class DocumentTextCommandConverterTest {
+class DocumentBaseTextCommandConverterTest {
 
     private DocumentTextCommandConverter converter;
 

src/test/java/scot/carricksoftware/grants/converters/text/documenttext/DocumentTextConverterTest.java → src/test/java/scot/carricksoftware/grants/converters/text/documenttext/DocumentBaseTextConverterTest.java

@@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
-class DocumentTextConverterTest {
+class DocumentBaseTextConverterTest {
 
     private DocumentTextConverter converter;
 

src/test/java/scot/carricksoftware/grants/converters/text/persontext/PersonTextCommandConverterTest.java → src/test/java/scot/carricksoftware/grants/converters/text/persontext/PersonBaseTextCommandConverterTest.java

@@ -18,7 +18,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
-class PersonTextCommandConverterTest {
+class PersonBaseTextCommandConverterTest {
 
     private PersonTextCommandConverter converter;
 

src/test/java/scot/carricksoftware/grants/converters/text/persontext/PersonTextConverterTest.java → src/test/java/scot/carricksoftware/grants/converters/text/persontext/PersonBaseTextConverterTest.java

@@ -17,7 +17,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
-class PersonTextConverterTest {
+class PersonBaseTextConverterTest {
 
     private PersonTextConverter converter;
 

src/test/java/scot/carricksoftware/grants/converters/text/placeText/PlaceTextCommandConverterTest.java → src/test/java/scot/carricksoftware/grants/converters/text/placeText/PlaceBaseTextCommandConverterTest.java

@@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
-class PlaceTextCommandConverterTest {
+class PlaceBaseTextCommandConverterTest {
 
     private PlaceTextCommandConverter converter;
 

src/test/java/scot/carricksoftware/grants/converters/text/placeText/PlaceTextConverterTest.java → src/test/java/scot/carricksoftware/grants/converters/text/placeText/PlaceBaseTextConverterTest.java

@@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
-class PlaceTextConverterTest {
+class PlaceBaseTextConverterTest {
 
     private PlaceTextConverter converter;
 

src/test/java/scot/carricksoftware/grants/domains/text/AppendixTextTest.java → src/test/java/scot/carricksoftware/grants/domains/text/AppendixBaseTextTest.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 AppendixTextTest {
+class AppendixBaseTextTest {
 
     private AppendixText appendixText;
 

src/test/java/scot/carricksoftware/grants/domains/text/DocumentTextTest.java → src/test/java/scot/carricksoftware/grants/domains/text/DocumentBaseTextTest.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 DocumentTextTest {
+class DocumentBaseTextTest {
 
     private DocumentText documentText;
 

src/test/java/scot/carricksoftware/grants/domains/text/PersonTextTest.java → src/test/java/scot/carricksoftware/grants/domains/text/PersonBaseTextTest.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 PersonTextTest {
+class PersonBaseTextTest {
 
     private PersonText personText;
 

src/test/java/scot/carricksoftware/grants/domains/text/PlaceTextTest.java → src/test/java/scot/carricksoftware/grants/domains/text/PlaceBaseTextTest.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 PlaceTextTest {
+class PlaceBaseTextTest {
 
     private PlaceText placeText;
 

src/test/java/scot/carricksoftware/grants/services/text/appendixtext/AppendixTextFindTest.java → src/test/java/scot/carricksoftware/grants/services/text/appendixtext/AppendixBaseTextFindTest.java

@@ -27,7 +27,7 @@ import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLo
 import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomAppendixText;
 
 @ExtendWith(MockitoExtension.class)
-public class AppendixTextFindTest {
+public class AppendixBaseTextFindTest {
 
     AppendixTextService appendixTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/appendixtext/AppendixTextSaveTest.java → src/test/java/scot/carricksoftware/grants/services/text/appendixtext/AppendixBaseTextSaveTest.java

@@ -25,7 +25,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomAppe
 
 
 @ExtendWith(MockitoExtension.class)
-public class AppendixTextSaveTest {
+public class AppendixBaseTextSaveTest {
 
     AppendixTextService appendixTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/appendixtext/AppendixTextServiceTest.java → src/test/java/scot/carricksoftware/grants/services/text/appendixtext/AppendixBaseTextServiceTest.java

@@ -30,7 +30,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomAppe
 
 
 @ExtendWith(MockitoExtension.class)
-public class AppendixTextServiceTest {
+public class AppendixBaseTextServiceTest {
 
     AppendixTextService appendixTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/documenttext/DocumentTextFindTest.java → src/test/java/scot/carricksoftware/grants/services/text/documenttext/DocumentBaseTextFindTest.java

@@ -26,7 +26,7 @@ import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLo
 import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomDocumentText;
 
 @ExtendWith(MockitoExtension.class)
-public class DocumentTextFindTest {
+public class DocumentBaseTextFindTest {
 
     DocumentTextService documentTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/documenttext/DocumentTextSaveTest.java → src/test/java/scot/carricksoftware/grants/services/text/documenttext/DocumentBaseTextSaveTest.java

@@ -25,7 +25,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomDocu
 
 
 @ExtendWith(MockitoExtension.class)
-public class DocumentTextSaveTest {
+public class DocumentBaseTextSaveTest {
 
     DocumentTextService documentTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/documenttext/DocumentTextServiceTest.java → src/test/java/scot/carricksoftware/grants/services/text/documenttext/DocumentBaseTextServiceTest.java

@@ -30,7 +30,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomDocu
 
 
 @ExtendWith(MockitoExtension.class)
-public class DocumentTextServiceTest {
+public class DocumentBaseTextServiceTest {
 
     DocumentTextService documentTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/persontext/PersonTextFindTest.java → src/test/java/scot/carricksoftware/grants/services/text/persontext/PersonBaseTextFindTest.java

@@ -26,7 +26,7 @@ import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLo
 import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomPersonText;
 
 @ExtendWith(MockitoExtension.class)
-public class PersonTextFindTest {
+public class PersonBaseTextFindTest {
 
     PersonTextService personTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/persontext/PersonTextSaveTest.java → src/test/java/scot/carricksoftware/grants/services/text/persontext/PersonBaseTextSaveTest.java

@@ -25,7 +25,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomPers
 
 
 @ExtendWith(MockitoExtension.class)
-public class PersonTextSaveTest {
+public class PersonBaseTextSaveTest {
 
     PersonTextService personTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/persontext/PersonTextServiceTest.java → src/test/java/scot/carricksoftware/grants/services/text/persontext/PersonBaseTextServiceTest.java

@@ -30,7 +30,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomPers
 
 
 @ExtendWith(MockitoExtension.class)
-public class PersonTextServiceTest {
+public class PersonBaseTextServiceTest {
 
     PersonTextService personTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/placetext/PlaceTextFindTest.java → src/test/java/scot/carricksoftware/grants/services/text/placetext/PlaceBaseTextFindTest.java

@@ -26,7 +26,7 @@ import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLo
 import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomPlaceText;
 
 @ExtendWith(MockitoExtension.class)
-public class PlaceTextFindTest {
+public class PlaceBaseTextFindTest {
 
     PlaceTextService placeTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/placetext/PlaceTextSaveTest.java → src/test/java/scot/carricksoftware/grants/services/text/placetext/PlaceBaseTextSaveTest.java

@@ -25,7 +25,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomPlac
 
 
 @ExtendWith(MockitoExtension.class)
-public class PlaceTextSaveTest {
+public class PlaceBaseTextSaveTest {
 
     PlaceTextService placeTextService;
 

src/test/java/scot/carricksoftware/grants/services/text/placetext/PlaceTextServiceTest.java → src/test/java/scot/carricksoftware/grants/services/text/placetext/PlaceBaseTextServiceTest.java

@@ -30,7 +30,7 @@ import static scot.carricksoftware.grants.GenerateRandomTextValues.GetRandomPlac
 
 
 @ExtendWith(MockitoExtension.class)
-public class PlaceTextServiceTest {
+public class PlaceBaseTextServiceTest {
 
     PlaceTextService placeTextService;
 

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

@@ -19,7 +19,7 @@ import static org.mockito.Mockito.verify;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
-class AppendixTextCommandValidatorImplTest {
+class AppendixBaseTextCommandValidatorImplTest {
 
     private AppendixTextCommandValidatorImpl validator;
 

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

@@ -21,7 +21,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
 @ExtendWith(MockitoExtension.class)
-class PersonTextCommandValidatorImplTest {
+class PersonBaseTextCommandValidatorImplTest {
 
     private PersonTextCommandValidatorImpl validator;