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:36 UTC
[37/50] [abbrv] isis git commit: ISIS-1194: renamed
PersistenceSession#makePersistent to ...InTransaction
ISIS-1194: renamed PersistenceSession#makePersistent to ...InTransaction
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f44dee76
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f44dee76
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f44dee76
Branch: refs/heads/ISIS-1194
Commit: f44dee7677aa83afaf5f4392344a64f7d682bffb
Parents: 0aeee06
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 10:10:12 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 10:10:12 2015 +0100
----------------------------------------------------------------------
.../runtime/fixturedomainservice/ObjectFixtureFilePersistor.java | 4 ++--
.../runtime/persistence/internal/RuntimeContextFromSession.java | 2 +-
.../isis/core/runtime/system/persistence/PersistenceSession.java | 2 +-
.../core/runtime/system/persistence/PersistenceSessionTest.java | 2 +-
.../server/resources/DomainObjectResourceServerside.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f44dee76/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
index c06273e..c246b4c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
@@ -71,14 +71,14 @@ public class ObjectFixtureFilePersistor {
loadFieldData(object, loaded, line);
} else {
if (object != null && !object.representsPersistent()) {
- getPersistenceSession().makePersistent(object);
+ getPersistenceSession().makePersistentInTransaction(object);
}
object = loaded.get(line);
}
}
if (object != null && !object.representsPersistent()) {
- getPersistenceSession().makePersistent(object);
+ getPersistenceSession().makePersistentInTransaction(object);
}
} catch (final Exception e) {
throw new FixtureException("failed to load data at line " + lineNo, e);
http://git-wip-us.apache.org/repos/asf/isis/blob/f44dee76/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index 2918903..1fda389 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -164,7 +164,7 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
this.objectPersistor = new ObjectPersistorAbstract() {
@Override
public void makePersistent(final ObjectAdapter adapter) {
- getPersistenceSession().makePersistent(adapter);
+ getPersistenceSession().makePersistentInTransaction(adapter);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/f44dee76/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 8ff79c1..8a2bb37 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
@@ -794,7 +794,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
* collection, that is not already persistent, should be made persistent by
* recursively calling this method.
*/
- public void makePersistent(final ObjectAdapter adapter) {
+ public void makePersistentInTransaction(final ObjectAdapter adapter) {
if (adapter.representsPersistent()) {
throw new NotPersistableException("Object already persistent: " + adapter);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f44dee76/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java
index 54fa13d..1419013 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java
@@ -263,7 +263,7 @@ public class PersistenceSessionTest {
});
transactionManager.startTransaction();
- persistenceSession.makePersistent(transientAdapter);
+ persistenceSession.makePersistentInTransaction(transientAdapter);
transactionManager.endTransaction();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f44dee76/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
index 2bd8982..8531a59 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
@@ -97,7 +97,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
if (validity.isVetoed()) {
throw RestfulObjectsApplicationException.createWithBody(HttpStatusCode.BAD_REQUEST, objectRepr, validity.getReason());
}
- getResourceContext().getPersistenceSession().makePersistent(objectAdapter);
+ getResourceContext().getPersistenceSession().makePersistentInTransaction(objectAdapter);
return getDomainResourceHelper(objectAdapter).objectRepresentation();
}