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/14 08:37:11 UTC
[09/23] isis git commit: ISIS-1194: simplifying PersistenceSession
ISIS-1194: simplifying PersistenceSession
renaming
- #mapRecreatedPersistent to #mapPersistent
- inline createPersistentOrViewModelOid
- inline getJdoObjectId
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e8456b71
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e8456b71
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e8456b71
Branch: refs/heads/ISIS-1194
Commit: e8456b71b5e290a8b21e8e98b2d2e76ada3310b5
Parents: f401ee6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 11 18:51:12 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 07:35:57 2015 +0100
----------------------------------------------------------------------
.../adaptermanager/AdapterManagerDefault.java | 2 +-
.../persistence/IsisLifecycleListener2.java | 2 +-
.../system/persistence/PersistenceSession.java | 25 ++++++--------------
3 files changed, 9 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e8456b71/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
index 085260b..330f600 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
@@ -223,7 +223,7 @@ public class AdapterManagerDefault implements AdapterManager,
return null;
}
final Persistable persistenceCapable = (Persistable) pojo;
- return persistenceSession.mapRecreatedPersistent(persistenceCapable);
+ return persistenceSession.mapPersistent(persistenceCapable);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e8456b71/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
index 54c38c8..1657fcd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IsisLifecycleListener2.java
@@ -85,7 +85,7 @@ public class IsisLifecycleListener2
@Override
protected void doRun() {
final Persistable pojo = Utils.persistenceCapableFor(event);
- persistenceSession.callIsisPersistingCallback(pojo);
+ persistenceSession.invokeIsisPersistingCallback(pojo);
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e8456b71/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 8af6887..c396055 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
@@ -754,11 +754,11 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
//region > lazilyLoaded
- public ObjectAdapter mapRecreatedPersistent(final Persistable pojo) {
- if (getJdoObjectId(pojo) == null) {
+ public ObjectAdapter mapPersistent(final Persistable pojo) {
+ if (persistenceManager.getObjectId(pojo) == null) {
return null;
}
- final RootOid oid = createPersistentOrViewModelOid(pojo);
+ final RootOid oid = oidGenerator.createPersistentOrViewModelOid(pojo);
final ObjectAdapter adapter = mapRecreatedPojo(oid, pojo);
return adapter;
}
@@ -1164,19 +1164,8 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
//endregion
- //region > oidGenerator delegate methods
-
- public final RootOid createPersistentOrViewModelOid(Object pojo) {
- return oidGenerator.createPersistentOrViewModelOid(pojo);
- }
- //endregion
//region > jdoPersistenceManager delegate methods
-
- public Object getJdoObjectId(Object pojo) {
- return persistenceManager.getObjectId(pojo);
- }
-
public javax.jdo.Query newJdoQuery(Class<?> cls) {
return persistenceManager.newQuery(cls);
}
@@ -1283,7 +1272,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
}
}
} else {
- originalOid = createPersistentOrViewModelOid(pojo);
+ originalOid = oidGenerator.createPersistentOrViewModelOid(pojo);
// it appears to be possible that there is already an adapter for this Oid,
// ie from ObjectStore#resolveImmediately()
@@ -1307,7 +1296,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
* The implementation therefore uses Isis' {@link org.apache.isis.core.metamodel.adapter.oid.Oid#isTransient() oid}
* to determine which callback to fire.
*/
- public void callIsisPersistingCallback(final Persistable pojo) {
+ public void invokeIsisPersistingCallback(final Persistable pojo) {
final ObjectAdapter adapter = getAdapterFor(pojo);
if (adapter == null) {
// not expected.
@@ -1350,7 +1339,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
if (isisOid.isTransient()) {
// persisting
- final RootOid persistentOid = createPersistentOrViewModelOid(pojo);
+ final RootOid persistentOid = oidGenerator.createPersistentOrViewModelOid(pojo);
remapAsPersistent(adapter, persistentOid);
@@ -1380,7 +1369,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 = mapRecreatedPersistent(pojo);
+ adapter = mapPersistent(pojo);
if (adapter == null) {
throw new RuntimeException(
"DN could not find objectId for pojo (unexpected) and so could not map into Isis; pojo=["