You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/15 08:57:26 UTC
[isis] branch master updated: ISIS-2481: Consolidate BeanSort
ENTITY_JDO, ENTITY_JPA -> ENTITY
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 b311abc ISIS-2481: Consolidate BeanSort ENTITY_JDO, ENTITY_JPA -> ENTITY
b311abc is described below
commit b311abca348990c7c474c4643a342c258fe32ce5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 15 09:57:09 2021 +0100
ISIS-2481: Consolidate BeanSort ENTITY_JDO, ENTITY_JPA -> ENTITY
---
.../org/apache/isis/applib/annotation/Nature.java | 33 ++++++----------------
.../isis/applib/services/metamodel/BeanSort.java | 13 ++-------
.../config/beans/IsisBeanTypeClassifierImpl.java | 6 ++--
.../config/beans/IsisBeanTypeRegistryDefault.java | 5 +---
...atableObjectFacetForDomainObjectAnnotation.java | 3 +-
.../ViewModelSemanticCheckingFacetFactoryTest.java | 5 ++--
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../ActionCommandPublishingJdo.java | 2 +-
.../ActionExecutionPublishingJdo.java | 2 +-
...ainObjectEntityChangePublishingDisabledJdo.java | 2 +-
...mainObjectEntityChangePublishingEnabledJdo.java | 2 +-
...ityChangePublishingEnabledMetaAnnotatedJdo.java | 2 +-
...ngePublishingEnabledMetaAnnotOverriddenJdo.java | 2 +-
.../PropertyCommandPublishingJdo.java | 2 +-
.../PropertyExecutionPublishingJdo.java | 2 +-
.../projecting/jdo/PropertyProjectingChildJdo.java | 2 +-
.../core/wrapperFactory/WrapperFactoryJdo.java | 2 +-
.../datanucleus/config/DnBeanTypeClassifier.java | 4 +--
.../jdo/metamodel/beans/JdoBeanTypeClassifier.java | 2 +-
.../isis/testdomain/jpa/entities/JpaBook.java | 2 +-
.../isis/testdomain/jpa/entities/JpaInventory.java | 2 +-
.../isis/testdomain/jpa/entities/JpaProduct.java | 2 +-
.../testdomain/jpa/entities/JpaProductComment.java | 2 +-
.../isis/testdomain/jpa/springdata/Employee.java | 2 +-
24 files changed, 38 insertions(+), 65 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
index 648963d..5ad37b7 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
@@ -20,6 +20,10 @@ package org.apache.isis.applib.annotation;
import javax.xml.bind.annotation.XmlRootElement;
+import org.springframework.cglib.proxy.Mixin;
+
+import org.apache.isis.applib.ViewModel;
+
/**
* The different sorts of domain objects recognized by Isis.
*
@@ -39,32 +43,14 @@ public enum Nature {
NOT_SPECIFIED,
/**
- * A domain entity whose persistence is managed internally by Isis, using JDO as the persistence implementation.
- * Domain entities are considered to be part of the domain model layer.
- *
+ * A domain entity whose persistence is managed internally by Isis,
+ * using JPA or JDO as the persistence implementation.
* <p>
- * Domain entities are considered to be part of the domain model layer.
- * </p>
- *
- * <p>
- * Currently implies no additional semantics other than documentation.
- * </p>
- */
- JDO_ENTITY,
-
- /**
- * A domain entity whose persistence is managed internally by Isis, using JPA as the persistence implementation.
* Domain entities are considered to be part of the domain model layer.
- *
* <p>
- * Domain entities are considered to be part of the domain model layer.
- * </p>
- *
- * <p>
- * Currently implies no additional semantics other than documentation.
- * </p>
+ * Currently implies no additional semantics other than documentation.
*/
- JPA_ENTITY,
+ ENTITY,
/**
* An object that is conceptually part of the application layer, and which surfaces behavior and/or state that
@@ -103,8 +89,7 @@ public enum Nature {
;
public boolean isEntity() {
- return this == Nature.JDO_ENTITY
- || this == Nature.JPA_ENTITY;
+ return this == Nature.ENTITY;
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
index 18a0cf0..d2e88e0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metamodel/BeanSort.java
@@ -38,7 +38,7 @@ public enum BeanSort {
* with a persistence layer. <p> see also {@link #VIEW_MODEL}
*
*/
- ENTITY_JDO, ENTITY_JPA,
+ ENTITY,
/**
* Injectable object, associated with a lifecycle context
* (application-scoped, request-scoped, ...).
@@ -90,13 +90,10 @@ public enum BeanSort {
return this == COLLECTION;
}
- public boolean isEntityJdo() {
- return this == ENTITY_JDO;
+ public boolean isEntity() {
+ return this == ENTITY;
}
- public boolean isEntityJpa() {
- return this == ENTITY_JPA;
- }
public boolean isUnknown() {
return this == UNKNOWN;
@@ -115,10 +112,6 @@ public enum BeanSort {
return true;
}
-
- public boolean isEntity() {
- return isEntityJdo() || isEntityJpa();
- }
public boolean isWrappingSupported() {
return isMixin() || isViewModel() || isEntity() || isManagedBean();
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierImpl.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierImpl.java
index 29a840c..4b86aa1 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierImpl.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierImpl.java
@@ -79,10 +79,8 @@ implements IsisBeanTypeClassifier {
return BeanClassification.delegated(BeanSort.MANAGED_BEAN_CONTRIBUTING, objectType(aDomainObject));
case MIXIN:
return BeanClassification.selfManaged(BeanSort.MIXIN);
- case JDO_ENTITY:
- return BeanClassification.selfManaged(BeanSort.ENTITY_JDO);
- case JPA_ENTITY:
- return BeanClassification.selfManaged(BeanSort.ENTITY_JPA);
+ case ENTITY:
+ return BeanClassification.selfManaged(BeanSort.ENTITY);
case VIEW_MODEL:
case NOT_SPECIFIED:
//because object is not associated with a persistence context unless discovered above
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
index 0dfdef8..a689452 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryDefault.java
@@ -98,12 +98,9 @@ public class IsisBeanTypeRegistryDefault implements IsisBeanTypeRegistry {
case MIXIN:
mixinTypes.add(cls);
return;
- case ENTITY_JDO:
+ case ENTITY:
entityTypesJdo.add(cls);
return;
- case ENTITY_JPA:
- entityTypesJpa.add(cls);
- return;
case VIEW_MODEL:
viewModelTypes.add(cls);
return;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
index b2360b7..778720d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java
@@ -42,8 +42,7 @@ extends RecreatableObjectFacetDeclarativeInitializingAbstract {
switch (nature) {
case NOT_SPECIFIED:
case BEAN:
- case JDO_ENTITY:
- case JPA_ENTITY:
+ case ENTITY:
case MIXIN:
// not a recreatable object, so no facet
return null;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 55a0ba3..0fd686a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -140,7 +140,7 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
@Test
public void whenInvalidDomainObjectWithNatureJdoEntityImplementingRecreatableDomainObject() throws Exception {
- @org.apache.isis.applib.annotation.DomainObject(nature = Nature.JDO_ENTITY)
+ @org.apache.isis.applib.annotation.DomainObject(nature = Nature.ENTITY)
class InvalidDomainObjectWithNatureJdoEntityImplementingRecreatableDomainObject implements RecreatableDomainObject {
@Override
public String __isis_memento() {
@@ -153,7 +153,8 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
final ValidationFailures validationFailures = processThenValidate(InvalidDomainObjectWithNatureJdoEntityImplementingRecreatableDomainObject.class);
assertThat(validationFailures.getNumberOfFailures(), is(1));
- assertThat(validationFailures.getMessages().iterator().next(), containsString("should not be annotated with @DomainObject with nature of JDO_ENTITY and also implement RecreatableDomainObject (specify a nature of VIEW_MODEL)"));
+ assertThat(validationFailures.getMessages().iterator().next(),
+ containsString("should not be annotated with @DomainObject with nature of ENTITY and also implement RecreatableDomainObject (specify a nature of VIEW_MODEL)"));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 11cfe63..e336e5f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -591,7 +591,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
public static class Nature extends DomainObjectAnnotationFacetFactoryTest {
- @DomainObject(nature = org.apache.isis.applib.annotation.Nature.JDO_ENTITY)
+ @DomainObject(nature = org.apache.isis.applib.annotation.Nature.ENTITY)
class CustomerWithDomainObjectAndNatureSetToJdoEntity {
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Action/commandPublishing/ActionCommandPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Action/commandPublishing/ActionCommandPublishingJdo.java
index a6e6990..994093e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Action/commandPublishing/ActionCommandPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Action/commandPublishing/ActionCommandPublishingJdo.java
@@ -43,7 +43,7 @@ import demoapp.dom.annotDomain._commands.ExposePersistedCommands;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.ActionCommandJdo"
, editing = Editing.DISABLED
)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Action/executionPublishing/ActionExecutionPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Action/executionPublishing/ActionExecutionPublishingJdo.java
index 3d3c9ff..a7c58d7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Action/executionPublishing/ActionExecutionPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Action/executionPublishing/ActionExecutionPublishingJdo.java
@@ -43,7 +43,7 @@ import demoapp.dom.annotDomain._interactions.ExposeCapturedInteractions;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.ActionPublishingJdo"
, editing = Editing.DISABLED
)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingDisabledJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingDisabledJdo.java
index eb0164e..9375cfc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingDisabledJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingDisabledJdo.java
@@ -39,7 +39,7 @@ import demoapp.dom.annotDomain.DomainObject.entityChangePublishing.DomainObjectE
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.DomainObjectAuditingDisabledJdo"
, entityChangePublishing = Publishing.DISABLED // <.>
, bounding = Bounding.BOUNDED
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingEnabledJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingEnabledJdo.java
index 38b3a9f..c4401fb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingEnabledJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingEnabledJdo.java
@@ -39,7 +39,7 @@ import demoapp.dom.annotDomain.DomainObject.entityChangePublishing.DomainObjectE
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.DomainObjectAuditingEnabledJdo"
, entityChangePublishing = Publishing.ENABLED // <.>
, bounding = Bounding.BOUNDED
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java
index ca03c8d..470b78a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdo.java
@@ -41,7 +41,7 @@ import demoapp.dom.annotDomain.DomainObject.entityChangePublishing.metaAnnot.Dom
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObjectEntityChangePublishingEnabledMetaAnnotation // <.>
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.DomainObjectAuditingEnabledMetaAnnotatedJdo"
, bounding = Bounding.BOUNDED
)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java
index c290a32..3204fa9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdo.java
@@ -41,7 +41,7 @@ import demoapp.dom.annotDomain.DomainObject.entityChangePublishing.metaAnnotOver
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObjectEntityChangePublishingDisabledMetaAnnotation // <.>
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.DomainObjectAuditingEnabledMetaAnnotOverriddenJdo"
, entityChangePublishing = Publishing.ENABLED // <.>
, bounding = Bounding.BOUNDED
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/commandPublishing/PropertyCommandPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/commandPublishing/PropertyCommandPublishingJdo.java
index d4b79a8..d6cfc39 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/commandPublishing/PropertyCommandPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/commandPublishing/PropertyCommandPublishingJdo.java
@@ -41,7 +41,7 @@ import demoapp.dom.annotDomain._commands.ExposePersistedCommands;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.PropertyCommandJdo"
, editing = Editing.ENABLED
)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionPublishing/PropertyExecutionPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionPublishing/PropertyExecutionPublishingJdo.java
index 5597fcf..48ddb15 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionPublishing/PropertyExecutionPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/executionPublishing/PropertyExecutionPublishingJdo.java
@@ -42,7 +42,7 @@ import demoapp.dom.annotDomain._interactions.ExposeCapturedInteractions;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.PropertyPublishingJdo"
, editing = Editing.ENABLED
)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/projecting/jdo/PropertyProjectingChildJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/projecting/jdo/PropertyProjectingChildJdo.java
index 34d5bd4..c6502eb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/projecting/jdo/PropertyProjectingChildJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotDomain/Property/projecting/jdo/PropertyProjectingChildJdo.java
@@ -40,7 +40,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.PropertyProjectingChildJdo"
, editing = Editing.DISABLED
)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryJdo.java
index 1ddf352..bb2d9bf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryJdo.java
@@ -47,7 +47,7 @@ import demoapp.dom.annotDomain._commands.ExposePersistedCommands;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- nature=Nature.JDO_ENTITY
+ nature=Nature.ENTITY
, objectType = "demo.WrapperFactoryJdo"
, editing = Editing.DISABLED
)
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnBeanTypeClassifier.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnBeanTypeClassifier.java
index 4f7ae8a..88e8e8e 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnBeanTypeClassifier.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/DnBeanTypeClassifier.java
@@ -29,7 +29,7 @@ import static org.apache.isis.commons.internal.reflection._Annotations.findNeare
import lombok.val;
/**
- * ServiceLoader plugin, classifies PersistenceCapable types into {@link BeanSort#ENTITY_JDO}
+ * ServiceLoader plugin, classifies PersistenceCapable types into {@link BeanSort#ENTITY}
* @since 2.0
*/
public class DnBeanTypeClassifier implements IsisBeanTypeClassifier {
@@ -49,7 +49,7 @@ public class DnBeanTypeClassifier implements IsisBeanTypeClassifier {
return null; // don't categorize as entity ... fall through in the caller's logic
}
- return BeanClassification.selfManaged(BeanSort.ENTITY_JDO);
+ return BeanClassification.selfManaged(BeanSort.ENTITY);
}
return null; // we don't feel responsible to classify given type
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
index c867e88..210232e 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
@@ -49,7 +49,7 @@ public class JdoBeanTypeClassifier implements IsisBeanTypeClassifier {
return null; // don't categorize as entity ... fall through in the caller's logic
}
- return BeanClassification.selfManaged(BeanSort.ENTITY_JDO);
+ return BeanClassification.selfManaged(BeanSort.ENTITY);
}
return null; // we don't feel responsible to classify given type
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
index f3db754..6767119 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaBook.java
@@ -46,7 +46,7 @@ import lombok.extern.log4j.Log4j2;
@DiscriminatorValue("Book")
@DomainObject(
objectType = "testdomain.jpa.Book",
- nature = Nature.JPA_ENTITY, //TODO[ISIS-2332] should not be required, when using JPA quick classify SPI
+ nature = Nature.ENTITY, //TODO[ISIS-2332] should not be required, when using JPA quick classify SPI
entityChangePublishing = Publishing.ENABLED)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@ToString(callSuper = true)
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
index cc101b3..579f332 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
@@ -43,7 +43,7 @@ import lombok.ToString;
@Entity
@DomainObject(
objectType = "testdomain.jdo.Inventory",
- nature = Nature.JPA_ENTITY, //TODO[2033] should not be required, when using JPA quick classify SPI
+ nature = Nature.ENTITY, //TODO[2033] should not be required, when using JPA quick classify SPI
entityChangePublishing = Publishing.ENABLED)
@NamedQuery(
name = "JpaInventory.findAffordableProducts",
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java
index d0efe50..883e590 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java
@@ -55,7 +55,7 @@ import lombok.ToString;
discriminatorType = DiscriminatorType.STRING)
@DomainObject(
objectType = "testdomain.jpa.Product",
- nature = Nature.JPA_ENTITY //TODO[2033] should not be required, when using JPA quick classify SPI
+ nature = Nature.ENTITY //TODO[2033] should not be required, when using JPA quick classify SPI
)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor(access = AccessLevel.PROTECTED)
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
index 34c7a5a..0cc4cd0 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
@@ -39,7 +39,7 @@ import lombok.Setter;
@Entity
@DomainObject(
objectType = "testdomain.jpa.ProductComment",
- nature = Nature.JPA_ENTITY) //TODO[ISIS-2332] should not be required, when using JPA quick classify SPI
+ nature = Nature.ENTITY) //TODO[ISIS-2332] should not be required, when using JPA quick classify SPI
public class JpaProductComment implements Timestampable {
@Id
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
index 5b35d5a..7aa7268 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/springdata/Employee.java
@@ -33,7 +33,7 @@ import lombok.Setter;
import lombok.ToString;
@Entity
-@DomainObject(nature=Nature.JPA_ENTITY, objectType = "testdomain.jpa.springdata.Employee")
+@DomainObject(nature=Nature.ENTITY, objectType = "testdomain.jpa.springdata.Employee")
@Getter @Setter @ToString @EqualsAndHashCode
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Employee {