You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/09/15 08:03:51 UTC
[46/50] [abbrv] isis git commit: ISIS-1194: PersistenceSessionService
now extends AdapterManager,
meaning that the two RuntimeContext impls don't need to have a separate
adapterManager delegate.
ISIS-1194: PersistenceSessionService now extends AdapterManager, meaning that the two RuntimeContext impls don't need to have a separate adapterManager delegate.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/52932916
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/52932916
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/52932916
Branch: refs/heads/master
Commit: 52932916be3fdda17530107c1cc942a358edf416
Parents: 40f1f04
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 14 23:12:30 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 23:12:30 2015 +0100
----------------------------------------------------------------------
.../PersistenceSessionService.java | 3 +-
.../noruntime/RuntimeContextNoRuntime.java | 8 ++---
.../internal/RuntimeContextFromSession.java | 32 +++++++++++---------
3 files changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/52932916/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/PersistenceSessionService.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/PersistenceSessionService.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/PersistenceSessionService.java
index c833100..0dc688e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/PersistenceSessionService.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/PersistenceSessionService.java
@@ -22,9 +22,10 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.commons.components.Injectable;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-public interface PersistenceSessionService extends Injectable {
+public interface PersistenceSessionService extends AdapterManager, Injectable {
// ///////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/52932916/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
index 3e3561c..c977e1b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
@@ -51,7 +51,6 @@ import org.apache.isis.core.metamodel.transactions.TransactionStateProviderAbstr
public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
private final AuthenticationSessionProviderAbstract authenticationSessionProvider;
- private final AdapterManager adapterManager;
private final PersistenceSessionServiceAbstract persistenceSessionService;
private final LocalizationProviderAbstract localizationProvider;
private final MessageBrokerServiceAbstract messageBrokerService;
@@ -72,7 +71,7 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
};
- adapterManager = new AdapterManager() {
+ persistenceSessionService = new PersistenceSessionServiceAbstract() {
@Override
public void injectInto(final Object candidate) {
@@ -112,9 +111,6 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
- };
- persistenceSessionService = new PersistenceSessionServiceAbstract() {
-
@Override
public ObjectAdapter createTransientInstance(final ObjectSpecification spec) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
@@ -234,7 +230,7 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
@Override
public AdapterManager getAdapterManager() {
- return adapterManager;
+ return getPersistenceSessionService();
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/52932916/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index 8ab4b82..3c1db40 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -40,6 +40,7 @@ import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerServiceAbstract;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAware;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAbstract;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -61,7 +62,6 @@ import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
public class RuntimeContextFromSession extends RuntimeContextAbstract {
private final AuthenticationSessionProvider authenticationSessionProvider;
- private final AdapterManager adapterManager;
private final PersistenceSessionService persistenceSessionService;
private final MessageBrokerService messageBrokerService;
private final LocalizationProviderAbstract localizationProvider;
@@ -83,7 +83,9 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
return IsisContext.getAuthenticationSession();
}
};
- this.adapterManager = new AdapterManager() {
+
+ this.persistenceSessionService = new PersistenceSessionServiceAbstract() {
+
@Override
public ObjectAdapter getAdapterFor(Oid oid) {
@@ -116,18 +118,6 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
}
@Override
- public void injectInto(Object candidate) {
- if (AdapterManagerAware.class.isAssignableFrom(candidate.getClass())) {
- final AdapterManagerAware cast = AdapterManagerAware.class.cast(candidate);
- cast.setAdapterManager(this);
- }
- }
-
-
- };
-
- this.persistenceSessionService = new PersistenceSessionServiceAbstract() {
- @Override
public void makePersistent(final ObjectAdapter adapter) {
getPersistenceSession().makePersistentInTransaction(adapter);
}
@@ -194,7 +184,19 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
return getPersistenceSession().firstMatchingQuery(query);
}
+ @Override
+ public void injectInto(Object candidate) {
+ if (AdapterManagerAware.class.isAssignableFrom(candidate.getClass())) {
+ final AdapterManagerAware cast = AdapterManagerAware.class.cast(candidate);
+ cast.setAdapterManager(this);
+ }
+ if (PersistenceSessionServiceAware.class.isAssignableFrom(candidate.getClass())) {
+ final PersistenceSessionServiceAware cast = PersistenceSessionServiceAware.class.cast(candidate);
+ cast.setPersistenceSessionService(this);
+ }
+ }
};
+
this.messageBrokerService = new MessageBrokerServiceAbstract() {
@Override
@@ -234,7 +236,7 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
@Override
public AdapterManager getAdapterManager() {
- return adapterManager;
+ return getPersistenceSessionService();
}
@Override