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:12 UTC
[13/50] [abbrv] isis git commit: ISIS-1194: in PersistenceSession,
inlined resolveImmediateyInTransaction,
and renamed to refreshRootInTransaction (cos that's what it does)
ISIS-1194: in PersistenceSession, inlined resolveImmediateyInTransaction, and renamed to refreshRootInTransaction (cos that's what it does)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/488b55ac
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/488b55ac
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/488b55ac
Branch: refs/heads/ISIS-1194
Commit: 488b55accfb00609c76409a1834e0d1ad065f325
Parents: 7489760
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 08:44:24 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 08:44:24 2015 +0100
----------------------------------------------------------------------
.../container/DomainObjectContainerResolve.java | 4 ++--
.../runtime/system/persistence/PersistenceSession.java | 12 ++----------
2 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/488b55ac/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
index b9a9fee..f6b698e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
@@ -54,7 +54,7 @@ public class DomainObjectContainerResolve {
if(adapter == null) {
return null;
}
- getPersistenceSession().resolveImmediately(adapter);
+ getPersistenceSession().refreshRootInTransaction(adapter);
return adapter.getObject();
}
@@ -81,7 +81,7 @@ public class DomainObjectContainerResolve {
public void resolve(final Object parent) {
final ObjectAdapter adapter = adapterFor(parent);
- getPersistenceSession().resolveImmediately(adapter);
+ getPersistenceSession().refreshRootInTransaction(adapter);
}
public void resolve(final Object parent, final Object field) {
http://git-wip-us.apache.org/repos/asf/isis/blob/488b55ac/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 0d5bfbe..afcf3c7 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
@@ -706,19 +706,15 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
//endregion
- //region > resolveImmediately, resolveField
+ //region > refreshRootInTransaction, refreshRoot
/**
* Re-initialises the fields of an object. If the object is unresolved then
* the object's missing data should be retrieved from the persistence
* mechanism and be used to set up the value objects and associations.
*/
- public void resolveImmediately(final ObjectAdapter adapter) {
+ public void refreshRootInTransaction(final ObjectAdapter adapter) {
Assert.assertTrue("only resolve object that is persistent", adapter, adapter.representsPersistent());
- resolveImmediatelyInTransaction(adapter);
- }
-
- private void resolveImmediatelyInTransaction(final ObjectAdapter adapter) {
getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
@Override
public void preExecute() {
@@ -762,10 +758,6 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
});
}
- //endregion
-
-
- //region > refreshRoot
/**
* Not API; provides the ability to force a reload (refresh in JDO terms)
* of the domain object wrapped in the {@link ObjectAdapter}.