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:27 UTC
[03/28] isis git commit: ISIS-1194: renaming QuerySubmitter interface
(currently empty) to MessageBrokerService
ISIS-1194: renaming QuerySubmitter interface (currently empty) to MessageBrokerService
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d830713f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d830713f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d830713f
Branch: refs/heads/ISIS-1194
Commit: d830713f604903190d69b33532650dd1f3eae83a
Parents: cf98021
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 14 08:55:09 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 08:55:09 2015 +0100
----------------------------------------------------------------------
.../runtimecontext/DomainObjectServices.java | 6 ++--
.../runtimecontext/MessageBrokerService.java | 24 ++++++++++++++++
.../MessageBrokerServiceAbstract.java | 29 ++++++++++++++++++++
.../MessageBrokerServiceAware.java | 26 ++++++++++++++++++
.../runtimecontext/QuerySubmitter.java | 24 ----------------
.../runtimecontext/QuerySubmitterAbstract.java | 29 --------------------
.../runtimecontext/QuerySubmitterAware.java | 26 ------------------
.../runtimecontext/RuntimeContext.java | 2 +-
.../runtimecontext/RuntimeContextAbstract.java | 2 +-
.../noruntime/RuntimeContextNoRuntime.java | 10 +++----
.../spec/feature/ObjectMemberDependencies.java | 12 ++++----
.../specloader/ObjectReflectorDefault.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 6 ++--
.../specimpl/ObjectMemberAbstract.java | 10 +++----
.../metamodel/app/IsisMetaModelTest_init.java | 8 +++---
.../internal/RuntimeContextFromSession.java | 12 ++++----
.../system/persistence/PersistenceSession.java | 10 +++----
.../runtime/system/ObjectActionImplTest.java | 6 ++--
.../system/OneToManyAssociationImplTest.java | 6 ++--
...WrapperFactoryDefaultTest_wrappedObject.java | 6 ++--
20 files changed, 128 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServices.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServices.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServices.java
index abee9be..bef89de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServices.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServices.java
@@ -29,7 +29,7 @@ public interface DomainObjectServices extends Injectable {
/**
* Provided by <tt>MessageBroker</tt> when used by framework.
- *
+ *
* <p>
* Called by <tt>DomainObjectContainerDefault</tt>.
*/
@@ -37,7 +37,7 @@ public interface DomainObjectServices extends Injectable {
/**
* Provided by <tt>MessageBroker</tt> when used by framework.
- *
+ *
* <p>
* Called by <tt>DomainObjectContainerDefault</tt>.
*/
@@ -45,7 +45,7 @@ public interface DomainObjectServices extends Injectable {
/**
* Provided by <tt>MessageBroker</tt> when used by framework.
- *
+ *
* <p>
* Called by <tt>DomainObjectContainerDefault</tt>.
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerService.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerService.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerService.java
new file mode 100644
index 0000000..5e16540
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerService.java
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.isis.core.metamodel.runtimecontext;
+
+import org.apache.isis.core.commons.components.Injectable;
+
+public interface MessageBrokerService extends Injectable {
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerServiceAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerServiceAbstract.java
new file mode 100644
index 0000000..39d8c3b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerServiceAbstract.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.isis.core.metamodel.runtimecontext;
+
+public abstract class MessageBrokerServiceAbstract implements MessageBrokerService {
+
+ @Override
+ public void injectInto(final Object candidate) {
+ if (MessageBrokerServiceAware.class.isAssignableFrom(candidate.getClass())) {
+ final MessageBrokerServiceAware cast = MessageBrokerServiceAware.class.cast(candidate);
+ cast.setQuerySubmitter(this);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerServiceAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerServiceAware.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerServiceAware.java
new file mode 100644
index 0000000..5b5551e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/MessageBrokerServiceAware.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.metamodel.runtimecontext;
+
+public interface MessageBrokerServiceAware {
+
+ public void setQuerySubmitter(final MessageBrokerService messageBrokerService);
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitter.java
deleted file mode 100644
index 5fa31be..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.isis.core.metamodel.runtimecontext;
-
-import org.apache.isis.core.commons.components.Injectable;
-
-public interface QuerySubmitter extends Injectable {
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAbstract.java
deleted file mode 100644
index 743ea5a..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAbstract.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.isis.core.metamodel.runtimecontext;
-
-public abstract class QuerySubmitterAbstract implements QuerySubmitter {
-
- @Override
- public void injectInto(final Object candidate) {
- if (QuerySubmitterAware.class.isAssignableFrom(candidate.getClass())) {
- final QuerySubmitterAware cast = QuerySubmitterAware.class.cast(candidate);
- cast.setQuerySubmitter(this);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAware.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAware.java
deleted file mode 100644
index df195ec..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/QuerySubmitterAware.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.runtimecontext;
-
-public interface QuerySubmitterAware {
-
- public void setQuerySubmitter(final QuerySubmitter querySubmitter);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
index ba2c8ac..45a19ba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
@@ -48,7 +48,7 @@ public interface RuntimeContext extends Injectable, ApplicationScopedComponent {
*/
public AuthenticationSessionProvider getAuthenticationSessionProvider();
- public QuerySubmitter getQuerySubmitter();
+ public MessageBrokerService getMessageBrokerService();
public AdapterManager getAdapterManager();
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
index a14195b..8fe5986 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
@@ -69,7 +69,7 @@ public abstract class RuntimeContextAbstract implements RuntimeContext, Specific
getDomainObjectServices().injectInto(candidate);
getLocalizationProvider().injectInto(candidate);
getObjectPersistor().injectInto(candidate);
- getQuerySubmitter().injectInto(candidate);
+ getMessageBrokerService().injectInto(candidate);
getSpecificationLoader().injectInto(candidate);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
index 9febe89..efa1c74 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
@@ -35,8 +35,8 @@ import org.apache.isis.core.metamodel.runtimecontext.LocalizationProviderAbstrac
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistorAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitterAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerServiceAbstract;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -61,7 +61,7 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
private final ObjectPersistorAbstract objectPersistor;
private final DomainObjectServicesAbstract domainObjectServices;
private final LocalizationProviderAbstract localizationProvider;
- private final QuerySubmitterAbstract querySubmitter;
+ private final MessageBrokerServiceAbstract querySubmitter;
public RuntimeContextNoRuntime() {
this(DeploymentCategory.PRODUCTION);
@@ -261,7 +261,7 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
return defaultLocalization;
}
};
- querySubmitter = new QuerySubmitterAbstract() {
+ querySubmitter = new MessageBrokerServiceAbstract() {
};
}
@@ -313,7 +313,7 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
}
@Override
- public QuerySubmitter getQuerySubmitter() {
+ public MessageBrokerService getMessageBrokerService() {
return querySubmitter;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/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 9720292..4e1c571 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
@@ -17,7 +17,7 @@
package org.apache.isis.core.metamodel.spec.feature;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -26,20 +26,20 @@ public class ObjectMemberDependencies {
private final SpecificationLoader specificationLoader;
private final AdapterManager adapterManager;
- private final QuerySubmitter querySubmitter;
+ private final MessageBrokerService messageBrokerService;
private final ServicesInjector servicesInjector;
private final ObjectPersistor objectPersistor;
public ObjectMemberDependencies(
final SpecificationLoader specificationLoader,
final AdapterManager adapterManager,
- final QuerySubmitter querySubmitter,
+ final MessageBrokerService messageBrokerService,
final ServicesInjector servicesInjector,
final ObjectPersistor objectPersistor) {
this.specificationLoader = specificationLoader;
this.adapterManager = adapterManager;
- this.querySubmitter = querySubmitter;
+ this.messageBrokerService = messageBrokerService;
this.servicesInjector = servicesInjector;
this.objectPersistor = objectPersistor;
@@ -57,8 +57,8 @@ public class ObjectMemberDependencies {
return servicesInjector;
}
- public QuerySubmitter getQuerySubmitter() {
- return querySubmitter;
+ public MessageBrokerService getMessageBrokerService() {
+ return messageBrokerService;
}
public ObjectPersistor getObjectPersistor() {
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/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 db1bd40..b17c34c 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, adapterManager);
final ObjectMemberDependencies objectMemberDependencies = new ObjectMemberDependencies(
- specificationLookup, adapterManager, getRuntimeContext().getQuerySubmitter(), servicesInjector,
+ specificationLookup, adapterManager, getRuntimeContext().getMessageBrokerService(), servicesInjector,
getRuntimeContext().getObjectPersistor());
// ... and create the specs
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/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 4b01191..f84c55c 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,7 @@ 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.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
+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,8 +517,8 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return parentAction.getAdapterManager();
}
- protected QuerySubmitter getQuerySubmitter() {
- return parentAction.getQuerySubmitter();
+ protected MessageBrokerService getQuerySubmitter() {
+ return parentAction.getMessageBrokerService();
}
protected ObjectPersistor getObjectPersistor() {
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/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 69005d1..cc92d88 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
@@ -28,7 +28,7 @@ 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.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
+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;
@@ -72,7 +72,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
private final SpecificationLoader specificationLookup;
private final AdapterManager adapterManager;
private final ServicesInjector servicesInjector;
- private final QuerySubmitter querySubmitter;
+ private final MessageBrokerService messageBrokerService;
protected ObjectMemberAbstract(
final FacetedMethod facetedMethod,
@@ -90,7 +90,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
this.specificationLookup = objectMemberDependencies.getSpecificationLoader();
this.adapterManager = objectMemberDependencies.getAdapterManager();
this.servicesInjector = objectMemberDependencies.getServicesInjector();
- this.querySubmitter = objectMemberDependencies.getQuerySubmitter();
+ this.messageBrokerService = objectMemberDependencies.getMessageBrokerService();
this.objectPersistor = objectMemberDependencies.getObjectPersistor();
}
@@ -347,8 +347,8 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return servicesInjector;
}
- public QuerySubmitter getQuerySubmitter() {
- return querySubmitter;
+ public MessageBrokerService getMessageBrokerService() {
+ return messageBrokerService;
}
public ObjectPersistor getObjectPersistor() {
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
index cb136c0..190982d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProviderAbstract;
@@ -62,7 +62,7 @@ public class IsisMetaModelTest_init {
@Mock
private AdapterManager mockAdapterManager;
@Mock
- private QuerySubmitter mockQuerySubmitter;
+ private MessageBrokerService mockMessageBrokerService;
@Mock
private ServicesInjector mockDependencyInjector;
@Mock
@@ -94,8 +94,8 @@ public class IsisMetaModelTest_init {
allowing(mockRuntimeContext).getAdapterManager();
will(returnValue(mockAdapterManager));
- allowing(mockRuntimeContext).getQuerySubmitter();
- will(returnValue(mockQuerySubmitter));
+ allowing(mockRuntimeContext).getMessageBrokerService();
+ will(returnValue(mockMessageBrokerService));
allowing(mockRuntimeContext).getServicesInjector();
will(returnValue(mockDependencyInjector));
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index e34fcde..8ca005f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.runtimecontext.LocalizationProviderAbstrac
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistorAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitterAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerServiceAbstract;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -71,7 +71,7 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
private final AuthenticationSessionProvider authenticationSessionProvider;
private final AdapterManager adapterManager;
private final ObjectPersistor objectPersistor;
- private final QuerySubmitter querySubmitter;
+ private final MessageBrokerService messageBrokerService;
private final DomainObjectServices domainObjectServices;
private final LocalizationProviderAbstract localizationProvider;
@@ -247,7 +247,7 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
}
};
- this.querySubmitter = new QuerySubmitterAbstract() {
+ this.messageBrokerService = new MessageBrokerServiceAbstract() {
};
this.localizationProvider = new LocalizationProviderAbstract() {
@@ -306,8 +306,8 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
}
@Override
- public QuerySubmitter getQuerySubmitter() {
- return querySubmitter;
+ public MessageBrokerService getMessageBrokerService() {
+ return messageBrokerService;
}
// ///////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/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 2ee67ab..529c4a0 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
@@ -55,8 +55,8 @@ import org.apache.isis.core.metamodel.runtimecontext.DomainObjectServicesAware;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistorAware;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitterAware;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerServiceAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -121,7 +121,7 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
public class PersistenceSession implements TransactionalResource, SessionScopedComponent, DebuggableWithTitle, AdapterManager,
- QuerySubmitter, ObjectPersistor, DomainObjectServices {
+ MessageBrokerService, ObjectPersistor, DomainObjectServices {
private static final Logger LOG = LoggerFactory.getLogger(PersistenceSession.class);
@@ -365,8 +365,8 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
final AdapterManagerAware cast = AdapterManagerAware.class.cast(candidate);
cast.setAdapterManager(this);
}
- if (QuerySubmitterAware.class.isAssignableFrom(candidate.getClass())) {
- final QuerySubmitterAware cast = QuerySubmitterAware.class.cast(candidate);
+ if (MessageBrokerServiceAware.class.isAssignableFrom(candidate.getClass())) {
+ final MessageBrokerServiceAware cast = MessageBrokerServiceAware.class.cast(candidate);
cast.setQuerySubmitter(this);
}
if (ObjectPersistorAware.class.isAssignableFrom(candidate.getClass())) {
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/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 4ec982f..0010d2b 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
@@ -28,7 +28,7 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
@@ -65,7 +65,7 @@ public class ObjectActionImplTest {
@Mock
private ServicesInjector mockServicesInjector;
@Mock
- private QuerySubmitter mockQuerySubmitter;
+ private MessageBrokerService mockMessageBrokerService;
@Mock
private ObjectPersistor mockObjectPersistor;
@@ -80,7 +80,7 @@ public class ObjectActionImplTest {
});
action = new ObjectActionImpl(mockFacetedMethod, new ObjectMemberDependencies(
- mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter, mockServicesInjector, mockObjectPersistor));
+ mockSpecificationLookup, mockAdapterManager, mockMessageBrokerService, mockServicesInjector, mockObjectPersistor));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/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 b909509..0176415 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
@@ -29,7 +29,7 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
@@ -75,7 +75,7 @@ public class OneToManyAssociationImplTest {
@Mock
private AdapterManager mockAdapterManager;
@Mock
- private QuerySubmitter mockQuerySubmitter;
+ private MessageBrokerService mockMessageBrokerService;
@Mock
private ObjectPersistor mockObjectPersistor;
@Mock
@@ -95,7 +95,7 @@ public class OneToManyAssociationImplTest {
allowingPeerToReturnIdentifier();
allowingSpecLoaderToReturnSpecs();
association = new OneToManyAssociationImpl(mockPeer, new ObjectMemberDependencies(
- mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter, mockServicesInjector, mockObjectPersistor));
+ mockSpecificationLookup, mockAdapterManager, mockMessageBrokerService, mockServicesInjector, mockObjectPersistor));
}
private void allowingSpecLoaderToReturnSpecs() {
http://git-wip-us.apache.org/repos/asf/isis/blob/d830713f/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 bd0ace6..8a8f0a1 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
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
@@ -83,7 +83,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
@Mock
private ObjectPersistor mockObjectPersistor;
@Mock
- private QuerySubmitter mockQuerySubmitter;
+ private MessageBrokerService mockMessageBrokerService;
@Mock
private ServicesInjector mockServicesInjector;
@Mock
@@ -124,7 +124,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
public void setUp() {
objectMemberDependencies = new ObjectMemberDependencies(
- mockSpecificationLoader, mockAdapterManager, mockQuerySubmitter, mockServicesInjector, mockObjectPersistor);
+ mockSpecificationLoader, mockAdapterManager, mockMessageBrokerService, mockServicesInjector, mockObjectPersistor);
employeeRepository = new EmployeeRepositoryImpl();