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 2020/01/17 11:42:29 UTC

[isis] branch master updated: ISIS-2158: cleaning up unused code

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 3c566a9  ISIS-2158: cleaning up unused code
3c566a9 is described below

commit 3c566a969c23c4e2a1fa8a35bdfc88f2273ce5e8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 17 12:42:20 2020 +0100

    ISIS-2158: cleaning up unused code
---
 .../isis/core/metamodel/adapter/ObjectAdapter.java    |  8 +-------
 .../apache/isis/core/metamodel/adapter/oid/Oid.java   | 10 ----------
 .../isis/core/metamodel/adapter/oid/ParentedOid.java  |  6 ------
 .../choices/method/PropertyChoicesFacetViaMethod.java | 13 -------------
 .../isis/core/metamodel/spec/ObjectSpecification.java |  2 +-
 .../adapter/oid/CollectionOidTest_valueSemantics.java |  4 ++--
 .../adapter/oid/OidMarshallerTest_roundtripping.java  |  6 +++---
 .../metamodel/adapter/oid/RootOidTest_create.java     | 19 +------------------
 .../persistence/adapter/ObjectAdapterForBean.java     |  2 +-
 .../core/runtime/persistence/adapter/PojoAdapter.java |  7 -------
 .../JdoPersistenceCapableFacetImpl.java               |  2 +-
 .../objectadapter/ObjectAdapterContext.java           |  4 ++--
 .../ObjectAdapterContext_NewIdentifier.java           |  2 +-
 .../adapterfactory/pojo/PojoAdapterTest.java          |  4 ++--
 .../objectstore/transaction/PojoAdapterBuilder.java   |  6 ------
 .../core/runtime/system/ObjectMemberAbstractTest.java | 13 ++-----------
 16 files changed, 17 insertions(+), 91 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index 963a1b2..182fac5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -44,17 +44,11 @@ public interface ObjectAdapter extends ManagedObject {
      */
     Oid getOid(); //XXX[2033] referenced by 'metamodel' only to create a bookmark (CommandUtil)
 
-//    /**
-//     * Returns either itself (if this is a root) or for parented collections, the
-//     * adapter corresponding to their {@link ParentedOid#getParentOid() root oid}.
-//     */
-//    ObjectAdapter getAggregateRoot(); //XXX[2033] not referenced by 'metamodel'
-
     /**
      * Whether this instance belongs to another object (meaning its
      * {@link #getOid()} will be a {@link ParentedOid}).
      */
-    default boolean isParentedCollection() {
+    default boolean isParented() {
         return getOid() instanceof ParentedOid;
     }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
index c2ba21e..5d20bbe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
@@ -102,16 +102,6 @@ public interface Oid extends Serializable {
             return Oid_Root.of(objectSpecId, mementoStr);
         }
         
-        @Deprecated
-        public static RootOid persistentOf(ObjectSpecId objectSpecId, String mementoStr) {
-            return of(objectSpecId, mementoStr);
-        }
-
-        @Deprecated
-        public static RootOid transientOf(ObjectSpecId objectSpecId, String identifier) {
-            return of(objectSpecId, identifier);
-        }
-        
         // -- PARENTED COLLECTIONS
 
         public static ParentedOid parentedOfOneToMany(RootOid parentRootOid, OneToManyAssociation oneToMany) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
index a2b87e1..04773d6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
@@ -20,7 +20,6 @@
 package org.apache.isis.core.metamodel.adapter.oid;
 
 import org.apache.isis.applib.annotation.Collection;
-import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 
 import static org.apache.isis.core.metamodel.adapter.oid.Oid.unmarshaller;
@@ -44,11 +43,6 @@ public interface ParentedOid extends Oid {
 
     // -- DECODE FROM STRING
 
-    public static ParentedOid deStringEncoded(final String urlEncodedOidStr) {
-        final String oidStr = UrlDecoderUtil.urlDecode(urlEncodedOidStr);
-        return deString(oidStr);
-    }
-
     public static ParentedOid deString(String enString) {
         return unmarshaller().unmarshal(enString, ParentedOid.class);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
index 5a5035f..a1cd1b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
@@ -78,19 +78,6 @@ public class PropertyChoicesFacetViaMethod extends PropertyChoicesFacetAbstract
                 .visiblePojosAsArray(collectionAdapter, interactionInitiatedBy);
         
         return visiblePojos;
-        
-        
-        //XXX legacy of, (not checking visibility)
-
-//        final Object options = ManagedObject.InvokeUtil.invoke(method, owningAdapter);
-//        if (options == null) {
-//            return null;
-//        }
-//        if (options.getClass().isArray()) {
-//            return ObjectExtensions.asArray(options);
-//        }
-//        final ObjectSpecification specification = getSpecificationLoader().loadSpecification(choicesClass);
-//        return CollectionUtils.getCollectionAsObjectArray(options, specification, getObjectManager());
     }
 
     @Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 8055d6d..fa41244 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -74,7 +74,7 @@ import lombok.val;
  * {@link ObjectSpecification}s as we need them, and then introspect them later.
  */
 public interface ObjectSpecification extends Specification, ObjectActionContainer,
-        ObjectAssociationContainer, Hierarchical,  DefaultProvider {
+        ObjectAssociationContainer, Hierarchical, DefaultProvider {
 
     final class Comparators{
         private Comparators(){}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
index 19357fa..d867944 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
@@ -26,8 +26,8 @@ import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
 
 public class CollectionOidTest_valueSemantics extends ValueTypeContractTestAbstract<ParentedOid> {
 
-    private final RootOid parent = Oid.Factory.persistentOf(ObjectSpecId.of("CUS"), "123");
-    private final RootOid otherParent = Oid.Factory.persistentOf(ObjectSpecId.of("CUS"), "124");
+    private final RootOid parent = Oid.Factory.of(ObjectSpecId.of("CUS"), "123");
+    private final RootOid otherParent = Oid.Factory.of(ObjectSpecId.of("CUS"), "124");
 
     @Override
     protected List<ParentedOid> getObjectsWithSameValue() {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
index ac59e3c..ef1dff8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
@@ -30,7 +30,7 @@ public class OidMarshallerTest_roundtripping {
 
     @Test
     public void rootOid() {
-        RootOid oid = Oid.Factory.persistentOf(ObjectSpecId.of("CUS"), "123");
+        RootOid oid = Oid.Factory.of(ObjectSpecId.of("CUS"), "123");
 
         final String enString = oid.enString();
         final RootOid deString = RootOid.deString(enString);
@@ -39,7 +39,7 @@ public class OidMarshallerTest_roundtripping {
 
     @Test
     public void collectionOid() {
-        RootOid parentOid = Oid.Factory.persistentOf(ObjectSpecId.of("CUS"), "123");
+        RootOid parentOid = Oid.Factory.of(ObjectSpecId.of("CUS"), "123");
         ParentedOid oid = Oid.Factory.parentedOfOneToManyId(parentOid, "items");
 
         final String enString = oid.enString();
@@ -49,7 +49,7 @@ public class OidMarshallerTest_roundtripping {
     
     @Test
     public void rootOid_withLegacyVersionIgnored() {
-        RootOid oid = Oid.Factory.persistentOf(ObjectSpecId.of("CUS"), "123");
+        RootOid oid = Oid.Factory.of(ObjectSpecId.of("CUS"), "123");
 
         final String enString = oid.enString();
         final RootOid deString = RootOid.deString(enString + "^" + 90807L);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
index 3e0d916..298ea31 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
@@ -31,24 +31,7 @@ public class RootOidTest_create {
     @Test
     public void create() throws Exception {
         ObjectSpecId objectSpecId = ObjectSpecId.of("CUS");
-        RootOid oid = Oid.Factory.persistentOf(objectSpecId, "123");
-        assertThat(oid.getObjectSpecId(), is(objectSpecId));
-        assertThat(oid.getIdentifier(), is("123"));
-    }
-
-    @Test
-    public void createTransient() throws Exception {
-        ObjectSpecId objectSpecId = ObjectSpecId.of("CUS");
-        RootOid oid = Oid.Factory.transientOf(objectSpecId, "123");
-        assertThat(oid.getObjectSpecId(), is(objectSpecId));
-        assertThat(oid.getIdentifier(), is("123"));
-    }
-
-
-    @Test
-    public void createPersistent() throws Exception {
-        ObjectSpecId objectSpecId = ObjectSpecId.of("CUS");
-        RootOid oid = Oid.Factory.persistentOf(objectSpecId, "123");
+        RootOid oid = Oid.Factory.of(objectSpecId, "123");
         assertThat(oid.getObjectSpecId(), is(objectSpecId));
         assertThat(oid.getIdentifier(), is("123"));
     }
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
index 14b8134..b5b3a9e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
@@ -53,7 +53,7 @@ public class ObjectAdapterForBean implements ObjectAdapter {
     @Override
     public Oid getOid() {
         val spec = getSpecification();
-        return Oid.Factory.persistentOf(spec.getSpecId(), bean.getId());
+        return Oid.Factory.of(spec.getSpecId(), bean.getId());
     }
 
 //    @Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 8db11de..5cbfecb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -21,14 +21,12 @@ package org.apache.isis.core.runtime.persistence.adapter;
 
 import java.io.Serializable;
 import java.util.Objects;
-import java.util.UUID;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.internal.base._Lazy;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.commons.ToString;
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.runtime.session.IsisSession;
@@ -59,11 +57,6 @@ public final class PojoAdapter implements ObjectAdapter {
         return PojoAdapter.of(value, oid);
     }
 
-    public static ObjectAdapter ofTransient(Object pojo, ObjectSpecId specId) {
-        val identifier = UUID.randomUUID().toString();
-        return PojoAdapter.of(pojo, Oid.Factory.transientOf(specId, identifier));
-    }
-
     public static PojoAdapter of(
             final Object pojo,
             final Oid oid,
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
index aa06bc6..c22141d 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
@@ -54,7 +54,7 @@ public class JdoPersistenceCapableFacetImpl extends JdoPersistenceCapableFacetAb
         }
         
         val persistenceSession = super.getPersistenceSessionJdo();
-        val rootOid = Oid.Factory.persistentOf(spec.getSpecId(), identifier);
+        val rootOid = Oid.Factory.of(spec.getSpecId(), identifier);
         
         val pojo = persistenceSession.fetchPersistentPojo(rootOid);
         
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index 39fe8f1..dc9a863 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -37,10 +37,10 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
 import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
 import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
 
 import lombok.Getter;
 import lombok.val;
@@ -237,7 +237,7 @@ final public class ObjectAdapterContext {
         final RootOid persistentOid = createPersistentOrViewModelOid(rootAdapter.getPojo());
 
         Objects.requireNonNull(persistentOid);
-        _Assert.assertFalse("expected to not be a parented collection", rootAdapter.isParentedCollection());
+        _Assert.assertFalse("expected to not be parented", rootAdapter.isParented());
         
         final ObjectSpecId hintRootOidObjectSpecId = persistentOid.getObjectSpecId();
         final ObjectSpecId adapterObjectSpecId = rootAdapter.getSpecification().getSpecId();
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
index 86fb27c..87beceb 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
@@ -58,7 +58,7 @@ class ObjectAdapterContext_NewIdentifier {
         final String identifier = persistenceSession.identifierFor(pojo);
 
         final ObjectSpecId objectSpecId = spec.getSpecId();
-        return Oid.Factory.persistentOf(objectSpecId, identifier);
+        return Oid.Factory.of(objectSpecId, identifier);
     }
 
 }
\ No newline at end of file
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index c4e5ecc..59b216e 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -53,7 +53,7 @@ public class PojoAdapterTest {
 
         adapter = PojoAdapter.of(
                 domainObject, 
-                Factory.persistentOf(ObjectSpecId.of("CUS"), "1"),
+                Factory.of(ObjectSpecId.of("CUS"), "1"),
                 mockSpecificationLoader);
 
         allowUnimportantMethodCallsOn();
@@ -70,7 +70,7 @@ public class PojoAdapterTest {
 
     @Test
     public void getOid_initially() {
-        assertEquals(Factory.persistentOf(ObjectSpecId.of("CUS"), "1"), adapter.getOid());
+        assertEquals(Factory.of(ObjectSpecId.of("CUS"), "1"), adapter.getOid());
     }
 
     @Test
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index 79bd702..656cff0 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -49,12 +49,6 @@ public class PojoAdapterBuilder {
     private Persistence persistence = Persistence.PERSISTENT;
 
     public enum Persistence {
-        TRANSIENT {
-            @Override
-            RootOid createOid(ObjectSpecId objectSpecId, String identifier) {
-                return Factory.transientOf(objectSpecId, identifier);
-            }
-        },
         PERSISTENT {
             @Override
             RootOid createOid(ObjectSpecId objectSpecId, String identifier) {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 920a50f..c42ace5 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -60,7 +60,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
-import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
 import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
 import org.apache.isis.core.security.authentication.AuthenticationSession;
 import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
@@ -75,7 +74,6 @@ public class ObjectMemberAbstractTest {
     private ObjectMemberAbstractImpl testMember;
 
     private ObjectAdapter persistentAdapter;
-    private ObjectAdapter transientAdapter;
     protected MetaModelContext metaModelContext;
 
     @Mock private AuthenticationSessionProvider mockAuthenticationSessionProvider;
@@ -100,16 +98,9 @@ public class ObjectMemberAbstractTest {
 
         persistentAdapter = PojoAdapter.of(
                 mockPersistable,
-                Factory.persistentOf(ObjectSpecId.of("CUS"), "1"),
+                Factory.of(ObjectSpecId.of("CUS"), "1"),
                 mockSpecificationLoader);
 
-
-        transientAdapter = PojoAdapterBuilder.create()
-                .with(mockSpecificationLoader)
-                .with(PojoAdapterBuilder.Persistence.TRANSIENT)
-                .withPojo(mockPersistable)
-                .build();
-
         testMember = new ObjectMemberAbstractImpl(metaModelContext, "id");
         
         context.checking(new Expectations() {{
@@ -154,7 +145,7 @@ public class ObjectMemberAbstractTest {
         testMember.addFacet(new HideForContextFacetNone(testMember));
         testMember.addFacet(new HiddenFacetAbstractImpl(Where.ANYWHERE, testMember){});
 
-        final Consent visible = testMember.isVisible(transientAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE);
+        final Consent visible = testMember.isVisible(persistentAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE);
         assertFalse(visible.isAllowed());
     }