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 2019/11/19 09:54:08 UTC

[isis] branch 2177-object-manager updated: ISIS-2177: remove PersistenceSessionServiceInternal

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

ahuber pushed a commit to branch 2177-object-manager
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/2177-object-manager by this push:
     new 8d25a71  ISIS-2177: remove PersistenceSessionServiceInternal
8d25a71 is described below

commit 8d25a71821a91862862148a412d0779daa90b20d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 19 10:54:01 2019 +0100

    ISIS-2177: remove PersistenceSessionServiceInternal
---
 ...tionParameterDisabledFacetViaMethodFactory.java |   3 -
 ...ActionParameterHiddenFacetViaMethodFactory.java |   3 -
 .../PersistenceSessionServiceInternal.java         |  39 --------
 .../specimpl/ObjectActionParameterAbstract.java    |   6 --
 .../facets/AbstractFacetFactoryJUnit4TestCase.java |   2 -
 .../metamodel/facets/AbstractFacetFactoryTest.java |   6 --
 .../runtime/system/ObjectMemberAbstractTest.java   |   3 -
 ...FactoryDefaultTest_wrappedObject_transient.java |   4 -
 .../bookmarks/BookmarkServiceInternalDefault.java  |  86 +++++++++++-----
 .../PersistenceSessionServiceInternalDefault.java  | 108 ---------------------
 .../system/ObjectActionLayoutXmlDefaultTest.java   |   3 -
 .../system/OneToManyAssociationDefaultTest.java    |   3 -
 12 files changed, 60 insertions(+), 206 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
index 7838227..c29d5d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
@@ -33,7 +33,6 @@ import org.apache.isis.metamodel.facets.MethodLiteralConstants;
 import org.apache.isis.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.param.disable.ActionParameterDisabledFacet;
 import org.apache.isis.metamodel.methodutils.MethodScope;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 
 import lombok.val;
 
@@ -93,6 +92,4 @@ public class ActionParameterDisabledFacetViaMethodFactory extends MethodPrefixBa
 
     }
 
-    PersistenceSessionServiceInternal adapterManager;
-
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
index 8d2296a..9cb1c54 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
@@ -32,7 +32,6 @@ import org.apache.isis.metamodel.facets.MethodLiteralConstants;
 import org.apache.isis.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.param.hide.ActionParameterHiddenFacet;
 import org.apache.isis.metamodel.methodutils.MethodScope;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 
 import lombok.val;
 
@@ -87,6 +86,4 @@ public class ActionParameterHiddenFacetViaMethodFactory extends MethodPrefixBase
 
     }
 
-    PersistenceSessionServiceInternal adapterManager;
-
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/persistsession/PersistenceSessionServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
deleted file mode 100644
index 25a4b0c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.metamodel.services.persistsession;
-
-import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService;
-
-public interface PersistenceSessionServiceInternal {
-
-    /**
-     * Provided by <tt>PersistenceSession</tt> when used by framework.
-     *
-     * <p>
-     * Called by <tt>BookmarkServicesDefault</tt>.
-     * @return
-     */
-    Object lookup(Bookmark bookmark, final BookmarkService.FieldResetPolicy fieldResetPolicy);
-
-    Bookmark bookmarkFor(Object domainObject);
-
-    Bookmark bookmarkFor(Class<?> cls, String identifier);
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 3bb7bf0..17e4066 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -54,7 +54,6 @@ import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.ValidityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.metamodel.spec.DomainModelException;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
@@ -520,9 +519,4 @@ implements ObjectActionParameter, FacetHolder.Delegating {
         return parentAction.getObjectManager();
     }
 
-    protected PersistenceSessionServiceInternal getObjectPersistor() {
-        return parentAction.getMetaModelContext().getServiceRegistry()
-                .lookupServiceElseFail(PersistenceSessionServiceInternal.class);
-    }
-
 }
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index 174ed35..c254847 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -43,7 +43,6 @@ import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.metamodel.facetapi.MethodRemover;
 import org.apache.isis.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
 import org.apache.isis.metamodel.services.events.MetamodelEventService;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.metamodel.spec.feature.OneToOneActionParameter;
@@ -59,7 +58,6 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
     public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
 
     @Mock protected SpecificationLoader mockSpecificationLoader;
-    @Mock protected PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
     @Mock protected MethodRemover mockMethodRemover;
     @Mock protected FacetHolder mockFacetHolder;
     @Mock protected ServiceInjector mockServiceInjector;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
index b7a5d0f..6c411f2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
@@ -34,7 +34,6 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
 import org.apache.isis.metamodel.facetapi.FacetHolderImpl;
 import org.apache.isis.metamodel.facetapi.FeatureType;
 import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.security.authentication.AuthenticationSession;
@@ -65,9 +64,6 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
     protected TranslationService mockTranslationService;
     protected AuthenticationSessionProvider mockAuthenticationSessionProvider;
     protected AuthenticationSession mockAuthenticationSession;
-
-    protected PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
-
     protected SpecificationLoader mockSpecificationLoader;
     protected MethodRemoverForTesting methodRemover;
 
@@ -110,8 +106,6 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
         mockTranslationService = context.mock(TranslationService.class);
         mockAuthenticationSession = context.mock(AuthenticationSession.class);
 
-        mockPersistenceSessionServiceInternal = context.mock(PersistenceSessionServiceInternal.class);
-
         mockSpecificationLoader = context.mock(SpecificationLoader.class);
 
         mockObjectAdapterProvider = context.mock(ObjectAdapterProvider.class);
diff --git a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
index 58ee82e..ff14ada 100644
--- a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
@@ -48,7 +48,6 @@ import org.apache.isis.metamodel.interactions.PropertyUsabilityContext;
 import org.apache.isis.metamodel.interactions.PropertyVisibilityContext;
 import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.ObjectSpecId;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
@@ -83,7 +82,6 @@ public class ObjectMemberAbstractTest {
     protected MetaModelContext metaModelContext;
 
     @Mock private AuthenticationSessionProvider mockAuthenticationSessionProvider;
-    @Mock private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
     @Mock private AuthenticationSession mockAuthenticationSession;
     @Mock private SpecificationLoader mockSpecificationLoader;
     @Mock private ObjectSpecification mockSpecForCustomer;
@@ -95,7 +93,6 @@ public class ObjectMemberAbstractTest {
 
         metaModelContext = MetaModelContext_forTesting.builder()
                 .specificationLoader(mockSpecificationLoader)
-                .singleton(mockPersistenceSessionServiceInternal)
                 .authenticationSessionProvider(mockAuthenticationSessionProvider)
                 .build();
 
diff --git a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 406812a..c9c7a82 100644
--- a/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -54,7 +54,6 @@ import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
 import org.apache.isis.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
 import org.apache.isis.metamodel.facets.properties.update.modify.PropertySetterFacetViaSetterMethod;
 import org.apache.isis.metamodel.objectmanager.ObjectManager;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
@@ -78,9 +77,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
     @Rule
     public final JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
 
-    //@Mock private ObjectAdapterProvider mockAdapterManager;
     @Mock private AuthenticationSessionProvider mockAuthenticationSessionProvider;
-    @Mock private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
     @Mock private SpecificationLoader mockSpecificationLoader;
     @Mock private IsisSessionFactory mockIsisSessionFactory;
     @Mock private FactoryService mockFactoryService;
@@ -120,7 +117,6 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
         metaModelContext = MetaModelContext_forTesting.builder()
                 .specificationLoader(mockSpecificationLoader)
                 .objectManager(mockObjectManager)
-                .singleton(mockPersistenceSessionServiceInternal)
                 .authenticationSessionProvider(mockAuthenticationSessionProvider)
                 .singleton(wrapperFactory = createWrapperFactory())
                 .singleton(mockFactoryService)
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
index 8c97e4e..d53872f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -28,19 +28,27 @@ import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
-import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.NonRecoverableException;
 import org.apache.isis.applib.services.bookmark.Bookmark;
 import org.apache.isis.applib.services.bookmark.BookmarkHolder;
 import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
 import org.apache.isis.applib.tree.TreeState;
 import org.apache.isis.commons.internal.base._Casts;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.collections._Sets;
 import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.oid.ObjectNotFoundException;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
+import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
+import org.apache.isis.metamodel.adapter.oid.RootOid;
+import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.runtime.system.persistence.PersistenceSession;
+
+import static org.apache.isis.commons.internal.base._With.acceptIfPresent;
+import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
+
+import lombok.val;
 
 /**
  * This service enables a serializable 'bookmark' to be created for an entity.
@@ -49,12 +57,13 @@ import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServi
 @Service
 public class BookmarkServiceInternalDefault implements BookmarkService, SerializingAdapter {
 
-
+    @Inject private SpecificationLoader specificationLoader;
+    @Inject private WrapperFactory wrapperFactory;
+    
     @Override
-    @Programmatic
     public Object lookup(
             final BookmarkHolder bookmarkHolder,
-            final FieldResetPolicy fieldResetPolicy) {
+            final BookmarkService.FieldResetPolicy fieldResetPolicy) {
         Bookmark bookmark = bookmarkHolder.bookmark();
         return bookmark != null? lookup(bookmark, fieldResetPolicy): null;
     }
@@ -66,14 +75,34 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
             return null;
         }
         try {
-            return persistenceSessionServiceInternal.lookup(bookmark, fieldResetPolicy);
+            val rootOid = Factory.ofBookmark(bookmark);
+            val ps = getPersistenceSession();
+            final boolean denyRefresh = fieldResetPolicy == BookmarkService.FieldResetPolicy.DONT_REFRESH; 
+
+            if(rootOid.isViewModel()) {
+                final ObjectAdapter adapter = ps.adapterFor(rootOid);
+                final Object pojo = mapIfPresentElse(adapter, ObjectAdapter::getPojo, null);
+
+                return pojo;
+
+            } else if(denyRefresh) {
+
+                val pojo = ps.fetchPersistentPojoInTransaction(rootOid);
+                return pojo;            
+
+            } else {
+                val adapter = ps.adapterFor(rootOid);
+
+                val pojo = mapIfPresentElse(adapter, ObjectAdapter::getPojo, null);
+                acceptIfPresent(pojo, ps::refreshRootInTransaction);
+                return pojo;
+            }
         } catch(ObjectNotFoundException ex) {
             return null;
         }
     }
+    
 
-
-    @Programmatic
     @Override
     public Object lookup(
             final Bookmark bookmark,
@@ -90,23 +119,31 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
         return lookupInternal(bookmark, fieldResetPolicy);
     }
 
-    @SuppressWarnings("unchecked")
-    @Programmatic
     @Override
     public <T> T lookup(
             final Bookmark bookmark,
             final FieldResetPolicy fieldResetPolicy,
             Class<T> cls) {
-        return (T) lookup(bookmark, fieldResetPolicy);
+        return _Casts.uncheckedCast(lookup(bookmark, fieldResetPolicy));
     }
 
-    @Programmatic
     @Override
     public Bookmark bookmarkFor(final Object domainObject) {
         if(domainObject == null) {
             return null;
         }
-        return persistenceSessionServiceInternal.bookmarkFor(unwrapped(domainObject));
+        val adapter = getPersistenceSession().adapterFor(unwrapped(domainObject));
+        if(adapter.isValue()) {
+            // values cannot be bookmarked
+            return null;
+        }
+        val oid = adapter.getOid();
+        if(!(oid instanceof RootOid)) {
+            // must be root
+            return null;
+        }
+        val rootOid = (RootOid) oid;
+        return rootOid.asBookmark();
     }
 
     private Object unwrapped(Object domainObject) {
@@ -114,10 +151,11 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
     }
 
 
-    @Programmatic
     @Override
     public Bookmark bookmarkFor(Class<?> cls, String identifier) {
-        return persistenceSessionServiceInternal.bookmarkFor(cls, identifier);
+        val spec = specificationLoader.loadSpecification(cls);
+        val objectType = spec.getSpecId().asString();
+        return new Bookmark(objectType, identifier);
     }
 
     //FIXME[2112] why would we ever store Service Beans as Bookmarks?
@@ -207,15 +245,11 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
         return serializableTypes.stream().anyMatch(t->t.isAssignableFrom(cls));
     }
 
-    // -- INJECTION
-
-    @Inject
-    PersistenceSessionServiceInternal persistenceSessionServiceInternal;
-
-    @Inject
-    WrapperFactory wrapperFactory;
-
-    @Inject
-    ServiceRegistry serviceRegistry;
+    protected PersistenceSession getPersistenceSession() {
+        return PersistenceSession.current(PersistenceSession.class)
+                .getFirst()
+                .orElseThrow(()->new NonRecoverableException("No IsisSession on current thread."));
+    }
+    
 
 }
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PersistenceSessionServiceInternalDefault.java
deleted file mode 100644
index ba58e56..0000000
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/PersistenceSessionServiceInternalDefault.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.runtime.system.transaction;
-
-import javax.inject.Inject;
-
-import org.springframework.stereotype.Service;
-
-import org.apache.isis.applib.NonRecoverableException;
-import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
-import org.apache.isis.metamodel.adapter.oid.RootOid;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
-
-import static org.apache.isis.commons.internal.base._With.acceptIfPresent;
-import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-
-import lombok.val;
-
-@Service
-public class PersistenceSessionServiceInternalDefault 
-implements PersistenceSessionServiceInternal {
-    
-    @Inject private SpecificationLoader specificationLoader;
-
-    @Override
-    public Object lookup(
-            final Bookmark bookmark,
-            final BookmarkService.FieldResetPolicy fieldResetPolicy) {
-
-        val rootOid = Factory.ofBookmark(bookmark);
-        val ps = getPersistenceSession();
-        final boolean denyRefresh = fieldResetPolicy == BookmarkService.FieldResetPolicy.DONT_REFRESH; 
-
-        if(rootOid.isViewModel()) {
-            final ObjectAdapter adapter = ps.adapterFor(rootOid);
-            final Object pojo = mapIfPresentElse(adapter, ObjectAdapter::getPojo, null);
-
-            return pojo;
-
-        } else if(denyRefresh) {
-
-            val pojo = ps.fetchPersistentPojoInTransaction(rootOid);
-            return pojo;            
-
-        } else {
-            val adapter = ps.adapterFor(rootOid);
-
-            val pojo = mapIfPresentElse(adapter, ObjectAdapter::getPojo, null);
-            acceptIfPresent(pojo, ps::refreshRootInTransaction);
-            return pojo;
-        }
-
-    }
-
-    @Override
-    public Bookmark bookmarkFor(Object domainObject) {
-        val adapter = getPersistenceSession().adapterFor(domainObject);
-        if(adapter.isValue()) {
-            // values cannot be bookmarked
-            return null;
-        }
-        val oid = adapter.getOid();
-        if(!(oid instanceof RootOid)) {
-            // must be root
-            return null;
-        }
-        val rootOid = (RootOid) oid;
-        return rootOid.asBookmark();
-    }
-
-    @Override
-    public Bookmark bookmarkFor(Class<?> cls, String identifier) {
-        val spec = specificationLoader.loadSpecification(cls);
-        val objectType = spec.getSpecId().asString();
-        return new Bookmark(objectType, identifier);
-    }
-
-    protected PersistenceSession getPersistenceSession() {
-        return PersistenceSession.current(PersistenceSession.class)
-                .getFirst()
-                .orElseThrow(()->new NonRecoverableException("No IsisSession on current thread."));
-    }
-
-
-
-
-}
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index 2c6353d..7835adf 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -31,7 +31,6 @@ import org.apache.isis.metamodel.MetaModelContext_forTesting;
 import org.apache.isis.metamodel.facets.FacetedMethod;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.metamodel.specloader.specimpl.ObjectActionDefault;
 import org.apache.isis.security.authentication.AuthenticationSessionProvider;
@@ -54,7 +53,6 @@ public class ObjectActionLayoutXmlDefaultTest {
     @Mock private FacetedMethod mockFacetedMethod;
     @Mock private AuthenticationSessionProvider mockAuthenticationSessionProvider;
     @Mock private SpecificationLoader mockSpecificationLoader;
-    @Mock private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
 
     private MetaModelContext metaModelContext;
 
@@ -63,7 +61,6 @@ public class ObjectActionLayoutXmlDefaultTest {
 
         metaModelContext = MetaModelContext_forTesting.builder()
                 .specificationLoader(mockSpecificationLoader)
-                .singleton(mockPersistenceSessionServiceInternal)
                 .authenticationSessionProvider(mockAuthenticationSessionProvider)
                 .build();
 
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
index 5c5c082..591ad24 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
@@ -33,7 +33,6 @@ import org.apache.isis.metamodel.facets.FacetedMethod;
 import org.apache.isis.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
-import org.apache.isis.metamodel.services.persistsession.PersistenceSessionServiceInternal;
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
@@ -68,7 +67,6 @@ public class OneToManyAssociationDefaultTest {
     @Mock private SpecificationLoader mockSpecificationLoader;
     @Mock private ObjectSpecification mockOwnerAdapterSpec;
     @Mock private MessageService mockMessageService;
-    @Mock private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
     @Mock private FacetedMethod mockPeer;
     @Mock private NamedFacet mockNamedFacet;
     @Mock private CollectionAddToFacet mockCollectionAddToFacet;
@@ -81,7 +79,6 @@ public class OneToManyAssociationDefaultTest {
 
         metaModelContext = MetaModelContext_forTesting.builder()
                 .specificationLoader(mockSpecificationLoader)
-                .singleton(mockPersistenceSessionServiceInternal)
                 .authenticationSessionProvider(mockAuthenticationSessionProvider)
                 .singleton(mockMessageService)
                 .build();