[isis] branch master updated: ISIS-2903: cleaning up demo entities?

[ah...@apache.org]

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e5ba11  ISIS-2903: cleaning up demo entities?
3e5ba11 is described below

commit 3e5ba11e808505360bf52d170c4a408fff91fc19
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 30 18:38:35 2021 +0100

    ISIS-2903: cleaning up demo entities?
---
 .../DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java | 5 ++---
 .../DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
index bb06068..56661c1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
@@ -18,17 +18,16 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jdo;
 
+import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.springframework.context.annotation.Profile;
 
 import org.apache.isis.applib.annotation.Bounding;
 import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -42,7 +41,6 @@ import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.J
 @DomainObject(
         bounding = Bounding.BOUNDED
         , logicalTypeName = "demo.JaxbRefEntity")
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
 public class JaxbRefJdo
         extends JaxbRefEntity {
 
@@ -50,6 +48,7 @@ public class JaxbRefJdo
         this.name = name;
     }
 
+    @Column(allowsNull = "false")
     @Getter @Setter
     private String name;
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
index f8de1b4..b28b9ad 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
@@ -18,18 +18,17 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jpa;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityListeners;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.springframework.context.annotation.Profile;
 
 import org.apache.isis.applib.annotation.Bounding;
 import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
 import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
 
 import lombok.Getter;
@@ -49,7 +48,6 @@ import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.J
 @DomainObject(
         bounding = Bounding.BOUNDED
         , logicalTypeName = "demo.JaxbRefEntity")
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
 @NoArgsConstructor
 public class JaxbRefJpa
         extends JaxbRefEntity {
@@ -62,6 +60,7 @@ public class JaxbRefJpa
     @GeneratedValue
     private Long id;
 
+    @Column(nullable = false)
     @Getter @Setter
     private String name;
 }