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:32 UTC
[08/28] isis git commit: ISIS-1194: removing MessageBrokerService
from ObjectMemberDependencies
ISIS-1194: removing MessageBrokerService from ObjectMemberDependencies
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/11cd0017
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/11cd0017
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/11cd0017
Branch: refs/heads/ISIS-1194
Commit: 11cd0017f94e4dc9fe76bf510195a8a2bdddd6f1
Parents: b8fb174
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 14 10:06:08 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 10:06:08 2015 +0100
----------------------------------------------------------------------
.../metamodel/spec/feature/ObjectMemberDependencies.java | 10 +---------
.../core/metamodel/specloader/ObjectReflectorDefault.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 5 -----
.../specloader/specimpl/ObjectMemberAbstract.java | 9 +--------
.../specimpl/ObjectAssociationAbstractTest.java | 2 +-
.../ObjectAssociationAbstractTest_alwaysHidden.java | 2 +-
.../isis/core/runtime/system/ObjectActionImplTest.java | 2 +-
.../core/runtime/system/ObjectMemberAbstractTest.java | 2 +-
.../core/runtime/system/OneToManyAssociationImplTest.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
10 files changed, 9 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 420b31d..37169ba 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,9 +16,8 @@
*/
package org.apache.isis.core.metamodel.spec.feature;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
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;
@@ -26,20 +25,17 @@ public class ObjectMemberDependencies {
private final SpecificationLoader specificationLoader;
private final AdapterManager adapterManager;
- private final MessageBrokerService messageBrokerService;
private final ServicesInjector servicesInjector;
private final PersistenceSessionService persistenceSessionService;
public ObjectMemberDependencies(
final SpecificationLoader specificationLoader,
final AdapterManager adapterManager,
- final MessageBrokerService messageBrokerService,
final ServicesInjector servicesInjector,
final PersistenceSessionService persistenceSessionService) {
this.specificationLoader = specificationLoader;
this.adapterManager = adapterManager;
- this.messageBrokerService = messageBrokerService;
this.servicesInjector = servicesInjector;
this.persistenceSessionService = persistenceSessionService;
@@ -57,10 +53,6 @@ public class ObjectMemberDependencies {
return servicesInjector;
}
- public MessageBrokerService getMessageBrokerService() {
- return messageBrokerService;
- }
-
public PersistenceSessionService getPersistenceSessionService() {
return persistenceSessionService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 7c2e3f5..357aff3 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
@@ -455,7 +455,7 @@ public final class ObjectReflectorDefault implements SpecificationLoaderSpi, App
facetProcessor);
final ObjectMemberDependencies objectMemberDependencies = new ObjectMemberDependencies(
- specificationLookup, adapterManager, getRuntimeContext().getMessageBrokerService(), servicesInjector,
+ specificationLookup, adapterManager, servicesInjector,
getRuntimeContext().getPersistenceSessionService());
// ... and create the specs
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 89da167..e3bd95e 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
@@ -52,7 +52,6 @@ import org.apache.isis.core.metamodel.interactions.ActionArgumentContext;
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.spec.DomainModelException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -517,10 +516,6 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return parentAction.getAdapterManager();
}
- protected MessageBrokerService getQuerySubmitter() {
- return parentAction.getMessageBrokerService();
- }
-
protected PersistenceSessionService getObjectPersistor() {
return parentAction.getPersistenceSessionService();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 d12f138..dd85200 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
@@ -27,8 +27,6 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -48,6 +46,7 @@ import org.apache.isis.core.metamodel.interactions.InteractionContext;
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -72,7 +71,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
private final SpecificationLoader specificationLookup;
private final AdapterManager adapterManager;
private final ServicesInjector servicesInjector;
- private final MessageBrokerService messageBrokerService;
protected ObjectMemberAbstract(
final FacetedMethod facetedMethod,
@@ -90,7 +88,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
this.specificationLookup = objectMemberDependencies.getSpecificationLoader();
this.adapterManager = objectMemberDependencies.getAdapterManager();
this.servicesInjector = objectMemberDependencies.getServicesInjector();
- this.messageBrokerService = objectMemberDependencies.getMessageBrokerService();
this.persistenceSessionService = objectMemberDependencies.getPersistenceSessionService();
}
@@ -347,10 +344,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return servicesInjector;
}
- public MessageBrokerService getMessageBrokerService() {
- return messageBrokerService;
- }
-
public PersistenceSessionService getPersistenceSessionService() {
return persistenceSessionService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 026e83b..c3ceeee 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, null, null)) {
@Override
public ObjectAdapter get(
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 11e30b1..a979e46 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, null)) {
+ new ObjectMemberDependencies(null, null, null, null)) {
@Override
public ObjectAdapter get(
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 4d00b29..d67b451 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, mockMessageBrokerService, mockServicesInjector,
+ mockSpecificationLookup, mockAdapterManager, mockServicesInjector,
mockPersistenceSessionService));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 7f565ab..1f40ec6 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, null, null));
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 b9a6af2..271dc41 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, mockMessageBrokerService, mockServicesInjector,
+ mockSpecificationLookup, mockAdapterManager, mockServicesInjector,
mockPersistenceSessionService));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/11cd0017/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 2ab0bcc..a1fc547 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, mockMessageBrokerService, mockServicesInjector,
+ mockSpecificationLoader, mockAdapterManager, mockServicesInjector,
mockPersistenceSessionService);
employeeRepository = new EmployeeRepositoryImpl();