This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch 3200_broken-value-choices in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/3200_broken-value-choices by this push: new 302aad8eb9 ISIS-3200: reverts breaking change in last commit 302aad8eb9 is described below commit 302aad8eb9d860d3995b3fc5e8f7fe81572dd6de Author: Andi Huber <ahu...@apache.org> AuthorDate: Sat Sep 3 06:38:58 2022 +0200 ISIS-3200: reverts breaking change in last commit --- .../object/_ManagedObjectEntityHybrid.java | 28 ++++++---------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectEntityHybrid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectEntityHybrid.java index a04912a514..cd218a28bb 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectEntityHybrid.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/object/_ManagedObjectEntityHybrid.java @@ -49,30 +49,20 @@ implements Refetchable { private @NonNull Either<_ManagedObjectEntityDetached, _ManagedObjectEntityAttached> eitherDetachedOrAttached; - private MorphState morphState; - - private enum MorphState { - ATTACHED, - DETACHED; - static MorphState valueOf(final EntityState entityState) { - return entityState.isDetached() - ? DETACHED - : ATTACHED; - } - }; + private EntityState entityState; _ManagedObjectEntityHybrid( final @NonNull _ManagedObjectEntityDetached detached) { super(ManagedObject.Specialization.ENTITY, detached.getSpecification()); this.eitherDetachedOrAttached = Either.left(detached); - this.morphState = MorphState.DETACHED; + this.entityState = EntityState.PERSISTABLE_DETACHED; } _ManagedObjectEntityHybrid( final @NonNull _ManagedObjectEntityAttached attached) { super(ManagedObject.Specialization.ENTITY, attached.getSpecification()); this.eitherDetachedOrAttached = Either.right(attached); - this.morphState = MorphState.ATTACHED; + this.entityState = EntityState.PERSISTABLE_ATTACHED; this.bookmarkRef.set(attached.getBookmark().orElseThrow()); } @@ -100,15 +90,11 @@ implements Refetchable { val entityState = eitherDetachedOrAttached .fold(ManagedObject::getEntityState, ManagedObject::getEntityState); - val reassessedMorphState = MorphState.valueOf(entityState); - - if(this.morphState!=reassessedMorphState) { - log.debug("about to morph {} -> {}", this.morphState, reassessedMorphState); - this.morphState = reassessedMorphState; - + if(this.entityState!=entityState) { + log.debug("about to morph {} -> {}", this.entityState, entityState); + this.entityState = entityState; reassessVariant(entityState, peekAtPojo()); - - if(this.morphState == MorphState.ATTACHED) { + if(entityState.isAttached()) { _Assert.assertTrue(isVariantAttached()); } else { _Assert.assertTrue(isVariantDetached());