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
apache · Apr 26, 2018 · 5b6a8d2 · 5b6a8d2
1 parent e7f2dd3
commit 5b6a8d2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/...er/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerPlugin.java b/...er/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerPlugin.java
@@ -566,7 +566,7 @@ default void messageExpired(MessageReference message, SimpleString messageExpiry
     * @throws ActiveMQException
     */
    default void messageExpired(MessageReference message, SimpleString messageExpiryAddress, ServerConsumer consumer) throws ActiveMQException {
-
+      messageExpired(message, messageExpiryAddress);
    }
 
    /**

diff --git a/...java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java b/...java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
@@ -595,15 +595,10 @@ public void afterDeliver(ServerConsumer consumer, MessageReference reference) th
       }
    }
 
-   /**
-    * 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/...org/apache/activemq/artemis/core/server/plugin/impl/NotificationActiveMQServerPlugin.java b/...org/apache/activemq/artemis/core/server/plugin/impl/NotificationActiveMQServerPlugin.java
@@ -139,7 +139,9 @@ public void afterDeliver(ServerConsumer consumer, MessageReference reference) th
    }
 
    @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) {