@Table added to all domains

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

@@ -27,6 +27,7 @@ public class ImageAttributeConstants {
     public static final String APPENDIX_IMAGE_COMMAND = "appendixImageCommand";
 
     public static final String DOCUMENT_IMAGES = "documentImages";
+    @SuppressWarnings("unused")
     public static final String DOCUMENT_IMAGE_COMMAND = "documentImageCommand";
 
 

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

@@ -66,10 +66,14 @@ public class ImageMappingConstants {
     public static final String DOCUMENT_IMAGE_PREVIOUS = "/documentImages/prev";
     public static final String DOCUMENT_IMAGE_REWIND = "/documentImages/rewind";
     public static final String DOCUMENT_IMAGE_FF = "/documentImages/ff";
+    @SuppressWarnings("unused")
     public static final String DOCUMENT_IMAGE_NEW = "/documentImage/new";
+    @SuppressWarnings("unused")
     public static final String DOCUMENT_IMAGE = "/documentImage";
+    @SuppressWarnings("unused")
     public static final String DOCUMENT_IMAGE_SHOW = "/documentImage/{id}/show";
     public static final String DOCUMENT_IMAGE_DELETE = "/documentImage/{id}/delete";
+    @SuppressWarnings("unused")
     public static final String DOCUMENT_IMAGE_EDIT = "documentImage/{id}/edit";
 
 }

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

@@ -6,14 +6,7 @@
 package scot.carricksoftware.grants.domains.census;
 
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
+import jakarta.persistence.*;
 import scot.carricksoftware.grants.BaseEntity;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.enums.census.CensusBoundaryType;
@@ -22,7 +15,8 @@ import scot.carricksoftware.grants.enums.census.CensusDate;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity(name="`census`")
+@Entity(name="census")
+@Table(name="`census`")
 public class Census extends BaseEntity {
 
     @Enumerated(EnumType.STRING)

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

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

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

@@ -6,19 +6,15 @@
 package scot.carricksoftware.grants.domains.certificates;
 
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.enums.general.Sex;
 
-@Entity(name="`birth_certificate`")
+@Entity(name="birth_certificate")
+@Table(name="`birth_certificate`")
 public class BirthCertificate extends BaseCertificate {
 
     @ManyToOne()

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

@@ -5,20 +5,15 @@
 
 package scot.carricksoftware.grants.domains.certificates;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.Lob;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.enums.general.Sex;
 
-@Entity(name="`death_certificate`")
+@Entity(name="death_certificate")
+@Table(name="`death_certificate`")
 public class DeathCertificate extends BaseCertificate {
 
     @ManyToOne

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

@@ -5,16 +5,14 @@
 
 package scot.carricksoftware.grants.domains.certificates;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import scot.carricksoftware.grants.BaseEntity;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.domains.people.Person;
 
-@Entity(name="`divorce_certificate`")
+@Entity(name="divorce_certificate")
+@Table(name="`divorce_certificate`")
 public class DivorceCertificate extends BaseEntity {
 
     @ManyToOne

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

@@ -5,16 +5,14 @@
 
 package scot.carricksoftware.grants.domains.certificates;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.domains.places.Place;
 
-@Entity(name="`marriage_certificate`")
+@Entity(name="marriage_certificate")
+@Table(name="`marriage_certificate`")
 public class MarriageCertificate extends BaseCertificate {
 
     @ManyToOne

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

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

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

@@ -6,8 +6,11 @@
 package scot.carricksoftware.grants.domains.images;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
-@Entity(name="`document_image`")
+@SuppressWarnings("JpaDataSourceORMInspection")
+@Entity(name="document_image")
+@Table(name="`document_image`")
 public class DocumentImage extends BaseImage {
 
 

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

@@ -8,10 +8,12 @@ package scot.carricksoftware.grants.domains.images;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 import scot.carricksoftware.grants.BaseEntity;
 
 
-@Entity(name="`image`")
+@Entity(name="image")
+@Table(name="`image`")
 public class Image extends BaseEntity {
 
     @Column(name = "`name`")

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

@@ -8,9 +8,11 @@ package scot.carricksoftware.grants.domains.images;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import scot.carricksoftware.grants.domains.people.Person;
 
-@Entity(name="`person_image`")
+@Entity(name="person_image")
+@Table(name="`person_image`")
 public class PersonImage extends BaseImage {
 
     @ManyToOne

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

@@ -8,9 +8,11 @@ package scot.carricksoftware.grants.domains.images;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import scot.carricksoftware.grants.domains.places.Place;
 
-@Entity(name="`place_image`")
+@Entity(name="place_image")
+@Table(name="`place_image`")
 public class PlaceImage extends BaseImage {
 
 

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

@@ -5,12 +5,7 @@
 
 package scot.carricksoftware.grants.domains.people;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
+import jakarta.persistence.*;
 import scot.carricksoftware.grants.BaseEntity;
 import scot.carricksoftware.grants.domains.census.CensusEntry;
 import scot.carricksoftware.grants.domains.certificates.BirthCertificate;
@@ -24,7 +19,8 @@ import scot.carricksoftware.grants.domains.text.PersonText;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity(name="`person`")
+@Entity(name="person")
+@Table(name="`person`")
 public class Person extends BaseEntity {
 
     @ManyToOne

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

@@ -5,16 +5,14 @@
 
 package scot.carricksoftware.grants.domains.places;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
+import jakarta.persistence.*;
 import scot.carricksoftware.grants.BaseEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity(name="`country`")
+@Entity(name="country")
+@Table(name="`country`")
 public class Country extends BaseEntity {
 
 

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

@@ -8,9 +8,11 @@ package scot.carricksoftware.grants.domains.places;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import scot.carricksoftware.grants.BaseEntity;
 
-@Entity(name="`organisation`")
+@Entity(name="organisation")
+@Table(name="`organisation`")
 public class Organisation extends BaseEntity {
 
     @Column(name = "`name`")

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

@@ -15,7 +15,8 @@ import scot.carricksoftware.grants.domains.text.PlaceText;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity(name="`place`")
+@Entity(name="place")
+@Table(name="`place`")
 public class Place extends BaseEntity {
 
     @Column(name = "`name`")

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

@@ -12,7 +12,8 @@ import scot.carricksoftware.grants.BaseEntity;
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity(name="`region`")
+@Entity(name="region")
+@Table(name="`region`")
 public class Region extends BaseEntity {
 
     @Column(name = "`name`")

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

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

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

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

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

@@ -8,9 +8,11 @@ package scot.carricksoftware.grants.domains.text;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import scot.carricksoftware.grants.domains.people.Person;
 
-@Entity(name="`person_text`")
+@Entity(name="person_text")
+@Table(name="`person_text`")
 public class PersonText extends BaseText {
 
     @ManyToOne
@@ -21,7 +23,7 @@ public class PersonText extends BaseText {
         return person;
     }
 
-    public void setPerson(Person person) {
+    public void setPerson(@SuppressWarnings("unused") Person person) {
         this.person = person;
     }
 

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

@@ -8,10 +8,13 @@ package scot.carricksoftware.grants.domains.text;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import scot.carricksoftware.grants.domains.places.Place;
 
 
-@Entity(name="`place_text`")
+
+@Entity(name="place_text")
+@Table(name="`place_text`")
 public class PlaceText extends BaseText {
 
     @ManyToOne