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/10/30 16:04:02 UTC
[isis] branch v2 updated: ISIS-2158: re-aligning jdo-commons
package names
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new e0e5045 ISIS-2158: re-aligning jdo-commons package names
e0e5045 is described below
commit e0e504519b29a4d2a074bda12cac33157c5cc8a6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 30 17:03:51 2019 +0100
ISIS-2158: re-aligning jdo-commons package names
---
.../objectadapter}/ObjectAdapterContext.java | 2 +-
.../ObjectAdapterContext_DependencyInjection.java | 2 +-
.../objectadapter}/ObjectAdapterContext_Factories.java | 4 ++--
.../ObjectAdapterContext_LifecycleEventSupport.java | 2 +-
.../objectadapter}/ObjectAdapterContext_MementoSupport.java | 4 ++--
.../objectadapter}/ObjectAdapterContext_NewIdentifier.java | 2 +-
.../ObjectAdapterContext_ObjectAdapterByIdProvider.java | 2 +-
.../ObjectAdapterContext_ObjectAdapterProvider.java | 2 +-
.../objectadapter}/ObjectAdapterContext_ObjectCreation.java | 2 +-
.../objectadapter}/ObjectAdapterContext_ServiceLookup.java | 2 +-
.../objectadapter}/ObjectAdapterLegacy.java | 13 ++++++++-----
.../persistence/IsisPlatformTransactionManagerForJdo.java | 13 +++++--------
.../org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java | 5 ++++-
.../apache/isis/jdo/persistence/PersistenceSession5.java | 2 +-
.../org/apache/isis/runtime/system/context/IsisContext.java | 4 +++-
.../PersistenceSessionServiceInternalDefault.java | 9 ++-------
.../extensions/secman/shiro/IsisModuleSecurityRealm.java | 10 ----------
17 files changed, 35 insertions(+), 45 deletions(-)
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
similarity index 99%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
index c6edd34..6be2796 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import java.util.Objects;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_DependencyInjection.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_DependencyInjection.java
similarity index 97%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_DependencyInjection.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_DependencyInjection.java
index 5054d0a..87b0198 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_DependencyInjection.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_DependencyInjection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import java.lang.reflect.Array;
import java.lang.reflect.Modifier;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_Factories.java
similarity index 94%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_Factories.java
index 03efd49..4aa0f95 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_Factories.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import org.apache.isis.commons.internal.assertions._Assert;
+import org.apache.isis.jdo.objectadapter.ObjectAdapterContext.ObjectAdapterFactories;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.ParentedOid;
@@ -26,7 +27,6 @@ import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.persistence.adaptermanager.ObjectAdapterContext.ObjectAdapterFactories;
import org.apache.isis.runtime.system.session.IsisSession;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
similarity index 97%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
index 417868f..65d0fbb 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_MementoSupport.java
similarity index 98%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_MementoSupport.java
index f78d516..ca7f62a 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_MementoSupport.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_MementoSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -26,6 +26,7 @@ import java.util.stream.Stream;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.assertions._Assert;
+import org.apache.isis.jdo.objectadapter.ObjectAdapterContext.MementoRecreateObjectSupport;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
@@ -45,7 +46,6 @@ import org.apache.isis.runtime.memento.Data;
import org.apache.isis.runtime.memento.ObjectData;
import org.apache.isis.runtime.memento.StandaloneData;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.persistence.adaptermanager.ObjectAdapterContext.MementoRecreateObjectSupport;
import static org.apache.isis.commons.internal.functions._Predicates.not;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_NewIdentifier.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_NewIdentifier.java
similarity index 97%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_NewIdentifier.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_NewIdentifier.java
index 8ea66f3..8525a9d 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_NewIdentifier.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_NewIdentifier.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterByIdProvider.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
similarity index 99%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterByIdProvider.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
index 9685042..114c3b1 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterByIdProvider.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import java.util.List;
import java.util.Map;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
similarity index 98%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
index a40f996..43cce2d 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectCreation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectCreation.java
similarity index 98%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectCreation.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectCreation.java
index fcb0aad..35f4eb2 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectCreation.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectCreation.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import java.util.stream.Stream;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ServiceLookup.java
similarity index 98%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ServiceLookup.java
index 098896f..0cb1364 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ServiceLookup.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import java.util.Map;
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterLegacy.java
similarity index 91%
rename from core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterLegacy.java
index bf4e13d..22999b5 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterLegacy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence.adaptermanager;
+package org.apache.isis.jdo.objectadapter;
import java.util.List;
@@ -26,7 +26,6 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
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.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.schema.common.v1.CollectionDto;
import org.apache.isis.schema.common.v1.OidDto;
@@ -35,9 +34,10 @@ import org.apache.isis.schema.common.v1.ValueType;
import org.apache.isis.schema.utils.CommonDtoUtils;
/**
- * Interim class, expected to be removed with https://issues.apache.org/jira/browse/ISIS-1976
+ * TODO Interim class, expected to be removed, need to smoketest the CommandExecutorServiceDefault first
*/
-public class ObjectAdapterLegacy {
+@Deprecated
+class ObjectAdapterLegacy {
// -- CommandExecutorServiceDefault --------------------------------------------------------
@@ -85,7 +85,10 @@ public class ObjectAdapterLegacy {
}
private static PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession().orElseThrow(_Exceptions::unexpectedCodeReach);
+
+ return PersistenceSession.current(PersistenceSession.class)
+ .getFirst()
+ .orElseThrow(_Exceptions::unexpectedCodeReach);
}
}
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
index d8bc3f2..bf4c692 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -27,8 +27,8 @@ import org.springframework.transaction.support.AbstractPlatformTransactionManage
import org.springframework.transaction.support.DefaultTransactionStatus;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.internal.InitialisationSession;
+import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
@@ -110,13 +110,10 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
}
private IsisTransactionManagerJdo transactionManagerJdo() {
- val persistenceSessionBase = (IsisPersistenceSessionJdoBase)IsisContext.getPersistenceSession().get();
- return persistenceSessionBase.transactionManager;
+ return PersistenceSession.current(IsisPersistenceSessionJdoBase.class)
+ .getFirst()
+ .get()
+ .transactionManager;
}
- // private PersistenceManager persistenceManagerJdo() {
- // val persistenceSessionBase = (PersistenceSessionBase)IsisContext.getPersistenceSession().get();
- // return persistenceSessionBase.persistenceManager;
- // }
-
}
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
index 081dbcf..3718e86 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/jdosupport/IsisJdoSupportDN5.java
@@ -45,6 +45,7 @@ import org.apache.isis.jdo.persistence.IsisPersistenceSessionJdo;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.ObjectPersistenceException;
import org.apache.isis.runtime.system.context.IsisContext;
+import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
@@ -208,7 +209,9 @@ public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
@Inject ServiceInjector serviceInjector;
protected IsisPersistenceSessionJdo getPersistenceSession() {
- return (IsisPersistenceSessionJdo) IsisContext.getPersistenceSession().orElse(null);
+ return PersistenceSession.current(IsisPersistenceSessionJdo.class)
+ .getFirst()
+ .orElse(null);
}
@Override
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
index 11a5eac..53071d1 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
@@ -56,6 +56,7 @@ import org.apache.isis.jdo.datanucleus.persistence.queries.PersistenceQueryFindA
import org.apache.isis.jdo.datanucleus.persistence.queries.PersistenceQueryFindUsingApplibQueryProcessor;
import org.apache.isis.jdo.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.jdo.datanucleus.persistence.spi.JdoObjectIdSerializer;
+import org.apache.isis.jdo.objectadapter.ObjectAdapterContext;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ObjectAdapterByIdProvider;
@@ -97,7 +98,6 @@ import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplib
import org.apache.isis.runtime.services.RequestScopedService;
import org.apache.isis.runtime.system.persistence.PersistenceQuery;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.runtime.system.persistence.adaptermanager.ObjectAdapterContext;
import org.apache.isis.security.authentication.AuthenticationSession;
import static java.util.Objects.requireNonNull;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
index 8343801..9bcca84 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
@@ -80,7 +80,9 @@ public interface IsisContext {
// -- DEPRECATIONS
/**
- * TODO [2033] its unclear whether there is only one or multiple
+ * FIXME[2058] generally there might be multiple persistence contexts,
+ * so entity management must be delegated to the ObjectManager, which
+ * handles persistence of entities individually according to their object-spec
* @return framework's currently resolvable PersistenceSessions
*/
@Deprecated
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
index 07dfa1f..b50bbf2 100644
--- 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
@@ -36,7 +36,6 @@ import org.apache.isis.metamodel.adapter.oid.RootOid;
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.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
@@ -67,11 +66,6 @@ implements PersistenceSessionServiceInternal {
return getPersistenceSession().newTransientInstance(spec);
}
- // @Override
- // public ObjectAdapter createViewModelInstance(ObjectSpecification spec, String memento) {
- // return getPersistenceSession().recreateViewModelInstance(spec, memento);
- // }
-
@Override
public Object lookup(
final Bookmark bookmark,
@@ -141,7 +135,8 @@ implements PersistenceSessionServiceInternal {
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession()
+ return PersistenceSession.current(PersistenceSession.class)
+ .getFirst()
.orElseThrow(()->new NonRecoverableException("No IsisSession on current thread."));
}
diff --git a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java b/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
index 86c5033..d2eff19 100644
--- a/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
+++ b/extensions/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
@@ -45,8 +45,6 @@ import org.apache.isis.extensions.secman.api.SecurityRealmCharacteristic;
import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
-import org.apache.isis.runtime.system.context.IsisContext;
-import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import lombok.Getter;
@@ -283,13 +281,5 @@ public class IsisModuleSecurityRealm extends AuthorizingRealm implements Securit
return txTemplate.execute(status->closure.get());
}
- // -- DEPENDENCIES
-
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession().orElse(null);
- }
-
-
-
}