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 1d8e9f7 ARTEMIS-2724 The setting auto-delete-created-queues doesn't
work
new 62ddba6 This closes #3093
1d8e9f7 is described below
commit 1d8e9f7fff9b590d974b1bccb5fe95320a32c022
Author: brusdev <[email protected]>
AuthorDate: Sun Apr 19 00:54:45 2020 +0200
ARTEMIS-2724 The setting auto-delete-created-queues doesn't work
Set the default auto-delete for created queues.
---
.../core/server/impl/QueueConfigurationUtils.java | 4 +-
.../client/AutoDeleteCreatedQueueTest.java | 62 ++++++++++++++++++++++
2 files changed, 64 insertions(+), 2 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueConfigurationUtils.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueConfigurationUtils.java
index c4d9cb0..da4faa3 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueConfigurationUtils.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueConfigurationUtils.java
@@ -38,8 +38,8 @@ public class QueueConfigurationUtils {
config.setPurgeOnNoConsumers(config.isPurgeOnNoConsumers() == null ?
as.isDefaultPurgeOnNoConsumers() : config.isPurgeOnNoConsumers());
config.setAutoCreateAddress(config.isAutoCreateAddress() == null ?
as.isAutoCreateAddresses() : config.isAutoCreateAddress());
- // only set the default auto-delete on auto-created queues
- config.setAutoDelete(config.isAutoDelete() == null ?
config.isAutoCreated() && as.isAutoDeleteQueues() : config.isAutoDelete());
+ // set the default auto-delete
+ config.setAutoDelete(config.isAutoDelete() == null ?
(config.isAutoCreated() && as.isAutoDeleteQueues()) || (!config.isAutoCreated()
&& as.isAutoDeleteCreatedQueues()) : config.isAutoDelete());
config.setAutoDeleteDelay(config.getAutoDeleteDelay() == null ?
as.getAutoDeleteQueuesDelay() : config.getAutoDeleteDelay());
config.setAutoDeleteMessageCount(config.getAutoDeleteMessageCount() ==
null ? as.getAutoDeleteQueuesMessageCount() :
config.getAutoDeleteMessageCount());
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteCreatedQueueTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteCreatedQueueTest.java
new file mode 100644
index 0000000..8898f6d
--- /dev/null
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteCreatedQueueTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.client;
+
+import org.apache.activemq.artemis.api.core.QueueConfiguration;
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.tests.util.Wait;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AutoDeleteCreatedQueueTest extends ActiveMQTestBase {
+
+ public final SimpleString addressA = new SimpleString("addressA");
+ public final SimpleString queueA = new SimpleString("queueA");
+
+ private ServerLocator locator;
+ private ActiveMQServer server;
+ private ClientSessionFactory cf;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ locator = createInVMNonHALocator();
+ server = createServer(false);
+ server.getConfiguration().setAddressQueueScanPeriod(500);
+ server.getConfiguration().setMessageExpiryScanPeriod(500);
+
+ server.start();
+ cf = createSessionFactory(locator);
+ }
+
+ @Test
+ public void testAutoDeleteCreatedQueueOnLastConsumerClose() throws
Exception {
+ server.getAddressSettingsRepository().addMatch(addressA.toString(), new
AddressSettings().setAutoDeleteCreatedQueues(true));
+ server.createQueue(new
QueueConfiguration(queueA).setAddress(addressA).setRoutingType(RoutingType.ANYCAST).setAutoCreated(false));
+ assertNotNull(server.locateQueue(queueA));
+ assertTrue(server.locateQueue(queueA).isAutoDelete());
+ cf.createSession().createConsumer(queueA).close();
+ Wait.assertTrue(() -> server.locateQueue(queueA) == null);
+ }
+}
