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/11 00:08:53 UTC
[29/50] isis git commit: ISIS-1194: law of demeter for
FrameworkSynchronizer and OidGenerator - call PersistenceSession instead.
ISIS-1194: law of demeter for FrameworkSynchronizer and OidGenerator - call PersistenceSession instead.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fa8d2de1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fa8d2de1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fa8d2de1
Branch: refs/heads/master
Commit: fa8d2de1d661b06818bcf3b0f907a355047ce0eb
Parents: 06d685c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 16:08:06 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 16:08:06 2015 +0100
----------------------------------------------------------------------
.../system/persistence/FrameworkSynchronizer.java | 9 ++-------
.../runtime/system/persistence/PersistenceSession.java | 11 +++++++++++
2 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fa8d2de1/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 65cfb68..1c28b71 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
@@ -131,8 +131,7 @@ public class FrameworkSynchronizer {
}
}
} else {
- final OidGenerator oidGenerator = getOidGenerator();
- originalOid = oidGenerator.createPersistentOrViewModelOid(pojo);
+ originalOid = getPersistenceSession().createPersistentOrViewModelOid(pojo);
// it appears to be possible that there is already an adapter for this Oid,
// ie from ObjectStore#resolveImmediately()
@@ -210,7 +209,7 @@ public class FrameworkSynchronizer {
if (isisOid.isTransient()) {
// persisting
- final RootOid persistentOid = getOidGenerator().createPersistentOrViewModelOid(pojo);
+ final RootOid persistentOid = getPersistenceSession().createPersistentOrViewModelOid(pojo);
getPersistenceSession().getAdapterManager().remapAsPersistent(adapter, persistentOid);
@@ -404,10 +403,6 @@ public class FrameworkSynchronizer {
return getPersistenceSession().getAdapterManager();
}
- protected OidGenerator getOidGenerator() {
- return getPersistenceSession().getOidGenerator();
- }
-
protected PersistenceManager getJdoPersistenceManager() {
return getPersistenceSession().getPersistenceManager();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fa8d2de1/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 e9ec445..22a54a3 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
@@ -1139,4 +1139,15 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
//endregion
+ //region > oidGenerator delegate methods
+
+ public final RootOid createPersistentOrViewModelOid(Object pojo) {
+ return oidGenerator.createPersistentOrViewModelOid(pojo);
+ }
+ //endregion
+
+
}
+
+
+