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:43 UTC
[44/50] [abbrv] isis git commit: ISIS-1194: removing
PojoRecreator#lazilyLoaded(...) ... AdapterManagerDefault can just call
PersistenceSession#lazilyLoaded(..) instead.
ISIS-1194: removing PojoRecreator#lazilyLoaded(...) ... AdapterManagerDefault can just call PersistenceSession#lazilyLoaded(..) instead.
also reordered some methods in PersistenceSession, fixed some comments/regions
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/74c75e49
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/74c75e49
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/74c75e49
Branch: refs/heads/ISIS-1194
Commit: 74c75e491d950f6c6e92a3d32b086aa158c1cbc5
Parents: 241b67f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 10:35:19 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 10:35:19 2015 +0100
----------------------------------------------------------------------
.../adaptermanager/AdapterManagerDefault.java | 2 +-
.../adaptermanager/PojoRecreator.java | 13 -------
.../system/persistence/PersistenceSession.java | 41 ++++++++++----------
3 files changed, 22 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/74c75e49/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 ae2a3f5..f772674 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
@@ -198,7 +198,7 @@ public class AdapterManagerDefault implements AdapterManager, Iterable<ObjectAda
}
// pojo may have been lazily loaded by object store, but we haven't yet seen it
- final ObjectAdapter lazilyLoadedAdapter = pojoRecreator.lazilyLoaded(pojo);
+ final ObjectAdapter lazilyLoadedAdapter = getPersistenceSession().lazilyLoaded(pojo);
if(lazilyLoadedAdapter != null) {
return lazilyLoadedAdapter;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/74c75e49/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java
index e3f17ce..c23505c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.core.runtime.persistence.adaptermanager;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -66,18 +65,6 @@ public class PojoRecreator {
- /**
- * Return an adapter, if possible, for a pojo that was instantiated by the
- * object store as a result of lazily loading, but which hasn't yet been seen
- * by the Isis framework.
- *
- * <p>
- * In the case of JDO object store, downcast to <tt>Persistence</tt>
- * and 'look inside' its state.
- */
- public ObjectAdapter lazilyLoaded(Object pojo) {
- return persistenceSession.lazilyLoaded(pojo);
- }
///////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/74c75e49/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 4d33b49..e3bc7f4 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
@@ -387,7 +387,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
LOG.debug("creating transient instance of " + objectSpec);
}
final Object pojo = objectSpec.createObject();
- final ObjectAdapter adapter = getAdapterManager().adapterFor(pojo);
+ final ObjectAdapter adapter = adapterManager.adapterFor(pojo);
return objectSpec.initialize(adapter);
}
@@ -398,12 +398,12 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
final Object pojo = objectSpec.createObject();
final ViewModelFacet facet = objectSpec.getFacet(ViewModelFacet.class);
facet.initialize(pojo, memento);
- final ObjectAdapter adapter = getAdapterManager().adapterFor(pojo);
+ final ObjectAdapter adapter = adapterManager.adapterFor(pojo);
return objectSpec.initialize(adapter);
}
//endregion
- //region > findInstances, getInstances
+ //region > findInstancesInTransaction
/**
* Finds and returns instances that match the specified query.
@@ -420,9 +420,10 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
LOG.debug("findInstances using (applib) Query: " + query);
}
+ // TODO: unify PersistenceQuery and PersistenceQueryProcessor
final PersistenceQuery persistenceQuery = createPersistenceQueryFor(query, cardinality);
if (LOG.isDebugEnabled()) {
- LOG.debug("findInstances using (core runtime) PersistenceQuery: " + persistenceQuery);
+ LOG.debug("maps to (core runtime) PersistenceQuery: " + persistenceQuery);
}
final PersistenceQueryProcessor<? extends PersistenceQuery> processor = lookupProcessorFor(persistenceQuery);
@@ -439,22 +440,11 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
return getAdapterManager().adapterFor(results);
}
- private PersistenceQueryProcessor<? extends PersistenceQuery> lookupProcessorFor(final PersistenceQuery persistenceQuery) {
- final Class<? extends PersistenceQuery> persistenceQueryClass = persistenceQuery.getClass();
- final PersistenceQueryProcessor<? extends PersistenceQuery> processor =
- persistenceQueryProcessorByClass.get(persistenceQueryClass);
- if (processor == null) {
- throw new UnsupportedFindException(MessageFormat.format(
- "Unsupported PersistenceQuery class: {0}", persistenceQueryClass.getName()));
- }
- return processor;
- }
-
/**
* Converts the {@link Query applib representation of a query} into the
* {@link PersistenceQuery NOF-internal representation}.
*/
- protected final PersistenceQuery createPersistenceQueryFor(
+ private final PersistenceQuery createPersistenceQueryFor(
final Query<?> query,
final QueryCardinality cardinality) {
@@ -467,13 +457,25 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
return persistenceQuery;
}
- //endregion
-
+ private PersistenceQueryProcessor<? extends PersistenceQuery> lookupProcessorFor(final PersistenceQuery persistenceQuery) {
+ final Class<? extends PersistenceQuery> persistenceQueryClass = persistenceQuery.getClass();
+ final PersistenceQueryProcessor<? extends PersistenceQuery> processor =
+ persistenceQueryProcessorByClass.get(persistenceQueryClass);
+ if (processor == null) {
+ throw new UnsupportedFindException(MessageFormat.format(
+ "Unsupported PersistenceQuery class: {0}", persistenceQueryClass.getName()));
+ }
+ return processor;
+ }
@SuppressWarnings("unchecked")
- private <Q extends PersistenceQuery> List<ObjectAdapter> processPersistenceQuery(final PersistenceQueryProcessor<Q> persistenceQueryProcessor, final PersistenceQuery persistenceQuery) {
+ private <Q extends PersistenceQuery> List<ObjectAdapter> processPersistenceQuery(
+ final PersistenceQueryProcessor<Q> persistenceQueryProcessor,
+ final PersistenceQuery persistenceQuery) {
return persistenceQueryProcessor.process((Q) persistenceQuery);
}
+
+
//endregion
//region > Services
@@ -690,7 +692,6 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
//endregion
-
//region > lazilyLoaded
public ObjectAdapter lazilyLoaded(Object pojo) {