[isis-app-demo] 01/05: removes unnecessary javax.persistence qualifications.

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 6c5f4b6b9152b0558dbeb37713e79e388a7666be
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 23:13:59 2021 +0100

    removes unnecessary javax.persistence qualifications.
---
 .../modules/pets/dom/petowner/PetOwner.java        | 44 ++++++++++++++--------
 .../modules/pets/dom/petowner/PetOwners.java       |  7 +++-
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
index 5eb374d..dc89b83 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
@@ -3,6 +3,18 @@ package petclinic.modules.pets.dom.petowner;
 import java.util.Comparator;
 
 import javax.inject.Inject;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.UniqueConstraint;
+import javax.persistence.Version;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.isis.applib.annotation.Action;
@@ -34,22 +46,22 @@ import petclinic.modules.pets.types.Name;
 import petclinic.modules.pets.types.Notes;
 
 
-@javax.persistence.Entity
-@javax.persistence.Table(
+@Entity
+@Table(
     schema="pets",
     uniqueConstraints = {
-        @javax.persistence.UniqueConstraint(name = "PetOwner__name__UNQ", columnNames = {"NAME"})
+        @UniqueConstraint(name = "PetOwner__name__UNQ", columnNames = {"NAME"})
     }
 )
-@javax.persistence.NamedQueries({
-        @javax.persistence.NamedQuery(
+@NamedQueries({
+        @NamedQuery(
                 name = PetOwner.NAMED_QUERY__FIND_BY_NAME_LIKE,
                 query = "SELECT so " +
                         "FROM PetOwner so " +
                         "WHERE so.name LIKE :name"
         )
 })
-@javax.persistence.EntityListeners(IsisEntityListener.class)
+@EntityListeners(IsisEntityListener.class)
 @DomainObject(logicalTypeName = "pets.PetOwner", entityChangePublishing = Publishing.ENABLED)
 @DomainObjectLayout()
 @NoArgsConstructor(access = AccessLevel.PUBLIC)
@@ -59,13 +71,13 @@ public class PetOwner implements Comparable<PetOwner> {
 
     static final String NAMED_QUERY__FIND_BY_NAME_LIKE = "PetOwner.findByNameLike";
 
-    @javax.persistence.Id
-    @javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
-    @javax.persistence.Column(name = "id", nullable = false)
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id", nullable = false)
     private Long id;
 
-    @javax.persistence.Version
-    @javax.persistence.Column(name = "version", nullable = false)
+    @Version
+    @Column(name = "version", nullable = false)
     @PropertyLayout(fieldSetId = "metadata", sequence = "999")
     @Getter @Setter
     private long version;
@@ -76,21 +88,21 @@ public class PetOwner implements Comparable<PetOwner> {
         return simpleObject;
     }
 
-    @Inject @javax.persistence.Transient RepositoryService repositoryService;
-    @Inject @javax.persistence.Transient TitleService titleService;
-    @Inject @javax.persistence.Transient MessageService messageService;
+    @Inject @Transient RepositoryService repositoryService;
+    @Inject @Transient TitleService titleService;
+    @Inject @Transient MessageService messageService;
 
 
 
     @Title
     @Name
-    @javax.persistence.Column(length = Name.MAX_LEN, nullable = false)
+    @Column(length = Name.MAX_LEN, nullable = false)
     @Getter @Setter @ToString.Include
     @PropertyLayout(fieldSetId = "name", sequence = "1")
     private String name;
 
     @Notes
-    @javax.persistence.Column(length = Notes.MAX_LEN, nullable = true)
+    @Column(length = Notes.MAX_LEN, nullable = true)
     @Getter @Setter
     @Property(commandPublishing = Publishing.ENABLED, executionPublishing = Publishing.ENABLED)
     @PropertyLayout(fieldSetId = "name", sequence = "2")
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
index c471183..8d0b165 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
@@ -2,6 +2,7 @@ package petclinic.modules.pets.dom.petowner;
 
 import java.util.List;
 
+import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.persistence.TypedQuery;
 
@@ -18,14 +19,16 @@ import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
 
+import lombok.RequiredArgsConstructor;
+
 import petclinic.modules.pets.types.Name;
 
 @DomainService(
         nature = NatureOfService.VIEW,
         logicalTypeName = "pets.PetOwners"
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
-@lombok.RequiredArgsConstructor(onConstructor_ = {@Inject} )
+@Priority(PriorityPrecedence.EARLY)
+@RequiredArgsConstructor(onConstructor_ = {@Inject} )
 public class PetOwners {
 
     final RepositoryService repositoryService;