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/10 14:07:17 UTC
[18/50] [abbrv] isis git commit: ISIS-1194: use PersistenceManager as
held by PersistenceSession, rather than as held by ObjectStore
ISIS-1194: use PersistenceManager as held by PersistenceSession, rather than as held by ObjectStore
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/92e67f18
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/92e67f18
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/92e67f18
Branch: refs/heads/ISIS-1194
Commit: 92e67f188bfe50de4750d8c9397fe9b50ae626f6
Parents: ccdcca4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 09:11:01 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 09:11:01 2015 +0100
----------------------------------------------------------------------
.../system/persistence/FrameworkSynchronizer.java | 3 +--
.../runtime/system/persistence/ObjectStore.java | 8 ++++----
.../runtime/system/persistence/OidGenerator.java | 7 +------
.../system/persistence/PersistenceSession.java | 17 ++++++++++-------
...sistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../service/support/IsisJdoSupportImpl.java | 4 ++--
6 files changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/92e67f18/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java
index 1d11948..0dca780 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/FrameworkSynchronizer.java
@@ -399,8 +399,7 @@ public class FrameworkSynchronizer {
}
protected PersistenceManager getJdoPersistenceManager() {
- final ObjectStore objectStore = getObjectStore();
- return objectStore.getPersistenceManager();
+ return getPersistenceSession().getPersistenceManager();
}
protected ObjectStore getObjectStore() {
http://git-wip-us.apache.org/repos/asf/isis/blob/92e67f18/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java
index 7a1ccb5..9cf7203 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java
@@ -172,7 +172,7 @@ public class ObjectStore implements TransactionalResource, DebuggableWithTitle,
}
private void beginJdoTransaction() {
- final javax.jdo.Transaction transaction = getPersistenceManager().currentTransaction();
+ final javax.jdo.Transaction transaction = persistenceManager.currentTransaction();
if (transaction.isActive()) {
throw new IllegalStateException("Transaction already active");
}
@@ -180,14 +180,14 @@ public class ObjectStore implements TransactionalResource, DebuggableWithTitle,
}
private void commitJdoTransaction() {
- final javax.jdo.Transaction transaction = getPersistenceManager().currentTransaction();
+ final javax.jdo.Transaction transaction = persistenceManager.currentTransaction();
if (transaction.isActive()) {
transaction.commit();
}
}
private void rollbackJdoTransaction() {
- final javax.jdo.Transaction transaction = getPersistenceManager().currentTransaction();
+ final javax.jdo.Transaction transaction = persistenceManager.currentTransaction();
if (transaction.isActive()) {
transaction.rollback();
}
@@ -219,7 +219,7 @@ public class ObjectStore implements TransactionalResource, DebuggableWithTitle,
}
private void ensureInJdoTransaction() {
- javax.jdo.Transaction currentTransaction = getPersistenceManager().currentTransaction();
+ javax.jdo.Transaction currentTransaction = persistenceManager.currentTransaction();
ensureThatState(currentTransaction, is(notNullValue()));
ensureThatState(currentTransaction.isActive(), is(true));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/92e67f18/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java
index 944e0c9..936b8f3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java
@@ -130,13 +130,8 @@ public class OidGenerator implements DebuggableWithTitle {
return specificationLoader;
}
- protected ObjectStore getObjectStore() {
- return persistenceSession.getObjectStore();
- }
-
protected PersistenceManager getJdoPersistenceManager() {
- final ObjectStore objectStore = getObjectStore();
- return objectStore.getPersistenceManager();
+ return persistenceSession.getPersistenceManager();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/92e67f18/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 4ea62d1..e322944 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -293,6 +293,10 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
}
}
+
+ public PersistenceManager getPersistenceManager() {
+ return persistenceManager;
+ }
//endregion
//region > State
@@ -632,10 +636,9 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
try {
final Class<?> cls = clsOf(rootOid);
final Object jdoObjectId = JdoObjectIdSerializer.toJdoObjectId(rootOid);
- final PersistenceManager pm = objectStore.getPersistenceManager();
- FetchPlan fetchPlan = pm.getFetchPlan();
+ FetchPlan fetchPlan = persistenceManager.getFetchPlan();
fetchPlan.addGroup(FetchGroup.DEFAULT);
- result = pm.getObjectById(cls, jdoObjectId);
+ result = persistenceManager.getObjectById(cls, jdoObjectId);
} catch (final RuntimeException e) {
final List<ExceptionRecognizer> exceptionRecognizers = getServicesInjector().lookupServices(ExceptionRecognizer.class);
@@ -731,7 +734,7 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
}
try {
- objectStore.getPersistenceManager().refresh(domainObject);
+ persistenceManager.refresh(domainObject);
} catch (final RuntimeException e) {
throw new PojoRefreshException(adapter.getOid(), e);
}
@@ -859,7 +862,7 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
if (adapter.representsPersistent()) {
throw new IllegalArgumentException("Adapter is persistent; adapter: " + adapter);
}
- return new DataNucleusCreateObjectCommand(adapter, objectStore.getPersistenceManager());
+ return new DataNucleusCreateObjectCommand(adapter, persistenceManager);
}
private void ensureInSession() {
@@ -878,7 +881,7 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
if (!adapter.representsPersistent()) {
throw new IllegalArgumentException("Adapter is not persistent; adapter: " + adapter);
}
- return new DataNucleusDeleteObjectCommand(adapter, objectStore.getPersistenceManager());
+ return new DataNucleusDeleteObjectCommand(adapter, persistenceManager);
}
//endregion
@@ -900,7 +903,7 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
for (final PersistenceCommand command : commands) {
command.execute(null);
}
- objectStore.getPersistenceManager().flush();
+ persistenceManager.flush();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/92e67f18/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index 894b7df..1224afb 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -99,7 +99,7 @@ public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQu
final QueryCardinality cardinality = persistenceQuery.getCardinality();
final ObjectSpecification objectSpec = persistenceQuery.getSpecification();
- final PersistenceManager persistenceManager = getJdoObjectStore().getPersistenceManager();
+ final PersistenceManager persistenceManager = getPersistenceSession().getPersistenceManager();
final Class<?> cls = objectSpec.getCorrespondingClass();
final Query jdoQuery = persistenceManager.newNamedQuery(cls, queryName);
http://git-wip-us.apache.org/repos/asf/isis/blob/92e67f18/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index 7f0fcbe..e3f3406 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -76,7 +76,7 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
@Programmatic
@Override
public void ensureLoaded(final Collection<?> domainObjects) {
- getObjectStore().getPersistenceManager().retrieveAll(domainObjects);
+ getPersistenceSession().getPersistenceManager().retrieveAll(domainObjects);
}
// //////////////////////////////////////
@@ -214,6 +214,6 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
@Programmatic
@Override
public PersistenceManager getJdoPersistenceManager() {
- return getObjectStore().getPersistenceManager();
+ return getPersistenceSession().getPersistenceManager();
}
}