From 5b6a8d2b5998a2eafd69c3cb4d45f79e4119327b Mon Sep 17 00:00:00 2001 From: Francesco Nigro Date: Wed, 25 Apr 2018 15:28:22 +0200 Subject: [PATCH] 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 --- .../core/server/plugin/ActiveMQServerPlugin.java | 2 +- .../plugin/impl/LoggingActiveMQServerPlugin.java | 11 +++-------- .../plugin/impl/NotificationActiveMQServerPlugin.java | 4 +++- 3 files changed, 7 insertions(+), 10 deletions(-) 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 db8a922b37..db66bfe772 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); } /** 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 140c3e1c2e..ff23b59cb5 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); } 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 abaa27f40e..29846aa0af 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) {