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/15 08:02:49 UTC
[25/28] isis git commit: ISIS-1194: remove AdapterManager from
ObjectMemberDependencies context class, use PersistenceSessionService instead.
ISIS-1194: remove AdapterManager from ObjectMemberDependencies context class, use PersistenceSessionService instead.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/eeacac60
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/eeacac60
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/eeacac60
Branch: refs/heads/ISIS-1194
Commit: eeacac6064c842a63530cc0ec745ebaa38442301
Parents: 5293291
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 14 23:17:55 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 23:17:55 2015 +0100
----------------------------------------------------------------------
.../spec/feature/ObjectMemberDependencies.java | 8 --------
.../specloader/ObjectReflectorDefault.java | 20 +++++++++-----------
.../specimpl/ObjectActionContributee.java | 2 +-
.../specloader/specimpl/ObjectActionImpl.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 2 +-
.../specimpl/ObjectMemberAbstract.java | 6 ------
.../OneToManyAssociationContributee.java | 2 +-
.../specimpl/OneToManyAssociationImpl.java | 2 +-
.../OneToOneAssociationContributee.java | 2 +-
.../specimpl/OneToOneAssociationImpl.java | 6 +++---
.../specimpl/ObjectAssociationAbstractTest.java | 2 +-
...ectAssociationAbstractTest_alwaysHidden.java | 2 +-
.../runtime/system/ObjectActionImplTest.java | 2 +-
.../system/ObjectMemberAbstractTest.java | 2 +-
.../system/OneToManyAssociationImplTest.java | 2 +-
...WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
16 files changed, 24 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
index 37169ba..f0b9f94 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
@@ -16,7 +16,6 @@
*/
package org.apache.isis.core.metamodel.spec.feature;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -24,18 +23,15 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoader;
public class ObjectMemberDependencies {
private final SpecificationLoader specificationLoader;
- private final AdapterManager adapterManager;
private final ServicesInjector servicesInjector;
private final PersistenceSessionService persistenceSessionService;
public ObjectMemberDependencies(
final SpecificationLoader specificationLoader,
- final AdapterManager adapterManager,
final ServicesInjector servicesInjector,
final PersistenceSessionService persistenceSessionService) {
this.specificationLoader = specificationLoader;
- this.adapterManager = adapterManager;
this.servicesInjector = servicesInjector;
this.persistenceSessionService = persistenceSessionService;
@@ -45,10 +41,6 @@ public class ObjectMemberDependencies {
return specificationLoader;
}
- public AdapterManager getAdapterManager() {
- return adapterManager;
- }
-
public ServicesInjector getServicesInjector() {
return servicesInjector;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
index 5eed129..ed13d49 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
@@ -41,7 +41,6 @@ import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
@@ -50,6 +49,7 @@ import org.apache.isis.core.metamodel.facets.object.choices.ChoicesFacetUtils;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
+import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
@@ -61,7 +61,6 @@ import org.apache.isis.core.metamodel.spec.InjectorMethodEvaluator;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationDependencies;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpiAware;
@@ -445,27 +444,26 @@ public final class ObjectReflectorDefault implements SpecificationLoaderSpi, App
*/
private ObjectSpecification createSpecification(final Class<?> cls) {
- final SpecificationLoader specificationLookup = getRuntimeContext().getSpecificationLoader();
final ServicesInjector servicesInjector = getRuntimeContext().getServicesInjector();
- final AdapterManager adapterManager = getRuntimeContext().getAdapterManager();
+ final PersistenceSessionService persistenceSessionService =
+ getRuntimeContext().getPersistenceSessionService();
final ObjectSpecificationDependencies specContext =
new ObjectSpecificationDependencies(
- getDeploymentCategory(), servicesInjector, specificationLookup,
- facetProcessor);
+ getDeploymentCategory(), servicesInjector, this, facetProcessor);
- final ObjectMemberDependencies objectMemberDependencies = new ObjectMemberDependencies(
- specificationLookup, adapterManager, servicesInjector,
- getRuntimeContext().getPersistenceSessionService());
+ final ObjectMemberDependencies objectMemberDependencies =
+ new ObjectMemberDependencies(
+ this, servicesInjector,
+ persistenceSessionService);
// ... and create the specs
if (FreeStandingList.class.isAssignableFrom(cls)) {
return new ObjectSpecificationOnStandaloneList(specContext, objectMemberDependencies);
} else {
- final SpecificationLoaderSpi specificationLoader = this;
final FacetedMethodsBuilderContext facetedMethodsBuilderContext =
new FacetedMethodsBuilderContext(
- specificationLoader, facetProcessor, layoutMetadataReaders);
+ this, facetProcessor, layoutMetadataReaders);
return new ObjectSpecificationDefault(cls, facetedMethodsBuilderContext, specContext,
objectMemberDependencies);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 36f19e2..176a918 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -333,6 +333,6 @@ public class ObjectActionContributee extends ObjectActionImpl implements Contrib
}
public ObjectAdapter getServiceAdapter() {
- return getAdapterManager().adapterFor(servicePojo);
+ return getPersistenceSessionService().adapterFor(servicePojo);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
index 098584f..4d6ac09 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
@@ -444,7 +444,7 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
}
private ObjectAdapter adapterFor(final Object pojo) {
- return pojo == null ? null : getAdapterManager().adapterFor(pojo);
+ return pojo == null ? null : getPersistenceSessionService().adapterFor(pojo);
}
// /////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index e3bd95e..f43090b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -513,7 +513,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
}
protected AdapterManager getAdapterMap() {
- return parentAction.getAdapterManager();
+ return parentAction.getPersistenceSessionService();
}
protected PersistenceSessionService getObjectPersistor() {
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index dd85200..30e3e4e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -69,7 +69,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
private final FacetedMethod facetedMethod;
private final FeatureType featureType;
private final SpecificationLoader specificationLookup;
- private final AdapterManager adapterManager;
private final ServicesInjector servicesInjector;
protected ObjectMemberAbstract(
@@ -86,7 +85,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
this.defaultName = StringExtensions.asNaturalName2(this.id);
this.specificationLookup = objectMemberDependencies.getSpecificationLoader();
- this.adapterManager = objectMemberDependencies.getAdapterManager();
this.servicesInjector = objectMemberDependencies.getServicesInjector();
this.persistenceSessionService = objectMemberDependencies.getPersistenceSessionService();
}
@@ -336,10 +334,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return specificationLookup;
}
- public AdapterManager getAdapterManager() {
- return adapterManager;
- }
-
public ServicesInjector getServicesInjector() {
return servicesInjector;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 6906338..7084926 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -212,6 +212,6 @@ public class OneToManyAssociationContributee extends OneToManyAssociationImpl im
}
public ObjectAdapter getServiceAdapter() {
- return getAdapterManager().adapterFor(servicePojo);
+ return getPersistenceSessionService().adapterFor(servicePojo);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
index c96eff2..093523d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
@@ -171,7 +171,7 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
if (collection == null) {
return null;
}
- return getAdapterManager().adapterFor(collection, ownerAdapter, this);
+ return getPersistenceSessionService().adapterFor(collection, ownerAdapter, this);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
index b57b7f1..43b042f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
@@ -196,6 +196,6 @@ public class OneToOneAssociationContributee extends OneToOneAssociationImpl impl
}
private ObjectAdapter getServiceAdapter() {
- return getAdapterManager().adapterFor(servicePojo);
+ return getPersistenceSessionService().adapterFor(servicePojo);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
index b4deee8..362bee7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
@@ -148,7 +148,7 @@ public class OneToOneAssociationImpl extends ObjectAssociationAbstract implement
return null;
}
- return getAdapterManager().adapterFor(referencedPojo);
+ return getPersistenceSessionService().adapterFor(referencedPojo);
}
// UNUSED
@@ -282,7 +282,7 @@ public class OneToOneAssociationImpl extends ObjectAssociationAbstract implement
getSpecificationLoader(),
interactionInitiatedBy);
List<ObjectAdapter> adapters = Lists.transform(
- Lists.newArrayList(pojoOptions), ObjectAdapter.Functions.adapterForUsing(getAdapterManager()));
+ Lists.newArrayList(pojoOptions), ObjectAdapter.Functions.adapterForUsing(getPersistenceSessionService()));
return adapters.toArray(new ObjectAdapter[]{});
}
@@ -304,7 +304,7 @@ public class OneToOneAssociationImpl extends ObjectAssociationAbstract implement
if (pojoOptions != null) {
final ObjectAdapter[] options = new ObjectAdapter[pojoOptions.length];
for (int i = 0; i < options.length; i++) {
- options[i] = getAdapterManager().adapterFor(pojoOptions[i]);
+ options[i] = getPersistenceSessionService().adapterFor(pojoOptions[i]);
}
return options;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index c3ceeee..80894f4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -72,7 +72,7 @@ public class ObjectAssociationAbstractTest {
facetedMethod = FacetedMethod.createForProperty(Customer.class, "firstName");
objectAssociation = new ObjectAssociationAbstract(facetedMethod, FeatureType.PROPERTY, objectSpecification, new ObjectMemberDependencies(
- null, null, null, null)) {
+ null, null, null)) {
@Override
public ObjectAdapter get(
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index a979e46..ee765cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -67,7 +67,7 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
objectAssociation = new ObjectAssociationAbstract(
facetedMethod, FeatureType.PROPERTY, mockObjectSpecification,
- new ObjectMemberDependencies(null, null, null, null)) {
+ new ObjectMemberDependencies(null, null, null)) {
@Override
public ObjectAdapter get(
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
index d67b451..307ff00 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
@@ -80,7 +80,7 @@ public class ObjectActionImplTest {
});
action = new ObjectActionImpl(mockFacetedMethod, new ObjectMemberDependencies(
- mockSpecificationLookup, mockAdapterManager, mockServicesInjector,
+ mockSpecificationLookup, mockServicesInjector,
mockPersistenceSessionService));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 1f40ec6..0f8b0f9 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -272,7 +272,7 @@ class ObjectMemberAbstractImpl extends ObjectMemberAbstract {
protected ObjectMemberAbstractImpl(final String id) {
super(FacetedMethod.createForProperty(Customer.class, "firstName"), FeatureType.PROPERTY, new ObjectMemberDependencies(
- null, null, null, null));
+ null, null, null));
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
index 271dc41..c4f082f 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
@@ -95,7 +95,7 @@ public class OneToManyAssociationImplTest {
allowingPeerToReturnIdentifier();
allowingSpecLoaderToReturnSpecs();
association = new OneToManyAssociationImpl(mockPeer, new ObjectMemberDependencies(
- mockSpecificationLookup, mockAdapterManager, mockServicesInjector,
+ mockSpecificationLookup, mockServicesInjector,
mockPersistenceSessionService));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eeacac60/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index a1fc547..3bfd512 100644
--- a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -124,7 +124,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
public void setUp() {
objectMemberDependencies = new ObjectMemberDependencies(
- mockSpecificationLoader, mockAdapterManager, mockServicesInjector,
+ mockSpecificationLoader, mockServicesInjector,
mockPersistenceSessionService);
employeeRepository = new EmployeeRepositoryImpl();