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 18:12:04 UTC
[04/34] isis git commit: ISIS-1194: renamed
PersistenceSession#initialize to initializePropertiesAndDoCallback(),
renamed #createObject to #instantiateAndInjectServices
ISIS-1194: renamed PersistenceSession#initialize to initializePropertiesAndDoCallback(), renamed #createObject to #instantiateAndInjectServices
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a05561ed
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a05561ed
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a05561ed
Branch: refs/heads/ISIS-1194
Commit: a05561ed961386eebf24b6ebae09a3c39a4f09f1
Parents: 604acc3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 14:45:30 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 14:45:30 2015 +0100
----------------------------------------------------------------------
.../org/apache/isis/core/runtime/memento/Memento.java | 2 +-
.../adaptermanager/AdapterManagerDefault.java | 2 +-
.../PublishingServiceWithDefaultPayloadFactories.java | 2 +-
.../runtime/system/persistence/PersistenceSession.java | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a05561ed/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
index 91cb87a..69d391f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
@@ -204,7 +204,7 @@ public class Memento implements Serializable {
final Oid oid = getOid();
if (spec.isParentedOrFreeCollection()) {
- final Object recreatedPojo = getPersistenceSession().createObject(spec);
+ final Object recreatedPojo = getPersistenceSession().instantiateAndInjectServices(spec);
adapter = getPersistenceSession().getAdapterManager() .mapRecreatedPojo(oid, recreatedPojo);
populateCollection(adapter, (CollectionData) data);
http://git-wip-us.apache.org/repos/asf/isis/blob/a05561ed/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 d04366c..954bdc9 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
@@ -371,7 +371,7 @@ public class AdapterManagerDefault implements AdapterManager,
private Object recreatePojoDefault(final RootOid rootOid) {
final ObjectSpecification spec =
specificationLoader.lookupBySpecId(rootOid.getObjectSpecId());
- final Object pojo = persistenceSession.createObject(spec);
+ final Object pojo = persistenceSession.instantiateAndInjectServices(spec);
if(rootOid.isViewModel()) {
// initialize the view model pojo from the oid's identifier
http://git-wip-us.apache.org/repos/asf/isis/blob/a05561ed/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PublishingServiceWithDefaultPayloadFactories.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PublishingServiceWithDefaultPayloadFactories.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PublishingServiceWithDefaultPayloadFactories.java
index 9f00b33..d08c6fe 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PublishingServiceWithDefaultPayloadFactories.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PublishingServiceWithDefaultPayloadFactories.java
@@ -58,7 +58,7 @@ public class PublishingServiceWithDefaultPayloadFactories {
// objectstores such as JDO prevent the underlying pojo from being touched once it has been deleted.
// we therefore replace that pojo with an 'empty' one.
- Object replacementObject = getPersistenceSession().createObject(adapter.getSpecification());
+ Object replacementObject = getPersistenceSession().instantiateAndInjectServices(adapter.getSpecification());
getPersistenceSession().getAdapterManager().remapRecreatedPojo(adapter, replacementObject);
return adapter;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a05561ed/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 a942e54..4250d00 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
@@ -390,9 +390,9 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
if (LOG.isDebugEnabled()) {
LOG.debug("creating transient instance of " + objectSpec);
}
- final Object pojo = createObject(objectSpec);
+ final Object pojo = instantiateAndInjectServices(objectSpec);
final ObjectAdapter adapter = adapterManager.adapterFor(pojo);
- return initialize(adapter);
+ return initializePropertiesAndDoCallback(adapter);
}
@@ -401,15 +401,15 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
if (LOG.isDebugEnabled()) {
LOG.debug("creating view model instance of " + objectSpec);
}
- final Object pojo = createObject(objectSpec);
+ final Object pojo = instantiateAndInjectServices(objectSpec);
final ViewModelFacet facet = objectSpec.getFacet(ViewModelFacet.class);
facet.initialize(pojo, memento);
final ObjectAdapter adapter = adapterManager.adapterFor(pojo);
- return initialize(adapter);
+ return initializePropertiesAndDoCallback(adapter);
}
- public Object createObject(final ObjectSpecification objectSpec) {
+ public Object instantiateAndInjectServices(final ObjectSpecification objectSpec) {
final Class<?> correspondingClass = objectSpec.getCorrespondingClass();
if (correspondingClass.isArray()) {
@@ -439,7 +439,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
}
}
- public ObjectAdapter initialize(final ObjectAdapter adapter) {
+ private ObjectAdapter initializePropertiesAndDoCallback(final ObjectAdapter adapter) {
// initialize new object
final List<ObjectAssociation> fields = adapter.getSpecification().getAssociations(Contributed.EXCLUDED);