You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/09/03 10:49:48 UTC
[isis] 04/07: ISIS-1976: rename some methods in AdapterManager
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch ISIS-1976-rethink-object-adapters
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d6c4782c6d1e24556714727294f3191e16155103
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Sep 3 08:30:52 2018 +0200
ISIS-1976: rename some methods in AdapterManager
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../core/metamodel/adapter/mgr/AdapterManager.java | 83 +++++++++++-----------
.../javautilcollection/JavaArrayFacet.java | 4 +-
...ObjectFacetDeclarativeInitializingAbstract.java | 10 +--
.../PersistenceSessionServiceInternalNoop.java | 8 +--
.../system/persistence/PersistenceSession4.java | 52 +++++++-------
.../queries/PersistenceQueryProcessorAbstract.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
...FactoryDefaultTest_wrappedObject_transient.java | 2 +-
.../system/persistence/PersistenceSession5.java | 52 +++++++-------
.../queries/PersistenceQueryProcessorAbstract.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
...FactoryDefaultTest_wrappedObject_transient.java | 2 +-
.../PersistenceSessionServiceInternalDefault.java | 16 ++---
.../system/persistence/PersistenceSessionBase.java | 2 +-
.../adaptermanager/ObjectAdapterContext.java | 4 +-
.../adaptermanager/ObjectAdapterLegacy.java | 6 +-
.../adaptermanager/RootAndCollectionAdapters.java | 2 +-
.../wicket/ConverterForObjectAdapter.java | 2 +-
.../wicket/ConverterForObjectAdapterMemento.java | 2 +-
19 files changed, 126 insertions(+), 129 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/mgr/AdapterManager.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/mgr/AdapterManager.java
index e3c266d..f9eaa32 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/mgr/AdapterManager.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/mgr/AdapterManager.java
@@ -28,42 +28,22 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
public interface AdapterManager {
-
- /**
- * Gets the {@link ObjectAdapter adapter} for the specified domain object if
- * it exists in the identity map.
- *
- * <p>
- * Provided by the <tt>AdapterManager</tt> when used by framework.
- *
- * @param pojo
- * - must not be <tt>null</tt>
- * @return adapter, or <tt>null</tt> if doesn't exist.
- */
- @Programmatic
- ObjectAdapter getAdapterFor(Object pojo);
-
-
/**
- * Looks up or creates a standalone (value) or root adapter.
+ * @return standalone (value) or root adapter
*/
@Programmatic
ObjectAdapter adapterFor(Object domainObject);
-
/**
- * Gets the {@link ObjectAdapter adapter} for the {@link Oid} if it exists
- * in the identity map.
- *
- * @param oid
- * - must not be <tt>null</tt>
- * @return adapter, or <tt>null</tt> if doesn't exist.
+ * @return collection adapter.
*/
@Programmatic
- ObjectAdapter getAdapterFor(Oid oid);
-
-
+ ObjectAdapter adapterFor(
+ final Object pojo,
+ final ObjectAdapter parentAdapter,
+ OneToManyAssociation collection);
+
enum ConcurrencyChecking {
NO_CHECK,
@@ -155,31 +135,48 @@ public interface AdapterManager {
}
-
-
+ // -- DEPRECATIONS
/**
- * Looks up or creates a collection adapter.
+ * Enable RecreatableObjectFacet to 'temporarily' map an existing pojo to an oid.
+ * @deprecated don't expose caching
*/
- @Programmatic
- ObjectAdapter adapterFor(
- final Object pojo,
- final ObjectAdapter parentAdapter,
- OneToManyAssociation collection);
-
+ @Programmatic @Deprecated
+ ObjectAdapter addRecreatedPojoToCache(Oid oid, Object recreatedPojo);
/**
- * Enable RecreatableObjectFacet to 'temporarily' map an existing pojo to an oid.
+ * Enable RecreatableObjectFacet to remove a 'temporarily' mapped adapter for a pojo.
+ * @deprecated don't expose caching
*/
- @Programmatic
- ObjectAdapter mapRecreatedPojo(Oid oid, Object recreatedPojo);
+ @Programmatic @Deprecated
+ void removeAdapterFromCache(ObjectAdapter adapter);
+
/**
- * Enable RecreatableObjectFacet to remove a 'temporarily' mapped an adapter for a pojo.
+ * Gets the {@link ObjectAdapter adapter} for the specified domain object if
+ * it exists in the identity map.
+ *
+ * <p>
+ * Provided by the <tt>AdapterManager</tt> when used by framework.
+ *
+ * @param pojo
+ * - must not be <tt>null</tt>
+ * @return adapter, or <tt>null</tt> if doesn't exist.
+ * @deprecated don't expose caching
*/
- @Programmatic
- void removeAdapter(ObjectAdapter adapter);
-
+ @Programmatic @Deprecated
+ ObjectAdapter lookupAdapterFor(Object pojo);
+ /**
+ * Gets the {@link ObjectAdapter adapter} for the {@link Oid} if it exists
+ * in the identity map.
+ *
+ * @param oid
+ * - must not be <tt>null</tt>
+ * @return adapter, or <tt>null</tt> if doesn't exist.
+ * @deprecated don't expose caching
+ */
+ @Programmatic @Deprecated
+ ObjectAdapter lookupAdapterFor(Oid oid);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
index a13a8c2..0e82f13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
@@ -57,7 +57,7 @@ public class JavaArrayFacet extends CollectionFacetAbstract {
final Object[] array = array(collectionAdapter);
final ArrayList<ObjectAdapter> objectCollection = new ArrayList<ObjectAdapter>(array.length);
for (final Object element2 : array) {
- final ObjectAdapter element = getAdapterManager().getAdapterFor(element2);
+ final ObjectAdapter element = getAdapterManager().lookupAdapterFor(element2);
objectCollection.add(element);
}
return objectCollection;
@@ -69,7 +69,7 @@ public class JavaArrayFacet extends CollectionFacetAbstract {
@Override
public ObjectAdapter firstElement(final ObjectAdapter collectionAdapter) {
final Object[] array = array(collectionAdapter);
- return array.length > 0 ? getAdapterManager().getAdapterFor(array[0]) : null;
+ return array.length > 0 ? getAdapterManager().lookupAdapterFor(array[0]) : null;
}
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
index e4ac6a5..359f8cc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
@@ -77,11 +77,11 @@ public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract exte
final Set<String> mementoKeys = memento.keySet();
// manually recreate the adapter in order to be able to query state via the metamodel
- ObjectAdapter viewModelAdapter = adapterManager.getAdapterFor(viewModelPojo);
+ ObjectAdapter viewModelAdapter = adapterManager.lookupAdapterFor(viewModelPojo);
if(viewModelAdapter == null) {
final ObjectSpecification objectSpecification = specificationLoader.loadSpecification(viewModelPojo.getClass());
final ObjectSpecId objectSpecId = objectSpecification.getSpecId();
- viewModelAdapter = adapterManager.mapRecreatedPojo(new RootOid(objectSpecId, mementoStr, Oid.State.VIEWMODEL), viewModelPojo);
+ viewModelAdapter = adapterManager.addRecreatedPojoToCache(new RootOid(objectSpecId, mementoStr, Oid.State.VIEWMODEL), viewModelPojo);
}
final ObjectSpecification spec = viewModelAdapter.getSpecification();
@@ -131,7 +131,7 @@ public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract exte
// so... we create a temporary transient adapter, use it to wrap this adapter and interrogate this pojo,
// then throw away that adapter (remove from the adapter map)
boolean createdTemporaryAdapter = false;
- ObjectAdapter viewModelAdapter = adapterManager.getAdapterFor(viewModelPojo);
+ ObjectAdapter viewModelAdapter = adapterManager.lookupAdapterFor(viewModelPojo);
if(viewModelAdapter == null) {
final ObjectSpecification objectSpecification =
@@ -139,7 +139,7 @@ public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract exte
final ObjectSpecId objectSpecId = objectSpecification.getSpecId();
viewModelAdapter =
- adapterManager.mapRecreatedPojo(
+ adapterManager.addRecreatedPojoToCache(
RootOid.create(objectSpecId, UUID.randomUUID().toString()),
viewModelPojo);
@@ -183,7 +183,7 @@ public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract exte
return memento.asString();
} finally {
if(createdTemporaryAdapter) {
- adapterManager.removeAdapter(viewModelAdapter);
+ adapterManager.removeAdapterFromCache(viewModelAdapter);
}
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
index d94cd77..0dbecb4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
@@ -43,7 +43,7 @@ public class PersistenceSessionServiceInternalNoop implements PersistenceSession
@Override
- public ObjectAdapter getAdapterFor(final Object pojo) {
+ public ObjectAdapter lookupAdapterFor(final Object pojo) {
throw new UnsupportedOperationException("Not supported by this implementation of PersistenceSessionServiceInternal");
}
@@ -56,12 +56,12 @@ public class PersistenceSessionServiceInternalNoop implements PersistenceSession
}
@Override
- public ObjectAdapter mapRecreatedPojo(Oid oid, Object recreatedPojo) {
+ public ObjectAdapter addRecreatedPojoToCache(Oid oid, Object recreatedPojo) {
throw new UnsupportedOperationException("Not supported by this implementation of PersistenceSessionServiceInternal");
}
@Override
- public void removeAdapter(ObjectAdapter adapter) {
+ public void removeAdapterFromCache(ObjectAdapter adapter) {
throw new UnsupportedOperationException("Not supported by this implementation of PersistenceSessionServiceInternal");
}
@@ -71,7 +71,7 @@ public class PersistenceSessionServiceInternalNoop implements PersistenceSession
}
@Override
- public ObjectAdapter getAdapterFor(Oid oid) {
+ public ObjectAdapter lookupAdapterFor(Oid oid) {
throw new UnsupportedOperationException("Not supported by this implementation of PersistenceSessionServiceInternal");
}
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
index 4a2598c..31a038f 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession4.java
@@ -664,7 +664,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
*
* <p>
* That is, it retrieves the object identified by the specified {@link RootOid} from the object
- * store, {@link AdapterManager#mapRecreatedPojo(org.apache.isis.core.metamodel.adapter.oid.Oid, Object) mapped by
+ * store, {@link AdapterManager#addRecreatedPojoToCache(org.apache.isis.core.metamodel.adapter.oid.Oid, Object) mapped by
* the adapter manager}.
*
* <p>The cache should be checked first and, if the object is cached,
@@ -708,7 +708,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
Objects.requireNonNull(oid);
- final ObjectAdapter adapter = getAdapterFor(oid);
+ final ObjectAdapter adapter = lookupAdapterFor(oid);
if (adapter != null) {
return adapter;
}
@@ -720,7 +720,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
LOG.debug("getObject; oid={}", oid);
final Object pojo = loadPersistentPojo(oid);
- return mapRecreatedPojo(oid, pojo);
+ return addRecreatedPojoToCache(oid, pojo);
}
});
}
@@ -833,7 +833,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
return null;
}
final RootOid oid = createPersistentOrViewModelOid(pojo);
- final ObjectAdapter adapter = mapRecreatedPojo(oid, pojo);
+ final ObjectAdapter adapter = addRecreatedPojoToCache(oid, pojo);
return adapter;
}
@@ -1075,10 +1075,10 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
@Override
public ObjectAdapter getAggregateRoot(final ParentedCollectionOid collectionOid) {
final Oid rootOid = collectionOid.getRootOid();
- ObjectAdapter rootadapter = getAdapterFor(rootOid);
+ ObjectAdapter rootadapter = lookupAdapterFor(rootOid);
if(rootadapter == null) {
final Oid parentOidNowPersisted = remappedFrom(rootOid);
- rootadapter = getAdapterFor(parentOidNowPersisted);
+ rootadapter = lookupAdapterFor(parentOidNowPersisted);
}
return rootadapter;
}
@@ -1094,14 +1094,14 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
// -- AdapterManager implementation
@Override
- public ObjectAdapter getAdapterFor(final Object pojo) {
+ public ObjectAdapter lookupAdapterFor(final Object pojo) {
Objects.requireNonNull(pojo);
return objectAdapterContext.lookupAdapterByPojo(pojo);
}
@Override
- public ObjectAdapter getAdapterFor(final Oid oid) {
+ public ObjectAdapter lookupAdapterFor(final Oid oid) {
Objects.requireNonNull(oid);
ensureMapsConsistent(oid);
@@ -1112,7 +1112,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
private ObjectAdapter existingOrValueAdapter(Object pojo) {
// attempt to locate adapter for the pojo
- ObjectAdapter adapter = getAdapterFor(pojo);
+ ObjectAdapter adapter = lookupAdapterFor(pojo);
if (adapter != null) {
return adapter;
}
@@ -1269,12 +1269,12 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
List<RootOid> notYetLoadedOids = _Lists.newArrayList();
for (RootOid rootOid : rootOids) {
// attempt to locate adapter for the Oid
- ObjectAdapter adapter = getAdapterFor(rootOid);
+ ObjectAdapter adapter = lookupAdapterFor(rootOid);
// handle view models or transient
if (adapter == null) {
if (rootOid.isTransient() || rootOid.isViewModel()) {
final Object pojo = recreatePojoTransientOrViewModel(rootOid);
- adapter = mapRecreatedPojo(rootOid, pojo);
+ adapter = addRecreatedPojoToCache(rootOid, pojo);
sync(concurrencyChecking, adapter, rootOid);
}
}
@@ -1294,7 +1294,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
if(pojo != null) {
ObjectAdapter adapter;
try {
- adapter = mapRecreatedPojo(rootOid, pojo);
+ adapter = addRecreatedPojoToCache(rootOid, pojo);
adapterByOid.put(rootOid, adapter);
} catch(ObjectNotFoundException ex) {
throw ex; // just rethrow
@@ -1328,7 +1328,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
/**
* Either returns an existing {@link ObjectAdapter adapter} (as per
- * {@link #getAdapterFor(Oid)}), otherwise re-creates an adapter with the
+ * {@link #lookupAdapterFor(Oid)}), otherwise re-creates an adapter with the
* specified (persistent) {@link Oid}.
*
* <p>
@@ -1359,7 +1359,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
final ConcurrencyChecking concurrencyChecking) {
// attempt to locate adapter for the Oid
- ObjectAdapter adapter = getAdapterFor(rootOid);
+ ObjectAdapter adapter = lookupAdapterFor(rootOid);
if (adapter == null) {
// else recreate
try {
@@ -1369,7 +1369,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
} else {
pojo = loadPersistentPojo(rootOid);
}
- adapter = mapRecreatedPojo(rootOid, pojo);
+ adapter = addRecreatedPojoToCache(rootOid, pojo);
} catch(ObjectNotFoundException ex) {
throw ex; // just rethrow
} catch(RuntimeException ex) {
@@ -1490,7 +1490,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
/**
* Either returns an existing {@link ObjectAdapter adapter} (as per
- * {@link #getAdapterFor(Object)} or {@link #getAdapterFor(Oid)}), otherwise
+ * {@link #lookupAdapterFor(Object)} or {@link #lookupAdapterFor(Oid)}), otherwise
* re-creates an adapter with the specified (persistent) {@link Oid}.
*
* <p>
@@ -1503,18 +1503,18 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
* @param recreatedPojo - already known to the object store impl, or a service
*/
@Override
- public ObjectAdapter mapRecreatedPojo(final Oid oid, final Object recreatedPojo) {
+ public ObjectAdapter addRecreatedPojoToCache(final Oid oid, final Object recreatedPojo) {
// attempt to locate adapter for the pojo
// REVIEW: this check is possibly redundant because the pojo will most likely
// have just been instantiated, so won't yet be in any maps
- final ObjectAdapter adapterLookedUpByPojo = getAdapterFor(recreatedPojo);
+ final ObjectAdapter adapterLookedUpByPojo = lookupAdapterFor(recreatedPojo);
if (adapterLookedUpByPojo != null) {
return adapterLookedUpByPojo;
}
// attempt to locate adapter for the Oid
- final ObjectAdapter adapterLookedUpByOid = getAdapterFor(oid);
+ final ObjectAdapter adapterLookedUpByOid = lookupAdapterFor(oid);
if (adapterLookedUpByOid != null) {
return adapterLookedUpByOid;
}
@@ -1540,7 +1540,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
* TODO: should do a cascade remove of any aggregated objects.
*/
@Override
- public void removeAdapter(final ObjectAdapter adapter) {
+ public void removeAdapterFromCache(final ObjectAdapter adapter) {
ensureMapsConsistent(adapter);
LOG.debug("removing adapter: {}", adapter);
@@ -1559,7 +1559,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
*/
@Deprecated
private void remapRecreatedPojo(ObjectAdapter adapter, final Object pojo) {
- removeAdapter(adapter);
+ removeAdapterFromCache(adapter);
adapter.replacePojo(pojo);
mapAndInjectServices(adapter);
}
@@ -1645,7 +1645,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
final Version datastoreVersion = getVersionIfAny(pc);
final RootOid originalOid;
- ObjectAdapter adapter = getAdapterFor(pojo);
+ ObjectAdapter adapter = lookupAdapterFor(pojo);
if (adapter != null) {
ensureRootObject(pojo);
originalOid = (RootOid) adapter.getOid();
@@ -1681,11 +1681,11 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
// it appears to be possible that there is already an adapter for this Oid,
// ie from ObjectStore#resolveImmediately()
- adapter = getAdapterFor(originalOid);
+ adapter = lookupAdapterFor(originalOid);
if (adapter != null) {
remapRecreatedPojo(adapter, pojo);
} else {
- adapter = mapRecreatedPojo(originalOid, pojo);
+ adapter = addRecreatedPojoToCache(originalOid, pojo);
CallbackFacet.Util.callCallback(adapter, LoadedCallbackFacet.class);
postLifecycleEventIfRequired(adapter, LoadedLifecycleEventFacet.class);
@@ -1769,7 +1769,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
*/
@Override
public void invokeIsisPersistingCallback(final Persistable pojo) {
- final ObjectAdapter adapter = getAdapterFor(pojo);
+ final ObjectAdapter adapter = lookupAdapterFor(pojo);
if (adapter == null) {
// not expected.
return;
@@ -1830,7 +1830,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
@Override
public void enlistUpdatingAndInvokeIsisUpdatingCallback(final Persistable pojo) {
- ObjectAdapter adapter = getAdapterFor(pojo);
+ ObjectAdapter adapter = lookupAdapterFor(pojo);
if (adapter == null) {
// seen this happen in the case when a parent entity (LeaseItem) has a collection of children
// objects (LeaseTerm) for which we haven't had a loaded callback fired and so are not yet
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
index dd7739c..387d16d 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -56,7 +56,7 @@ implements PersistenceQueryProcessor<T> {
if(pojo instanceof Persistable) {
// an entity
persistenceSession.initializeMapAndCheckConcurrency((Persistable) pojo);
- adapter = persistenceSession.getAdapterFor(pojo);
+ adapter = persistenceSession.lookupAdapterFor(pojo);
} else {
// a value type
adapter = persistenceSession.adapterFor(pojo);
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index ea0afa3..7885ba4 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -210,7 +210,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
will(returnValue(session));
- allowing(mockAdapterManager).getAdapterFor(employeeDO);
+ allowing(mockAdapterManager).lookupAdapterFor(employeeDO);
will(returnValue(mockEmployeeAdapter));
allowing(mockAdapterManager).adapterFor(employeeDO);
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index be72ee0..b1dce48 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -159,7 +159,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
- allowing(mockAdapterManager).getAdapterFor(employeeDO);
+ allowing(mockAdapterManager).lookupAdapterFor(employeeDO);
will(returnValue(mockEmployeeAdapter));
allowing(mockAdapterManager).adapterFor(employeeDO);
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
index 773cb85..8a16173 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
@@ -662,7 +662,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
*
* <p>
* That is, it retrieves the object identified by the specified {@link RootOid} from the object
- * store, {@link AdapterManager#mapRecreatedPojo(org.apache.isis.core.metamodel.adapter.oid.Oid, Object) mapped by
+ * store, {@link AdapterManager#addRecreatedPojoToCache(org.apache.isis.core.metamodel.adapter.oid.Oid, Object) mapped by
* the adapter manager}.
*
* <p>The cache should be checked first and, if the object is cached,
@@ -706,7 +706,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
Objects.requireNonNull(oid);
- final ObjectAdapter adapter = getAdapterFor(oid);
+ final ObjectAdapter adapter = lookupAdapterFor(oid);
if (adapter != null) {
return adapter;
}
@@ -718,7 +718,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
LOG.debug("getObject; oid={}", oid);
final Object pojo = loadPersistentPojo(oid);
- return mapRecreatedPojo(oid, pojo);
+ return addRecreatedPojoToCache(oid, pojo);
}
});
}
@@ -831,7 +831,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
return null;
}
final RootOid oid = createPersistentOrViewModelOid(pojo);
- final ObjectAdapter adapter = mapRecreatedPojo(oid, pojo);
+ final ObjectAdapter adapter = addRecreatedPojoToCache(oid, pojo);
return adapter;
}
@@ -1071,10 +1071,10 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
@Override
public ObjectAdapter getAggregateRoot(final ParentedCollectionOid collectionOid) {
final Oid rootOid = collectionOid.getRootOid();
- ObjectAdapter rootadapter = getAdapterFor(rootOid);
+ ObjectAdapter rootadapter = lookupAdapterFor(rootOid);
if(rootadapter == null) {
final Oid parentOidNowPersisted = remappedFrom(rootOid);
- rootadapter = getAdapterFor(parentOidNowPersisted);
+ rootadapter = lookupAdapterFor(parentOidNowPersisted);
}
return rootadapter;
}
@@ -1090,14 +1090,14 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
// -- AdapterManager implementation
@Override
- public ObjectAdapter getAdapterFor(final Object pojo) {
+ public ObjectAdapter lookupAdapterFor(final Object pojo) {
Objects.requireNonNull(pojo);
return objectAdapterContext.lookupAdapterByPojo(pojo);
}
@Override
- public ObjectAdapter getAdapterFor(final Oid oid) {
+ public ObjectAdapter lookupAdapterFor(final Oid oid) {
Objects.requireNonNull(oid);
ensureMapsConsistent(oid);
@@ -1108,7 +1108,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
private ObjectAdapter existingOrValueAdapter(Object pojo) {
// attempt to locate adapter for the pojo
- ObjectAdapter adapter = getAdapterFor(pojo);
+ ObjectAdapter adapter = lookupAdapterFor(pojo);
if (adapter != null) {
return adapter;
}
@@ -1266,12 +1266,12 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
List<RootOid> notYetLoadedOids = _Lists.newArrayList();
for (RootOid rootOid : rootOids) {
// attempt to locate adapter for the Oid
- ObjectAdapter adapter = getAdapterFor(rootOid);
+ ObjectAdapter adapter = lookupAdapterFor(rootOid);
// handle view models or transient
if (adapter == null) {
if (rootOid.isTransient() || rootOid.isViewModel()) {
final Object pojo = recreatePojoTransientOrViewModel(rootOid);
- adapter = mapRecreatedPojo(rootOid, pojo);
+ adapter = addRecreatedPojoToCache(rootOid, pojo);
sync(concurrencyChecking, adapter, rootOid);
}
}
@@ -1291,7 +1291,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
if(pojo != null) {
ObjectAdapter adapter;
try {
- adapter = mapRecreatedPojo(rootOid, pojo);
+ adapter = addRecreatedPojoToCache(rootOid, pojo);
adapterByOid.put(rootOid, adapter);
} catch(ObjectNotFoundException ex) {
throw ex; // just rethrow
@@ -1325,7 +1325,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
/**
* Either returns an existing {@link ObjectAdapter adapter} (as per
- * {@link #getAdapterFor(Oid)}), otherwise re-creates an adapter with the
+ * {@link #lookupAdapterFor(Oid)}), otherwise re-creates an adapter with the
* specified (persistent) {@link Oid}.
*
* <p>
@@ -1356,7 +1356,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
final ConcurrencyChecking concurrencyChecking) {
// attempt to locate adapter for the Oid
- ObjectAdapter adapter = getAdapterFor(rootOid);
+ ObjectAdapter adapter = lookupAdapterFor(rootOid);
if (adapter == null) {
// else recreate
try {
@@ -1366,7 +1366,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
} else {
pojo = loadPersistentPojo(rootOid);
}
- adapter = mapRecreatedPojo(rootOid, pojo);
+ adapter = addRecreatedPojoToCache(rootOid, pojo);
} catch(ObjectNotFoundException ex) {
throw ex; // just rethrow
} catch(RuntimeException ex) {
@@ -1485,7 +1485,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
/**
* Either returns an existing {@link ObjectAdapter adapter} (as per
- * {@link #getAdapterFor(Object)} or {@link #getAdapterFor(Oid)}), otherwise
+ * {@link #lookupAdapterFor(Object)} or {@link #lookupAdapterFor(Oid)}), otherwise
* re-creates an adapter with the specified (persistent) {@link Oid}.
*
* <p>
@@ -1498,18 +1498,18 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
* @param recreatedPojo - already known to the object store impl, or a service
*/
@Override
- public ObjectAdapter mapRecreatedPojo(final Oid oid, final Object recreatedPojo) {
+ public ObjectAdapter addRecreatedPojoToCache(final Oid oid, final Object recreatedPojo) {
// attempt to locate adapter for the pojo
// REVIEW: this check is possibly redundant because the pojo will most likely
// have just been instantiated, so won't yet be in any maps
- final ObjectAdapter adapterLookedUpByPojo = getAdapterFor(recreatedPojo);
+ final ObjectAdapter adapterLookedUpByPojo = lookupAdapterFor(recreatedPojo);
if (adapterLookedUpByPojo != null) {
return adapterLookedUpByPojo;
}
// attempt to locate adapter for the Oid
- final ObjectAdapter adapterLookedUpByOid = getAdapterFor(oid);
+ final ObjectAdapter adapterLookedUpByOid = lookupAdapterFor(oid);
if (adapterLookedUpByOid != null) {
return adapterLookedUpByOid;
}
@@ -1535,7 +1535,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
* TODO: should do a cascade remove of any aggregated objects.
*/
@Override
- public void removeAdapter(final ObjectAdapter adapter) {
+ public void removeAdapterFromCache(final ObjectAdapter adapter) {
ensureMapsConsistent(adapter);
LOG.debug("removing adapter: {}", adapter);
@@ -1554,7 +1554,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
*/
@Deprecated
private void remapRecreatedPojo(ObjectAdapter adapter, final Object pojo) {
- removeAdapter(adapter);
+ removeAdapterFromCache(adapter);
adapter.replacePojo(pojo);
mapAndInjectServices(adapter);
}
@@ -1636,7 +1636,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
final Version datastoreVersion = getVersionIfAny(pc);
final RootOid originalOid;
- ObjectAdapter adapter = getAdapterFor(pojo);
+ ObjectAdapter adapter = lookupAdapterFor(pojo);
if (adapter != null) {
ensureRootObject(pojo);
originalOid = (RootOid) adapter.getOid();
@@ -1672,11 +1672,11 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
// it appears to be possible that there is already an adapter for this Oid,
// ie from ObjectStore#resolveImmediately()
- adapter = getAdapterFor(originalOid);
+ adapter = lookupAdapterFor(originalOid);
if (adapter != null) {
remapRecreatedPojo(adapter, pojo);
} else {
- adapter = mapRecreatedPojo(originalOid, pojo);
+ adapter = addRecreatedPojoToCache(originalOid, pojo);
CallbackFacet.Util.callCallback(adapter, LoadedCallbackFacet.class);
postLifecycleEventIfRequired(adapter, LoadedLifecycleEventFacet.class);
@@ -1760,7 +1760,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
*/
@Override
public void invokeIsisPersistingCallback(final Persistable pojo) {
- final ObjectAdapter adapter = getAdapterFor(pojo);
+ final ObjectAdapter adapter = lookupAdapterFor(pojo);
if (adapter == null) {
// not expected.
return;
@@ -1821,7 +1821,7 @@ implements IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
@Override
public void enlistUpdatingAndInvokeIsisUpdatingCallback(final Persistable pojo) {
- ObjectAdapter adapter = getAdapterFor(pojo);
+ ObjectAdapter adapter = lookupAdapterFor(pojo);
if (adapter == null) {
// seen this happen in the case when a parent entity (LeaseItem) has a collection of children
// objects (LeaseTerm) for which we haven't had a loaded callback fired and so are not yet
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
index 31f6896..df41662 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -56,7 +56,7 @@ implements PersistenceQueryProcessor<T> {
if(pojo instanceof Persistable) {
// an entity
persistenceSession.initializeMapAndCheckConcurrency((Persistable) pojo);
- adapter = persistenceSession.getAdapterFor(pojo);
+ adapter = persistenceSession.lookupAdapterFor(pojo);
} else {
// a value type
adapter = persistenceSession.adapterFor(pojo);
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index ea0afa3..7885ba4 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -210,7 +210,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
will(returnValue(session));
- allowing(mockAdapterManager).getAdapterFor(employeeDO);
+ allowing(mockAdapterManager).lookupAdapterFor(employeeDO);
will(returnValue(mockEmployeeAdapter));
allowing(mockAdapterManager).adapterFor(employeeDO);
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index be72ee0..b1dce48 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -159,7 +159,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
- allowing(mockAdapterManager).getAdapterFor(employeeDO);
+ allowing(mockAdapterManager).lookupAdapterFor(employeeDO);
will(returnValue(mockEmployeeAdapter));
allowing(mockAdapterManager).adapterFor(employeeDO);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index 0afbc52..cacde06 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -55,13 +55,13 @@ import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
public class PersistenceSessionServiceInternalDefault implements PersistenceSessionServiceInternal {
@Override
- public ObjectAdapter getAdapterFor(Oid oid) {
- return getPersistenceSession().getAdapterFor(oid);
+ public ObjectAdapter lookupAdapterFor(Oid oid) {
+ return getPersistenceSession().lookupAdapterFor(oid);
}
@Override
- public ObjectAdapter getAdapterFor(final Object pojo) {
- return getPersistenceSession().getAdapterFor(pojo);
+ public ObjectAdapter lookupAdapterFor(final Object pojo) {
+ return getPersistenceSession().lookupAdapterFor(pojo);
}
@Override
@@ -78,13 +78,13 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
}
@Override
- public ObjectAdapter mapRecreatedPojo(Oid oid, Object recreatedPojo) {
- return getPersistenceSession().mapRecreatedPojo(oid, recreatedPojo);
+ public ObjectAdapter addRecreatedPojoToCache(Oid oid, Object recreatedPojo) {
+ return getPersistenceSession().addRecreatedPojoToCache(oid, recreatedPojo);
}
@Override
- public void removeAdapter(ObjectAdapter adapter) {
- getPersistenceSession().removeAdapter(adapter);
+ public void removeAdapterFromCache(ObjectAdapter adapter) {
+ getPersistenceSession().removeAdapterFromCache(adapter);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
index 71f933a..9b035aa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
@@ -194,7 +194,7 @@ abstract class PersistenceSessionBase implements PersistenceSession {
final List<Object> services = servicesInjector.getRegisteredServices();
final List<ObjectAdapter> serviceAdapters = _Lists.newArrayList();
for (final Object servicePojo : services) {
- ObjectAdapter serviceAdapter = getAdapterFor(servicePojo);
+ ObjectAdapter serviceAdapter = lookupAdapterFor(servicePojo);
if(serviceAdapter == null) {
throw new IllegalStateException("ObjectAdapter for service " + servicePojo + " does not exist?!?");
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
index 268d821..ef6314c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
@@ -142,7 +142,7 @@ public class ObjectAdapterContext {
*
* <p>
* Should only be called if the pojo is known not to be
- * {@link #getAdapterFor(Object) mapped}, and for immutable value types
+ * {@link #lookupAdapterFor(Object) mapped}, and for immutable value types
* referenced.
*/
ObjectAdapter createStandaloneAdapter(Object pojo);
@@ -159,7 +159,7 @@ public class ObjectAdapterContext {
*
* <p>
* Should only be called if the pojo is known not to be
- * {@link #getAdapterFor(Object) mapped}.
+ * {@link #lookupAdapterFor(Object) mapped}.
*/
ObjectAdapter createCollectionAdapter(Object pojo, ObjectAdapter parentAdapter, OneToManyAssociation otma);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
index 3469dfc..6ff463d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
@@ -144,7 +144,7 @@ public class ObjectAdapterLegacy {
if (spec.isParentedOrFreeCollection()) {
final Object recreatedPojo = getPersistenceSession().instantiateAndInjectServices(spec);
- adapter = getPersistenceSession().mapRecreatedPojo(oid, recreatedPojo);
+ adapter = getPersistenceSession().addRecreatedPojoToCache(oid, recreatedPojo);
populateCollection(adapter, (CollectionData) data);
} else {
@@ -153,9 +153,9 @@ public class ObjectAdapterLegacy {
// remove adapter if already in the adapter manager maps, because
// otherwise would (as a side-effect) update the version to that of the current.
- adapter = getPersistenceSession().getAdapterFor(typedOid);
+ adapter = getPersistenceSession().lookupAdapterFor(typedOid);
if(adapter != null) {
- getPersistenceSession().removeAdapter(adapter);
+ getPersistenceSession().removeAdapterFromCache(adapter);
}
// recreate an adapter for the original OID (with correct version)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/RootAndCollectionAdapters.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/RootAndCollectionAdapters.java
index 45bb4d0..5463820 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/RootAndCollectionAdapters.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/RootAndCollectionAdapters.java
@@ -99,7 +99,7 @@ class RootAndCollectionAdapters implements Iterable<ObjectAdapter> {
private void addCollectionAdapters(AdapterManager objectAdapterLookup) {
for (final OneToManyAssociation otma : parentAdapter.getSpecification().getCollections(Contributed.EXCLUDED)) {
final ParentedCollectionOid collectionOid = new ParentedCollectionOid((RootOid) rootAdapterOid, otma);
- final ObjectAdapter collectionAdapter = objectAdapterLookup.getAdapterFor(collectionOid);
+ final ObjectAdapter collectionAdapter = objectAdapterLookup.lookupAdapterFor(collectionOid);
if (collectionAdapter != null) {
// collection adapters are lazily created and so there may not be one.
addCollectionAdapter(otma, collectionAdapter);
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
index cadb550..afd9e0f 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
@@ -45,7 +45,7 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
@Override
public ObjectAdapter convertToObject(final String value, final Locale locale) {
final Oid oid = RootOid.deStringEncoded(value);
- return getPersistenceSession().getAdapterFor(oid);
+ return getPersistenceSession().lookupAdapterFor(oid);
}
/**
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
index 21cebae..48db82b 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
@@ -54,7 +54,7 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
return null;
}
final Oid oid = RootOid.deStringEncoded(value);
- final ObjectAdapter adapter = getPersistenceSession().getAdapterFor(oid);
+ final ObjectAdapter adapter = getPersistenceSession().lookupAdapterFor(oid);
return ObjectAdapterMemento.createOrNull(adapter);
}