This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push: new 1aed3f9 ARTEMIS-2526 - Update ActiveMQServerImpl to call correct beforeDestroyQueue hook new dacd0f3 This closes #2869 1aed3f9 is described below commit 1aed3f9dd6fa004c01c33cf21f6ba6071bb532ee Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> AuthorDate: Wed Oct 23 13:04:08 2019 -0400 ARTEMIS-2526 - Update ActiveMQServerImpl to call correct beforeDestroyQueue hook --- .../apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 2 +- .../artemis/core/server/plugin/ActiveMQServerQueuePlugin.java | 4 ++++ .../artemis/tests/integration/plugin/MethodCalledVerifier.java | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index 881b01e..c09792a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -2145,7 +2145,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { Queue queue = (Queue) binding.getBindable(); if (hasBrokerQueuePlugins()) { - callBrokerQueuePlugins(plugin -> plugin.beforeDestroyQueue(queueName, session, checkConsumerCount, removeConsumers, autoDeleteAddress)); + callBrokerQueuePlugins(plugin -> plugin.beforeDestroyQueue(queue, session, checkConsumerCount, removeConsumers, autoDeleteAddress)); } if (session != null) { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerQueuePlugin.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerQueuePlugin.java index edf0324..6c76472 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerQueuePlugin.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerQueuePlugin.java @@ -57,7 +57,10 @@ public interface ActiveMQServerQueuePlugin extends ActiveMQServerBasePlugin { * @param removeConsumers * @param autoDeleteAddress * @throws ActiveMQException + * + * @deprecated use {@link #beforeDestroyQueue(Queue, SecurityAuth, boolean, boolean, boolean)} */ + @Deprecated default void beforeDestroyQueue(SimpleString queueName, final SecurityAuth session, boolean checkConsumerCount, boolean removeConsumers, boolean autoDeleteAddress) throws ActiveMQException { @@ -75,6 +78,7 @@ public interface ActiveMQServerQueuePlugin extends ActiveMQServerBasePlugin { */ default void beforeDestroyQueue(Queue queue, final SecurityAuth session, boolean checkConsumerCount, boolean removeConsumers, boolean autoDeleteAddress) throws ActiveMQException { + //by default call the old method for backwards compatibility beforeDestroyQueue(queue.getName(), session, checkConsumerCount, removeConsumers, autoDeleteAddress); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MethodCalledVerifier.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MethodCalledVerifier.java index 0d802cf..e14adf1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MethodCalledVerifier.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/MethodCalledVerifier.java @@ -239,9 +239,9 @@ public class MethodCalledVerifier implements ActiveMQServerPlugin { } @Override - public void beforeDestroyQueue(SimpleString queueName, SecurityAuth session, boolean checkConsumerCount, + public void beforeDestroyQueue(Queue queue, SecurityAuth session, boolean checkConsumerCount, boolean removeConsumers, boolean autoDeleteAddress) { - Preconditions.checkNotNull(queueName); + Preconditions.checkNotNull(queue); methodCalled(BEFORE_DESTROY_QUEUE); }