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:03:31 UTC
[26/50] [abbrv] isis git commit: ISIS-1194: moving methods from
DomainObjectServices to MessageBrokerService
ISIS-1194: moving methods from DomainObjectServices to MessageBrokerService
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4d355a3a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4d355a3a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4d355a3a
Branch: refs/heads/master
Commit: 4d355a3ab8d7dd71188e14a55ec6bf75b9929df9
Parents: d830713
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 14 08:58:02 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 08:58:02 2015 +0100
----------------------------------------------------------------------
.../runtimecontext/DomainObjectServices.java | 28 ----------------
.../runtimecontext/MessageBrokerService.java | 24 ++++++++++++++
.../MessageBrokerServiceAbstract.java | 2 +-
.../MessageBrokerServiceAware.java | 2 +-
.../noruntime/RuntimeContextNoRuntime.java | 35 ++++++++++----------
.../container/DomainObjectContainerDefault.java | 16 ++++++---
.../internal/RuntimeContextFromSession.java | 25 +++++++-------
.../system/persistence/PersistenceSession.java | 2 +-
8 files changed, 70 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4d355a3a/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 bef89de..9c307db 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
@@ -24,34 +24,6 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
public interface DomainObjectServices extends Injectable {
// //////////////////////////////////////////////////////////////////
- // info, warn, error messages
- // //////////////////////////////////////////////////////////////////
-
- /**
- * Provided by <tt>MessageBroker</tt> when used by framework.
- *
- * <p>
- * Called by <tt>DomainObjectContainerDefault</tt>.
- */
- void informUser(String message);
-
- /**
- * Provided by <tt>MessageBroker</tt> when used by framework.
- *
- * <p>
- * Called by <tt>DomainObjectContainerDefault</tt>.
- */
- void warnUser(String message);
-
- /**
- * Provided by <tt>MessageBroker</tt> when used by framework.
- *
- * <p>
- * Called by <tt>DomainObjectContainerDefault</tt>.
- */
- void raiseError(String message);
-
- // //////////////////////////////////////////////////////////////////
// properties
// //////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/4d355a3a/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
index 5e16540..0f20b95 100644
--- 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
@@ -20,5 +20,29 @@ import org.apache.isis.core.commons.components.Injectable;
public interface MessageBrokerService extends Injectable {
+ /**
+ * Provided by <tt>MessageBroker</tt> when used by framework.
+ *
+ * <p>
+ * Called by <tt>DomainObjectContainerDefault</tt>.
+ */
+ void informUser(String message);
+
+ /**
+ * Provided by <tt>MessageBroker</tt> when used by framework.
+ *
+ * <p>
+ * Called by <tt>DomainObjectContainerDefault</tt>.
+ */
+ void warnUser(String message);
+
+ /**
+ * Provided by <tt>MessageBroker</tt> when used by framework.
+ *
+ * <p>
+ * Called by <tt>DomainObjectContainerDefault</tt>.
+ */
+ void raiseError(String message);
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4d355a3a/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
index 39d8c3b..c6d4a22 100644
--- 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
@@ -22,7 +22,7 @@ public abstract class MessageBrokerServiceAbstract implements MessageBrokerServi
public void injectInto(final Object candidate) {
if (MessageBrokerServiceAware.class.isAssignableFrom(candidate.getClass())) {
final MessageBrokerServiceAware cast = MessageBrokerServiceAware.class.cast(candidate);
- cast.setQuerySubmitter(this);
+ cast.setMessageBrokerService(this);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4d355a3a/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
index 5b5551e..d1c9db0 100644
--- 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
@@ -21,6 +21,6 @@ package org.apache.isis.core.metamodel.runtimecontext;
public interface MessageBrokerServiceAware {
- public void setQuerySubmitter(final MessageBrokerService messageBrokerService);
+ public void setMessageBrokerService(final MessageBrokerService messageBrokerService);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4d355a3a/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 efa1c74..102f22a 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
@@ -61,7 +61,7 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
private final ObjectPersistorAbstract objectPersistor;
private final DomainObjectServicesAbstract domainObjectServices;
private final LocalizationProviderAbstract localizationProvider;
- private final MessageBrokerServiceAbstract querySubmitter;
+ private final MessageBrokerServiceAbstract messageBrokerService;
public RuntimeContextNoRuntime() {
this(DeploymentCategory.PRODUCTION);
@@ -228,40 +228,41 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
@Override
- public void informUser(final String message) {
+ public List<String> getPropertyNames() {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
-
+
@Override
- public void warnUser(final String message) {
+ public String getProperty(final String name) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
+ };
+ localizationProvider = new LocalizationProviderAbstract() {
+
+ private final Localization defaultLocalization = new LocalizationDefault();
@Override
- public void raiseError(final String message) {
- throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
+ public Localization getLocalization() {
+ return defaultLocalization;
}
+ };
+ messageBrokerService = new MessageBrokerServiceAbstract() {
@Override
- public List<String> getPropertyNames() {
+ public void informUser(final String message) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
@Override
- public String getProperty(final String name) {
+ public void warnUser(final String message) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
- };
- localizationProvider = new LocalizationProviderAbstract() {
-
- private final Localization defaultLocalization = new LocalizationDefault();
@Override
- public Localization getLocalization() {
- return defaultLocalization;
+ public void raiseError(final String message) {
+ throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
- };
- querySubmitter = new MessageBrokerServiceAbstract() {
+
};
}
@@ -314,7 +315,7 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
@Override
public MessageBrokerService getMessageBrokerService() {
- return querySubmitter;
+ return messageBrokerService;
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/4d355a3a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index e8d8205..926583a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -65,6 +65,8 @@ import org.apache.isis.core.metamodel.runtimecontext.DomainObjectServices;
import org.apache.isis.core.metamodel.runtimecontext.DomainObjectServicesAware;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationProvider;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationProviderAware;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerServiceAware;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistorAware;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
@@ -79,8 +81,9 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
public class DomainObjectContainerDefault
implements DomainObjectContainer, DomainObjectServicesAware,
ObjectPersistorAware, SpecificationLoaderAware, AuthenticationSessionProviderAware, AdapterManagerAware,
- ServicesInjectorAware,
+ ServicesInjectorAware, MessageBrokerServiceAware,
LocalizationProviderAware, ExceptionRecognizer {
+ private MessageBrokerService messageBrokerService;
//region > titleOf
@@ -349,6 +352,11 @@ public class DomainObjectContainerDefault
persist(object);
}
+ @Override
+ public void setMessageBrokerService(final MessageBrokerService messageBrokerService) {
+ this.messageBrokerService = messageBrokerService;
+ }
+
//endregion
//region > security
@@ -464,7 +472,7 @@ public class DomainObjectContainerDefault
@Programmatic
@Override
public void informUser(final String message) {
- getDomainObjectServices().informUser(message);
+ messageBrokerService.informUser(message);
}
@Override
@@ -475,7 +483,7 @@ public class DomainObjectContainerDefault
@Programmatic
@Override
public void warnUser(final String message) {
- getDomainObjectServices().warnUser(message);
+ messageBrokerService.warnUser(message);
}
@Override
@@ -486,7 +494,7 @@ public class DomainObjectContainerDefault
@Programmatic
@Override
public void raiseError(final String message) {
- getDomainObjectServices().raiseError(message);
+ messageBrokerService.raiseError(message);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/4d355a3a/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 8ca005f..ddcd30c 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
@@ -222,32 +222,33 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
this.domainObjectServices = new DomainObjectServicesAbstract() {
@Override
- public void informUser(final String message) {
- getMessageBroker().addMessage(message);
+ public String getProperty(final String name) {
+ return RuntimeContextFromSession.this.getProperty(name);
}
@Override
- public void warnUser(final String message) {
- getMessageBroker().addWarning(message);
+ public List<String> getPropertyNames() {
+ return RuntimeContextFromSession.this.getPropertyNames();
}
+ };
+ this.messageBrokerService = new MessageBrokerServiceAbstract() {
+
@Override
- public void raiseError(final String message) {
- throw new RecoverableException(message);
+ public void informUser(final String message) {
+ getMessageBroker().addMessage(message);
}
@Override
- public String getProperty(final String name) {
- return RuntimeContextFromSession.this.getProperty(name);
+ public void warnUser(final String message) {
+ getMessageBroker().addWarning(message);
}
@Override
- public List<String> getPropertyNames() {
- return RuntimeContextFromSession.this.getPropertyNames();
+ public void raiseError(final String message) {
+ throw new RecoverableException(message);
}
- };
- this.messageBrokerService = new MessageBrokerServiceAbstract() {
};
this.localizationProvider = new LocalizationProviderAbstract() {
http://git-wip-us.apache.org/repos/asf/isis/blob/4d355a3a/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 529c4a0..a0d46f0 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
@@ -367,7 +367,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
}
if (MessageBrokerServiceAware.class.isAssignableFrom(candidate.getClass())) {
final MessageBrokerServiceAware cast = MessageBrokerServiceAware.class.cast(candidate);
- cast.setQuerySubmitter(this);
+ cast.setMessageBrokerService(this);
}
if (ObjectPersistorAware.class.isAssignableFrom(candidate.getClass())) {
final ObjectPersistorAware cast = ObjectPersistorAware.class.cast(candidate);