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:09:02 UTC
[38/50] isis git commit: ISIS-1194: inlining lazilyLoaded from
FrameworkSynchronizer to PersistenceSession
ISIS-1194: inlining lazilyLoaded from FrameworkSynchronizer to PersistenceSession
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/195de3d1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/195de3d1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/195de3d1
Branch: refs/heads/master
Commit: 195de3d181a833f783d268f8a0b44fa5186ecdc1
Parents: fe62380
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 16:43:13 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 16:43:13 2015 +0100
----------------------------------------------------------------------
.../persistence/FrameworkSynchronizer.java | 14 --------------
.../system/persistence/PersistenceSession.java | 19 +++++++++++++++++--
2 files changed, 17 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/195de3d1/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 51aff7e..0340ca0 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
@@ -224,21 +224,7 @@ public class FrameworkSynchronizer {
- public ObjectAdapter lazilyLoaded(final Persistable pojo, CalledFrom calledFrom) {
- return withLogging(pojo, new Callable<ObjectAdapter>() {
- @Override
- public ObjectAdapter call() {
- if(persistenceSession.getJdoObjectId(pojo) == null) {
- return null;
- }
- final RootOid oid = persistenceSession.createPersistentOrViewModelOid(pojo);
- final ObjectAdapter adapter = persistenceSession.mapRecreatedPojo(oid, pojo);
- return adapter;
- }
- }, calledFrom);
- }
-
public void preDeleteProcessingFor(final Persistable pojo, final CalledFrom calledFrom) {
withLogging(pojo, new Runnable() {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/195de3d1/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 a4081a1..24f2adb 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
@@ -762,9 +762,24 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
return null;
}
final Persistable persistenceCapable = (Persistable) pojo;
- return frameworkSynchronizer.lazilyLoaded(persistenceCapable, FrameworkSynchronizer.CalledFrom.OS_LAZILYLOADED);
+ return lazilyLoaded(persistenceCapable, FrameworkSynchronizer.CalledFrom.OS_LAZILYLOADED);
}
+ public ObjectAdapter lazilyLoaded(final Persistable pojo, FrameworkSynchronizer.CalledFrom calledFrom) {
+ return withLogging(pojo, new Callable<ObjectAdapter>() {
+ @Override
+ public ObjectAdapter call() {
+ if (getJdoObjectId(pojo) == null) {
+ return null;
+ }
+ final RootOid oid = createPersistentOrViewModelOid(pojo);
+ final ObjectAdapter adapter = mapRecreatedPojo(oid, pojo);
+ return adapter;
+ }
+ }, calledFrom);
+ }
+
+
//endregion
//region > refreshRootInTransaction, refreshRoot
@@ -1228,7 +1243,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
// it seems reasonable in this case to simply map into Isis here ("just-in-time"); presumably
// DN would not be calling this callback if the pojo was not persistent.
- adapter = frameworkSynchronizer.lazilyLoaded(pojo, FrameworkSynchronizer.CalledFrom.EVENT_PREDIRTY);
+ adapter = lazilyLoaded(pojo, FrameworkSynchronizer.CalledFrom.EVENT_PREDIRTY);
if (adapter == null) {
throw new RuntimeException(
"DN could not find objectId for pojo (unexpected) and so could not map into Isis; pojo=["