You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/04/26 13:39:05 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1829 Remove deprecated
plugin's messageExpired implementations
Repository: activemq-artemis
Updated Branches:
refs/heads/master e7f2dd39a -> 27c0017dd
ARTEMIS-1829 Remove deprecated plugin's messageExpired implementations
NotificationActiveMQServerPlugin and LoggingActiveMQServerPlugin are
implementing the deprecated version of
ActiveMQServerPlugin::messageExpired that is not called by the
new version of the method or any other part of the code
This fixing test org.apache.activemq.artemis.tests.integration.management.NotificationTest#testMessageExpired
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5b6a8d2b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5b6a8d2b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5b6a8d2b
Branch: refs/heads/master
Commit: 5b6a8d2b5998a2eafd69c3cb4d45f79e4119327b
Parents: e7f2dd3
Author: Francesco Nigro <ni...@gmail.com>
Authored: Wed Apr 25 15:28:22 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Apr 26 09:38:19 2018 -0400
----------------------------------------------------------------------
.../artemis/core/server/plugin/ActiveMQServerPlugin.java | 2 +-
.../server/plugin/impl/LoggingActiveMQServerPlugin.java | 11 +++--------
.../plugin/impl/NotificationActiveMQServerPlugin.java | 4 +++-
3 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5b6a8d2b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerPlugin.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerPlugin.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerPlugin.java
index db8a922..db66bfe 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerPlugin.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerPlugin.java
@@ -566,7 +566,7 @@ public interface ActiveMQServerPlugin {
* @throws ActiveMQException
*/
default void messageExpired(MessageReference message, SimpleString messageExpiryAddress, ServerConsumer consumer) throws ActiveMQException {
-
+ messageExpired(message, messageExpiryAddress);
}
/**
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5b6a8d2b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
index 140c3e1..ff23b59 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
@@ -595,15 +595,10 @@ public class LoggingActiveMQServerPlugin implements ActiveMQServerPlugin, Serial
}
}
- /**
- * A message has been expired
- *
- * @param message The expired message
- * @param messageExpiryAddress The message expiry address if exists
- * @throws ActiveMQException
- */
@Override
- public void messageExpired(MessageReference message, SimpleString messageExpiryAddress) throws ActiveMQException {
+ public void messageExpired(MessageReference message,
+ SimpleString messageExpiryAddress,
+ ServerConsumer consumer) {
if (logAll || logInternalEvents) {
LoggingActiveMQServerPluginLogger.LOGGER.messageExpired(message, messageExpiryAddress);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5b6a8d2b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/NotificationActiveMQServerPlugin.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/NotificationActiveMQServerPlugin.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/NotificationActiveMQServerPlugin.java
index abaa27f..29846aa 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/NotificationActiveMQServerPlugin.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/NotificationActiveMQServerPlugin.java
@@ -139,7 +139,9 @@ public class NotificationActiveMQServerPlugin implements ActiveMQServerPlugin {
}
@Override
- public void messageExpired(MessageReference message, SimpleString messageExpiryAddress) throws ActiveMQException {
+ public void messageExpired(MessageReference message,
+ SimpleString messageExpiryAddress,
+ ServerConsumer consumer) {
final ManagementService managementService = getManagementService();
if (managementService != null && sendExpiredNotifications) {
[2/2] activemq-artemis git commit: This closes #2044
Posted by cl...@apache.org.
This closes #2044
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/27c0017d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/27c0017d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/27c0017d
Branch: refs/heads/master
Commit: 27c0017dd95531f346eb7f6a86e606767b27b93a
Parents: e7f2dd3 5b6a8d2
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Apr 26 09:38:58 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Apr 26 09:38:58 2018 -0400
----------------------------------------------------------------------
.../artemis/core/server/plugin/ActiveMQServerPlugin.java | 2 +-
.../server/plugin/impl/LoggingActiveMQServerPlugin.java | 11 +++--------
.../plugin/impl/NotificationActiveMQServerPlugin.java | 4 +++-
3 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------