You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/06/29 09:45:19 UTC
[causeway] branch 3500-entity.state.cleanup updated: CAUSEWAY-3500: re-unite DETACHED states
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 3500-entity.state.cleanup
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/3500-entity.state.cleanup by this push:
new b62e415fa8 CAUSEWAY-3500: re-unite DETACHED states
b62e415fa8 is described below
commit b62e415fa8b48c83071b359d3ae7f7e988dcdfe0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jun 29 11:45:15 2023 +0200
CAUSEWAY-3500: re-unite DETACHED states
---
.../applib/services/repository/EntityState.java | 20 +++-----------------
.../datanucleus/entities/DnEntityStateProvider.java | 2 +-
.../jpa/integration/entity/JpaEntityFacet.java | 2 +-
.../JpaGeneratedLongIdEntityLifecycleTest.java | 2 +-
.../JpaNonGeneratedStringIdEntityLifecycleTest.java | 4 ++--
5 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/repository/EntityState.java b/api/applib/src/main/java/org/apache/causeway/applib/services/repository/EntityState.java
index 0f92106253..bf71076de1 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/repository/EntityState.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/repository/EntityState.java
@@ -70,8 +70,6 @@ public enum EntityState {
* Closest match for JPA is {@link #TRANSIENT_OR_REMOVED}.
*/
JDO_DELETED(false),
- /** not used */
- JDO_DETACHED(true),
/**
* Entity is NOT attached to a persistence session. Has an OID, hence can be bookmarked and re-fetched.
* <p>
@@ -83,7 +81,7 @@ public enum EntityState {
* but instead re-fetch entities based on their OID,
* discarding any changes that might have happened since the last commit.
*/
- JPA_DETACHED(true),
+ DETACHED(true),
/**
* Entity is NOT attached to a persistence session. Has no OID.
*/
@@ -101,29 +99,17 @@ public enum EntityState {
/** @see #ATTACHED */
public boolean isAttached() { return this == ATTACHED; }
-
/** @see #ATTACHED_NO_OID */
public boolean isAttachedNoOid() { return this == ATTACHED_NO_OID; }
-
/** @see #JDO_HOLLOW */
public boolean isJdoHollow() { return this == JDO_HOLLOW; }
-
/** @see #JDO_DELETED */
public boolean isJdoDeleted() { return this == JDO_DELETED; }
-
- /**
- * @see #JDO_DETACHED
- * @see #JPA_DETACHED
- */
- public boolean isDetached() {
- return this == JPA_DETACHED
- || this == JDO_DETACHED;
- }
-
+ /** @see #DETACHED */
+ public boolean isDetached() { return this == DETACHED; }
/** @see #TRANSIENT_OR_REMOVED */
public boolean isTransientOrRemoved() { return this == TRANSIENT_OR_REMOVED; }
-
// -- ADVANCED PREDICATES
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
index 962ff27320..af9609ea5b 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
@@ -83,7 +83,7 @@ public class DnEntityStateProvider implements JdoFacetContext {
// at time of writing we have no support for JDO detached states, hence failing early
_Exceptions.throwUnexpectedCodeReach();
return persistable.dnGetObjectId()!=null
- ? EntityState.JDO_DETACHED
+ ? EntityState.DETACHED
: EntityState.TRANSIENT_OR_REMOVED;
}
return persistable.dnGetStateManager() instanceof DnStateManagerForHollow
diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
index a203d7583b..aea65ef8ff 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
@@ -257,7 +257,7 @@ public class JpaEntityFacet
// detect shallow primary key
//TODO this is a hack - see whether we can actually ask the EntityManager to give us an accurate answer
return primaryKeyType.isValid(primaryKey)
- ? EntityState.JPA_DETACHED
+ ? EntityState.DETACHED
: EntityState.TRANSIENT_OR_REMOVED;
}
} catch (PersistenceException ex) {
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
index 12288e542f..6e253c457a 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
@@ -103,7 +103,7 @@ class JpaGeneratedLongIdEntityLifecycleTest {
// expected post-condition (after persist, and having entered a new transaction)
assertEquals(
- EntityState.JPA_DETACHED,
+ EntityState.DETACHED,
MmEntityUtils.getEntityState(getEntityRef()));
val id = ((JpaEntityGeneratedLongId)getEntityRef().getPojo()).getId();
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
index de75732c21..7dc5351519 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
@@ -77,7 +77,7 @@ class JpaNonGeneratedStringIdEntityLifecycleTest {
assertTrue(entity.getSpecification().isEntity());
assertEquals(
- EntityState.JPA_DETACHED,
+ EntityState.DETACHED,
MmEntityUtils.getEntityState(entity));
setEntityRef(entity);
@@ -102,7 +102,7 @@ class JpaNonGeneratedStringIdEntityLifecycleTest {
// expected post-condition (after persist, and having entered a new transaction)
assertEquals(
- EntityState.JPA_DETACHED,
+ EntityState.DETACHED,
MmEntityUtils.getEntityState(getEntityRef()));
val id = ((JpaEntityNonGeneratedStringId)getEntityRef().getPojo()).getName();