Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7D2CF200BFF for ; Tue, 17 Jan 2017 20:27:44 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7BE82160B30; Tue, 17 Jan 2017 19:27:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 37FF3160B55 for ; Tue, 17 Jan 2017 20:27:42 +0100 (CET) Received: (qmail 95715 invoked by uid 500); 17 Jan 2017 19:27:41 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 95643 invoked by uid 99); 17 Jan 2017 19:27:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jan 2017 19:27:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08AFFDFBDC; Tue, 17 Jan 2017 19:27:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Tue, 17 Jan 2017 19:27:42 -0000 Message-Id: <36bde977ae964943b9a43b6048034cc8@git.apache.org> In-Reply-To: <54aab00f3b364564a2d117f3dcecafb8@git.apache.org> References: <54aab00f3b364564a2d117f3dcecafb8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] activemq-artemis git commit: ARTEMIS-922 Rename deleteOnNoConsumers throughout archived-at: Tue, 17 Jan 2017 19:27:44 -0000 http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java index 36a0ae6..6cac641 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java @@ -44,7 +44,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin public int maxConsumers; - public boolean deleteOnNoConsumers; + public boolean purgeOnNoConsumers; public byte routingType; @@ -66,8 +66,8 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin autoCreated + ", maxConsumers=" + maxConsumers + - ", deleteOnNoConsumers=" + - deleteOnNoConsumers + + ", purgeOnNoConsumers=" + + purgeOnNoConsumers + ", routingType=" + routingType + "]"; @@ -79,7 +79,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin final SimpleString user, final boolean autoCreated, final int maxConsumers, - final boolean deleteOnNoConsumers, + final boolean purgeOnNoConsumers, final byte routingType) { this.name = name; this.address = address; @@ -87,7 +87,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin this.user = user; this.autoCreated = autoCreated; this.maxConsumers = maxConsumers; - this.deleteOnNoConsumers = deleteOnNoConsumers; + this.purgeOnNoConsumers = purgeOnNoConsumers; this.routingType = routingType; } @@ -154,13 +154,13 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin } @Override - public boolean isDeleteOnNoConsumers() { + public boolean isPurgeOnNoConsumers() { return false; } @Override - public void setDeleteOnNoConsumers(boolean deleteOnNoConsumers) { - this.deleteOnNoConsumers = deleteOnNoConsumers; + public void setPurgeOnNoConsumers(boolean purgeOnNoConsumers) { + this.purgeOnNoConsumers = purgeOnNoConsumers; } @Override @@ -196,11 +196,11 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin if (buffer.readableBytes() > 0) { maxConsumers = buffer.readInt(); - deleteOnNoConsumers = buffer.readBoolean(); + purgeOnNoConsumers = buffer.readBoolean(); routingType = buffer.readByte(); } else { maxConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(); - deleteOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(); + purgeOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(); routingType = ActiveMQDefaultConfiguration.getDefaultRoutingType().getType(); } } @@ -213,7 +213,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin buffer.writeNullableSimpleString(createMetadata()); buffer.writeBoolean(autoCreated); buffer.writeInt(maxConsumers); - buffer.writeBoolean(deleteOnNoConsumers); + buffer.writeBoolean(purgeOnNoConsumers); buffer.writeByte(routingType); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java index e4c1965..e00012d 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java @@ -60,7 +60,7 @@ public interface PostOffice extends ActiveMQComponent { QueueBinding updateQueue(SimpleString name, RoutingType routingType, Integer maxConsumers, - Boolean deleteOnNoConsumers) throws Exception; + Boolean purgeOnNoConsumers) throws Exception; List listQueuesForAddress(SimpleString address) throws Exception; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java index 522bca6..b2561df 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java @@ -444,7 +444,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding public QueueBinding updateQueue(SimpleString name, RoutingType routingType, Integer maxConsumers, - Boolean deleteOnNoConsumers) throws Exception { + Boolean purgeOnNoConsumers) throws Exception { synchronized (addressLock) { final QueueBinding queueBinding = (QueueBinding) addressManager.getBinding(name); if (queueBinding == null) { @@ -474,8 +474,8 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (routingType != null) { queue.setRoutingType(routingType); } - if (deleteOnNoConsumers != null) { - queue.setDeleteOnNoConsumers(deleteOnNoConsumers); + if (purgeOnNoConsumers != null) { + queue.setPurgeOnNoConsumers(purgeOnNoConsumers); } return queueBinding; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java index be2f04d..7b2ab0a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java @@ -252,7 +252,7 @@ public class ServerSessionPacketHandler implements ChannelHandler { case CREATE_QUEUE_V2: { CreateQueueMessage_V2 request = (CreateQueueMessage_V2) packet; requiresResponse = request.isRequiresResponse(); - session.createQueue(request.getAddress(), request.getQueueName(), request.getRoutingType(), request.getFilterString(), request.isTemporary(), request.isDurable(), request.getMaxConsumers(), request.isDeleteOnNoConsumers(), + session.createQueue(request.getAddress(), request.getQueueName(), request.getRoutingType(), request.getFilterString(), request.isTemporary(), request.isDurable(), request.getMaxConsumers(), request.isPurgeOnNoConsumers(), request.isAutoCreated()); if (requiresResponse) { response = new NullResponseMessage(); @@ -302,7 +302,7 @@ public class ServerSessionPacketHandler implements ChannelHandler { SessionBindingQueryMessage request = (SessionBindingQueryMessage) packet; BindingQueryResult result = session.executeBindingQuery(request.getAddress(remotingConnection.getClientVersion())); if (channel.supports(PacketImpl.SESS_BINDINGQUERY_RESP_V4)) { - response = new SessionBindingQueryResponseMessage_V4(result.isExists(), result.getQueueNames(), result.isAutoCreateQueues(), result.isAutoCreateAddresses(), result.isDefaultDeleteOnNoConsumers(), result.getDefaultMaxConsumers()); + response = new SessionBindingQueryResponseMessage_V4(result.isExists(), result.getQueueNames(), result.isAutoCreateQueues(), result.isAutoCreateAddresses(), result.isDefaultPurgeOnNoConsumers(), result.getDefaultMaxConsumers()); } else if (channel.supports(PacketImpl.SESS_BINDINGQUERY_RESP_V3)) { response = new SessionBindingQueryResponseMessage_V3(result.isExists(), result.getQueueNames(), result.isAutoCreateQueues(), result.isAutoCreateAddresses()); } else if (channel.supports(PacketImpl.SESS_BINDINGQUERY_RESP_V2)) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java index be91a1f..89883df 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java @@ -287,16 +287,16 @@ public interface ActiveMQServer extends ActiveMQComponent { boolean durable, boolean temporary) throws Exception; Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter, - boolean durable, boolean temporary, int maxConsumers, boolean deleteOnNoConsumers, + boolean durable, boolean temporary, int maxConsumers, boolean purgeOnNoConsumers, boolean autoCreateAddress) throws Exception; Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter, SimpleString user, boolean durable, boolean temporary, boolean autoCreated, Integer maxConsumers, - Boolean deleteOnNoConsumers, boolean autoCreateAddress) throws Exception; + Boolean purgeOnNoConsumers, boolean autoCreateAddress) throws Exception; Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter, SimpleString user, boolean durable, boolean temporary, boolean ignoreIfExists, boolean transientQueue, - boolean autoCreated, int maxConsumers, boolean deleteOnNoConsumers, boolean autoCreateAddress) throws Exception; + boolean autoCreated, int maxConsumers, boolean purgeOnNoConsumers, boolean autoCreateAddress) throws Exception; @Deprecated Queue createQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable, boolean temporary) throws Exception; @@ -367,7 +367,7 @@ public interface ActiveMQServer extends ActiveMQComponent { Queue updateQueue(String name, RoutingType routingType, Integer maxConsumers, - Boolean deleteOnNoConsumers) throws Exception; + Boolean purgeOnNoConsumers) throws Exception; /* * add a ProtocolManagerFactory to be used. Note if @see Configuration#isResolveProtocols is tur then this factory will http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/BindingQueryResult.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/BindingQueryResult.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/BindingQueryResult.java index 739b960..7eed31f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/BindingQueryResult.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/BindingQueryResult.java @@ -30,7 +30,7 @@ public class BindingQueryResult { private boolean autoCreateAddresses; - private boolean defaultDeleteOnNoConsumers; + private boolean defaultPurgeOnNoConsumers; private int defaultMaxConsumers; @@ -38,7 +38,7 @@ public class BindingQueryResult { final List queueNames, final boolean autoCreateQueues, final boolean autoCreateAddresses, - final boolean defaultDeleteOnNoConsumers, + final boolean defaultPurgeOnNoConsumers, final int defaultMaxConsumers) { this.exists = exists; @@ -48,7 +48,7 @@ public class BindingQueryResult { this.autoCreateAddresses = autoCreateAddresses; - this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers; + this.defaultPurgeOnNoConsumers = defaultPurgeOnNoConsumers; this.defaultMaxConsumers = defaultMaxConsumers; } @@ -69,8 +69,8 @@ public class BindingQueryResult { return queueNames; } - public boolean isDefaultDeleteOnNoConsumers() { - return defaultDeleteOnNoConsumers; + public boolean isDefaultPurgeOnNoConsumers() { + return defaultPurgeOnNoConsumers; } public int getDefaultMaxConsumers() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java index bfb2c84..c382e22 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java @@ -52,9 +52,9 @@ public interface Queue extends Bindable { boolean isAutoCreated(); - boolean isDeleteOnNoConsumers(); + boolean isPurgeOnNoConsumers(); - void setDeleteOnNoConsumers(boolean value); + void setPurgeOnNoConsumers(boolean value); int getMaxConsumers(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java index 6e0d5af..cd455e6 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java @@ -36,7 +36,7 @@ public final class QueueConfig { private final boolean autoCreated; private final RoutingType routingType; private final int maxConsumers; - private final boolean deleteOnNoConsumers; + private final boolean purgeOnNoConsumers; public static final class Builder { @@ -51,7 +51,7 @@ public final class QueueConfig { private boolean autoCreated; private RoutingType routingType; private int maxConsumers; - private boolean deleteOnNoConsumers; + private boolean purgeOnNoConsumers; private Builder(final long id, final SimpleString name) { this(id, name, name); @@ -69,7 +69,7 @@ public final class QueueConfig { this.autoCreated = true; this.routingType = ActiveMQDefaultConfiguration.getDefaultRoutingType(); this.maxConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(); - this.deleteOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(); + this.purgeOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(); validateState(); } @@ -121,8 +121,8 @@ public final class QueueConfig { return this; } - public Builder deleteOnNoConsumers(final boolean deleteOnNoConsumers) { - this.deleteOnNoConsumers = deleteOnNoConsumers; + public Builder purgeOnNoConsumers(final boolean purgeOnNoConsumers) { + this.purgeOnNoConsumers = purgeOnNoConsumers; return this; } @@ -152,7 +152,7 @@ public final class QueueConfig { } else { pageSubscription = null; } - return new QueueConfig(id, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, routingType, maxConsumers, deleteOnNoConsumers); + return new QueueConfig(id, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, routingType, maxConsumers, purgeOnNoConsumers); } } @@ -196,7 +196,7 @@ public final class QueueConfig { final boolean autoCreated, final RoutingType routingType, final int maxConsumers, - final boolean deleteOnNoConsumers) { + final boolean purgeOnNoConsumers) { this.id = id; this.address = address; this.name = name; @@ -207,7 +207,7 @@ public final class QueueConfig { this.temporary = temporary; this.autoCreated = autoCreated; this.routingType = routingType; - this.deleteOnNoConsumers = deleteOnNoConsumers; + this.purgeOnNoConsumers = purgeOnNoConsumers; this.maxConsumers = maxConsumers; } @@ -247,8 +247,8 @@ public final class QueueConfig { return autoCreated; } - public boolean isDeleteOnNoConsumers() { - return deleteOnNoConsumers; + public boolean isPurgeOnNoConsumers() { + return purgeOnNoConsumers; } public int maxConsumers() { @@ -288,7 +288,7 @@ public final class QueueConfig { return false; if (maxConsumers != that.maxConsumers) return false; - if (deleteOnNoConsumers != that.deleteOnNoConsumers) + if (purgeOnNoConsumers != that.purgeOnNoConsumers) return false; return user != null ? user.equals(that.user) : that.user == null; @@ -307,7 +307,7 @@ public final class QueueConfig { result = 31 * result + (autoCreated ? 1 : 0); result = 31 * result + routingType.getType(); result = 31 * result + maxConsumers; - result = 31 * result + (deleteOnNoConsumers ? 1 : 0); + result = 31 * result + (purgeOnNoConsumers ? 1 : 0); return result; } @@ -325,6 +325,6 @@ public final class QueueConfig { + ", autoCreated=" + autoCreated + ", routingType=" + routingType + ", maxConsumers=" + maxConsumers - + ", deleteOnNoConsumers=" + deleteOnNoConsumers + '}'; + + ", purgeOnNoConsumers=" + purgeOnNoConsumers + '}'; } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java index fb3bd22..ec1cb34 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java @@ -134,7 +134,7 @@ public interface ServerSession extends SecurityAuth { boolean temporary, boolean durable, int maxConsumers, - boolean deleteOnNoConsumers, + boolean purgeOnNoConsumers, boolean autoCreated) throws Exception; Queue createQueue(SimpleString address, http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java ---------------------------------------------------------------------- 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 3e71ded..373e210 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 @@ -697,7 +697,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { boolean autoCreateQeueus = addressSettings.isAutoCreateQueues(); boolean autoCreateAddresses = addressSettings.isAutoCreateAddresses(); - boolean defaultDeleteOnNoConsumers = addressSettings.isDefaultDeleteOnNoConsumers(); + boolean defaultPurgeOnNoConsumers = addressSettings.isDefaultPurgeOnNoConsumers(); int defaultMaxConsumers = addressSettings.getDefaultMaxConsumers(); List names = new ArrayList<>(); @@ -706,7 +706,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { ManagementService managementService = getManagementService(); if (managementService != null) { if (address.equals(managementService.getManagementAddress())) { - return new BindingQueryResult(true, names, autoCreateQeueus, autoCreateAddresses, defaultDeleteOnNoConsumers, defaultMaxConsumers); + return new BindingQueryResult(true, names, autoCreateQeueus, autoCreateAddresses, defaultPurgeOnNoConsumers, defaultMaxConsumers); } } @@ -718,7 +718,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { } } - return new BindingQueryResult(getAddressInfo(address) != null, names, autoCreateQeueus, autoCreateAddresses, defaultDeleteOnNoConsumers, defaultMaxConsumers); + return new BindingQueryResult(getAddressInfo(address) != null, names, autoCreateQeueus, autoCreateAddresses, defaultPurgeOnNoConsumers, defaultMaxConsumers); } @Override @@ -728,7 +728,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { } boolean autoCreateQueues = getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateQueues(); - boolean defaultDeleteOnNoConsumers = getAddressSettingsRepository().getMatch(name.toString()).isDefaultDeleteOnNoConsumers(); + boolean defaultPurgeOnNoConsumers = getAddressSettingsRepository().getMatch(name.toString()).isDefaultPurgeOnNoConsumers(); int defaultMaxConsumers = getAddressSettingsRepository().getMatch(name.toString()).getDefaultMaxConsumers(); QueueQueryResult response; @@ -744,12 +744,12 @@ public class ActiveMQServerImpl implements ActiveMQServer { SimpleString filterString = filter == null ? null : filter.getFilterString(); - response = new QueueQueryResult(name, binding.getAddress(), queue.isDurable(), queue.isTemporary(), filterString, queue.getConsumerCount(), queue.getMessageCount(), autoCreateQueues, true, queue.isAutoCreated(), queue.isDeleteOnNoConsumers(), queue.getRoutingType(), queue.getMaxConsumers()); + response = new QueueQueryResult(name, binding.getAddress(), queue.isDurable(), queue.isTemporary(), filterString, queue.getConsumerCount(), queue.getMessageCount(), autoCreateQueues, true, queue.isAutoCreated(), queue.isPurgeOnNoConsumers(), queue.getRoutingType(), queue.getMaxConsumers()); } else if (name.equals(managementAddress)) { // make an exception for the management address (see HORNETQ-29) response = new QueueQueryResult(name, managementAddress, true, false, null, -1, -1, autoCreateQueues, true, false, false, RoutingType.MULTICAST, -1); } else if (autoCreateQueues) { - response = new QueueQueryResult(name, name, true, false, null, 0, 0, true, false, false, defaultDeleteOnNoConsumers, RoutingType.MULTICAST, defaultMaxConsumers); + response = new QueueQueryResult(name, name, true, false, null, 0, 0, true, false, false, defaultPurgeOnNoConsumers, RoutingType.MULTICAST, defaultMaxConsumers); } else { response = new QueueQueryResult(null, null, false, false, null, 0, 0, false, false, false, false, RoutingType.MULTICAST, 0); } @@ -766,15 +766,15 @@ public class ActiveMQServerImpl implements ActiveMQServer { AddressSettings addressSettings = getAddressSettingsRepository().getMatch(name.toString()); boolean autoCreateAddresses = addressSettings.isAutoCreateAddresses(); - boolean defaultDeleteOnNoConsumers = addressSettings.isDefaultDeleteOnNoConsumers(); + boolean defaultPurgeOnNoConsumers = addressSettings.isDefaultPurgeOnNoConsumers(); int defaultMaxConsumers = addressSettings.getDefaultMaxConsumers(); AddressInfo addressInfo = postOffice.getAddressInfo(name); AddressQueryResult response; if (addressInfo != null) { - response = new AddressQueryResult(addressInfo.getName(), addressInfo.getRoutingTypes(), addressInfo.getId(), addressInfo.isAutoCreated(), true, autoCreateAddresses, defaultDeleteOnNoConsumers, defaultMaxConsumers); + response = new AddressQueryResult(addressInfo.getName(), addressInfo.getRoutingTypes(), addressInfo.getId(), addressInfo.isAutoCreated(), true, autoCreateAddresses, defaultPurgeOnNoConsumers, defaultMaxConsumers); } else { - response = new AddressQueryResult(name, null, -1, false, false, autoCreateAddresses, defaultDeleteOnNoConsumers, defaultMaxConsumers); + response = new AddressQueryResult(name, null, -1, false, false, autoCreateAddresses, defaultPurgeOnNoConsumers, defaultMaxConsumers); } return response; } @@ -1503,7 +1503,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { final boolean durable, final boolean temporary) throws Exception { AddressSettings as = getAddressSettingsRepository().getMatch(address.toString()); - return createQueue(address, routingType, queueName, filterString, durable, temporary, as.getDefaultMaxConsumers(), as.isDefaultDeleteOnNoConsumers(), as.isAutoCreateAddresses()); + return createQueue(address, routingType, queueName, filterString, durable, temporary, as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), as.isAutoCreateAddresses()); } @Override @@ -1514,9 +1514,9 @@ public class ActiveMQServerImpl implements ActiveMQServer { final boolean durable, final boolean temporary, final int maxConsumers, - final boolean deleteOnNoConsumers, + final boolean purgeOnNoConsumers, final boolean autoCreateAddress) throws Exception { - return createQueue(address, routingType, queueName, filter, null, durable, temporary, false, maxConsumers, deleteOnNoConsumers, autoCreateAddress); + return createQueue(address, routingType, queueName, filter, null, durable, temporary, false, maxConsumers, purgeOnNoConsumers, autoCreateAddress); } @Override @@ -2230,7 +2230,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { for (CoreQueueConfiguration config : queues) { ActiveMQServerLogger.LOGGER.deployQueue(SimpleString.toSimpleString(config.getName())); - createQueue(SimpleString.toSimpleString(config.getAddress()), config.getRoutingType(), SimpleString.toSimpleString(config.getName()), SimpleString.toSimpleString(config.getFilterString()), null, config.isDurable(), false, true, false, false, config.getMaxConsumers(), config.getDeleteOnNoConsumers(), true); + createQueue(SimpleString.toSimpleString(config.getAddress()), config.getRoutingType(), SimpleString.toSimpleString(config.getName()), SimpleString.toSimpleString(config.getFilterString()), null, config.isDurable(), false, true, false, false, config.getMaxConsumers(), config.getPurgeOnNoConsumers(), true); } } @@ -2415,7 +2415,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { final boolean transientQueue, final boolean autoCreated, final int maxConsumers, - final boolean deleteOnNoConsumers, + final boolean purgeOnNoConsumers, final boolean autoCreateAddress) throws Exception { final QueueBinding binding = (QueueBinding) postOffice.getBinding(queueName); @@ -2459,7 +2459,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { throw ActiveMQMessageBundle.BUNDLE.invalidRoutingTypeForAddress(routingType, info.getName().toString(), info.getRoutingTypes()); } - final QueueConfig queueConfig = queueConfigBuilder.filter(filter).pagingManager(pagingManager).user(user).durable(durable).temporary(temporary).autoCreated(autoCreated).routingType(routingType).maxConsumers(maxConsumers).deleteOnNoConsumers(deleteOnNoConsumers).build(); + final QueueConfig queueConfig = queueConfigBuilder.filter(filter).pagingManager(pagingManager).user(user).durable(durable).temporary(temporary).autoCreated(autoCreated).routingType(routingType).maxConsumers(maxConsumers).purgeOnNoConsumers(purgeOnNoConsumers).build(); final Queue queue = queueFactory.createQueueWith(queueConfig); @@ -2510,8 +2510,8 @@ public class ActiveMQServerImpl implements ActiveMQServer { public Queue updateQueue(String name, RoutingType routingType, Integer maxConsumers, - Boolean deleteOnNoConsumers) throws Exception { - final QueueBinding queueBinding = this.postOffice.updateQueue(new SimpleString(name), routingType, maxConsumers, deleteOnNoConsumers); + Boolean purgeOnNoConsumers) throws Exception { + final QueueBinding queueBinding = this.postOffice.updateQueue(new SimpleString(name), routingType, maxConsumers, purgeOnNoConsumers); if (queueBinding != null) { final Queue queue = queueBinding.getQueue(); if (queue.isDurable()) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java index 0a1d09c..fd89a94 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java @@ -39,7 +39,7 @@ public class AutoCreatedQueueManagerImpl implements AutoCreatedQueueManager { long consumerCount = queue.getConsumerCount(); long messageCount = queue.getMessageCount(); - if (((queue.isAutoCreated() && settings.isAutoDeleteQueues()) || queue.isDeleteOnNoConsumers()) && queue.getMessageCount() == 0) { + if (((queue.isAutoCreated() && settings.isAutoDeleteQueues()) || queue.isPurgeOnNoConsumers()) && queue.getMessageCount() == 0) { if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) { ActiveMQServerLogger.LOGGER.debug("deleting " + (queue.isAutoCreated() ? "auto-created " : "") + "queue \"" + queueName + ".\" consumerCount = " + consumerCount + "; messageCount = " + messageCount + "; isAutoDeleteQueues = " + settings.isAutoDeleteQueues()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java index 8896aa4..d21d1c1 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java @@ -59,13 +59,13 @@ public class LastValueQueue extends QueueImpl { final boolean autoCreated, final RoutingType routingType, final Integer maxConsumers, - final Boolean deleteOnNoConsumers, + final Boolean purgeOnNoConsumers, final ScheduledExecutorService scheduledExecutor, final PostOffice postOffice, final StorageManager storageManager, final HierarchicalRepository addressSettingsRepository, final Executor executor) { - super(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, routingType, maxConsumers, deleteOnNoConsumers, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor); + super(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, routingType, maxConsumers, purgeOnNoConsumers, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor); new Exception("LastValueQeue " + this).toString(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java index 9c4c617..65de0c9 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java @@ -149,7 +149,7 @@ public class PostOfficeJournalLoader implements JournalLoader { .durable(true) .temporary(false) .autoCreated(queueBindingInfo.isAutoCreated()) - .deleteOnNoConsumers(queueBindingInfo.isDeleteOnNoConsumers()) + .purgeOnNoConsumers(queueBindingInfo.isPurgeOnNoConsumers()) .maxConsumers(queueBindingInfo.getMaxConsumers()) .routingType(RoutingType.getType(queueBindingInfo.getRoutingType())); final Queue queue = queueFactory.createQueueWith(queueConfigBuilder.build()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java index 2ac153d..9258a07 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java @@ -72,9 +72,9 @@ public class QueueFactoryImpl implements QueueFactory { final AddressSettings addressSettings = addressSettingsRepository.getMatch(config.address().toString()); final Queue queue; if (addressSettings.isLastValueQueue()) { - queue = new LastValueQueue(config.id(), config.address(), config.name(), config.filter(), config.pageSubscription(), config.user(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.deliveryMode(), config.maxConsumers(), config.isDeleteOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); + queue = new LastValueQueue(config.id(), config.address(), config.name(), config.filter(), config.pageSubscription(), config.user(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.deliveryMode(), config.maxConsumers(), config.isPurgeOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); } else { - queue = new QueueImpl(config.id(), config.address(), config.name(), config.filter(), config.pageSubscription(), config.user(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.deliveryMode(), config.maxConsumers(), config.isDeleteOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); + queue = new QueueImpl(config.id(), config.address(), config.name(), config.filter(), config.pageSubscription(), config.user(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.deliveryMode(), config.maxConsumers(), config.isPurgeOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); } return queue; } @@ -98,7 +98,7 @@ public class QueueFactoryImpl implements QueueFactory { Queue queue; if (addressSettings.isLastValueQueue()) { - queue = new LastValueQueue(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, ActiveMQDefaultConfiguration.getDefaultRoutingType(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); + queue = new LastValueQueue(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, ActiveMQDefaultConfiguration.getDefaultRoutingType(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); } else { queue = new QueueImpl(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index ecc67bf..6834bb4 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -242,7 +242,7 @@ public class QueueImpl implements Queue { private volatile int maxConsumers; - private volatile boolean deleteOnNoConsumers; + private volatile boolean purgeOnNoConsumers; private final AddressInfo addressInfo; @@ -360,7 +360,7 @@ public class QueueImpl implements Queue { final boolean autoCreated, final RoutingType routingType, final Integer maxConsumers, - final Boolean deleteOnNoConsumers, + final Boolean purgeOnNoConsumers, final ScheduledExecutorService scheduledExecutor, final PostOffice postOffice, final StorageManager storageManager, @@ -389,7 +389,7 @@ public class QueueImpl implements Queue { this.maxConsumers = maxConsumers == null ? ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers() : maxConsumers; - this.deleteOnNoConsumers = deleteOnNoConsumers == null ? ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers() : deleteOnNoConsumers; + this.purgeOnNoConsumers = purgeOnNoConsumers == null ? ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers() : purgeOnNoConsumers; this.postOffice = postOffice; @@ -478,13 +478,13 @@ public class QueueImpl implements Queue { } @Override - public boolean isDeleteOnNoConsumers() { - return deleteOnNoConsumers; + public boolean isPurgeOnNoConsumers() { + return purgeOnNoConsumers; } @Override - public synchronized void setDeleteOnNoConsumers(boolean value) { - this.deleteOnNoConsumers = value; + public synchronized void setPurgeOnNoConsumers(boolean value) { + this.purgeOnNoConsumers = value; } @Override @@ -851,7 +851,7 @@ public class QueueImpl implements Queue { refCountForConsumers.decrement(); } - if (noConsumers.decrementAndGet() == 0 && deleteOnNoConsumers) { + if (noConsumers.decrementAndGet() == 0 && purgeOnNoConsumers) { try { deleteQueue(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java index edd820a..9acffd5 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java @@ -506,7 +506,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { final boolean temporary, final boolean durable) throws Exception { AddressSettings as = server.getAddressSettingsRepository().getMatch(address.toString()); - return createQueue(address, name, as.getDefaultQueueRoutingType(), filterString, temporary, durable, as.getDefaultMaxConsumers(), as.isDefaultDeleteOnNoConsumers(), false); + return createQueue(address, name, as.getDefaultQueueRoutingType(), filterString, temporary, durable, as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), false); } @Override @@ -517,7 +517,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { final boolean temporary, final boolean durable) throws Exception { AddressSettings as = server.getAddressSettingsRepository().getMatch(address.toString()); - return createQueue(address, name, routingType, filterString, temporary, durable, as.getDefaultMaxConsumers(), as.isDefaultDeleteOnNoConsumers(), false); + return createQueue(address, name, routingType, filterString, temporary, durable, as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), false); } @Override @@ -528,7 +528,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { final boolean temporary, final boolean durable, final int maxConsumers, - final boolean deleteOnNoConsumers, + final boolean purgeOnNoConsumers, final boolean autoCreated) throws Exception { final SimpleString unPrefixedName = removePrefix(name); @@ -543,7 +543,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { server.checkQueueCreationLimit(getUsername()); - Queue queue = server.createQueue(art.getA(), art.getB(), unPrefixedName, filterString, SimpleString.toSimpleString(getUsername()), durable, temporary, autoCreated, maxConsumers, deleteOnNoConsumers, server.getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateAddresses()); + Queue queue = server.createQueue(art.getA(), art.getB(), unPrefixedName, filterString, SimpleString.toSimpleString(getUsername()), durable, temporary, autoCreated, maxConsumers, purgeOnNoConsumers, server.getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateAddresses()); if (temporary) { // Temporary queue in core simply means the queue will be deleted if @@ -582,7 +582,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { boolean durable, boolean autoCreated) throws Exception { AddressSettings as = server.getAddressSettingsRepository().getMatch(address.toString()); - return createQueue(address, name, routingType, filterString, temporary, durable, as.getDefaultMaxConsumers(), as.isDefaultDeleteOnNoConsumers(), autoCreated); + return createQueue(address, name, routingType, filterString, temporary, durable, as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), autoCreated); } @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java index 52cc165..8f7cc36 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java @@ -158,7 +158,7 @@ public class AddressSettings implements Mergeable, Serializable private Integer defaultMaxConsumers = null; - private Boolean defaultDeleteOnNoConsumers = null; + private Boolean defaultPurgeOnNoConsumers = null; private RoutingType defaultQueueRoutingType = null; @@ -200,7 +200,7 @@ public class AddressSettings implements Mergeable, Serializable this.queuePrefetch = other.queuePrefetch; this.maxSizeBytesRejectThreshold = other.maxSizeBytesRejectThreshold; this.defaultMaxConsumers = other.defaultMaxConsumers; - this.defaultDeleteOnNoConsumers = other.defaultDeleteOnNoConsumers; + this.defaultPurgeOnNoConsumers = other.defaultPurgeOnNoConsumers; this.defaultQueueRoutingType = other.defaultQueueRoutingType; this.defaultAddressRoutingType = other.defaultAddressRoutingType; } @@ -297,12 +297,12 @@ public class AddressSettings implements Mergeable, Serializable return this; } - public boolean isDefaultDeleteOnNoConsumers() { - return defaultDeleteOnNoConsumers != null ? defaultDeleteOnNoConsumers : ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(); + public boolean isDefaultPurgeOnNoConsumers() { + return defaultPurgeOnNoConsumers != null ? defaultPurgeOnNoConsumers : ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(); } - public AddressSettings setDefaultDeleteOnNoConsumers(Boolean defaultDeleteOnNoConsumers) { - this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers; + public AddressSettings setDefaultPurgeOnNoConsumers(Boolean defaultPurgeOnNoConsumers) { + this.defaultPurgeOnNoConsumers = defaultPurgeOnNoConsumers; return this; } @@ -612,8 +612,8 @@ public class AddressSettings implements Mergeable, Serializable if (defaultMaxConsumers == null) { defaultMaxConsumers = merged.defaultMaxConsumers; } - if (defaultDeleteOnNoConsumers == null) { - defaultDeleteOnNoConsumers = merged.defaultDeleteOnNoConsumers; + if (defaultPurgeOnNoConsumers == null) { + defaultPurgeOnNoConsumers = merged.defaultPurgeOnNoConsumers; } if (defaultQueueRoutingType == null) { defaultQueueRoutingType = merged.defaultQueueRoutingType; @@ -697,7 +697,7 @@ public class AddressSettings implements Mergeable, Serializable defaultMaxConsumers = BufferHelper.readNullableInteger(buffer); - defaultDeleteOnNoConsumers = BufferHelper.readNullableBoolean(buffer); + defaultPurgeOnNoConsumers = BufferHelper.readNullableBoolean(buffer); defaultQueueRoutingType = RoutingType.getType(buffer.readByte()); @@ -737,7 +737,7 @@ public class AddressSettings implements Mergeable, Serializable BufferHelper.sizeOfNullableInteger(managementBrowsePageSize) + BufferHelper.sizeOfNullableLong(maxSizeBytesRejectThreshold) + BufferHelper.sizeOfNullableInteger(defaultMaxConsumers) + - BufferHelper.sizeOfNullableBoolean(defaultDeleteOnNoConsumers) + + BufferHelper.sizeOfNullableBoolean(defaultPurgeOnNoConsumers) + DataConstants.SIZE_BYTE + DataConstants.SIZE_BYTE; } @@ -804,7 +804,7 @@ public class AddressSettings implements Mergeable, Serializable BufferHelper.writeNullableInteger(buffer, defaultMaxConsumers); - BufferHelper.writeNullableBoolean(buffer, defaultDeleteOnNoConsumers); + BufferHelper.writeNullableBoolean(buffer, defaultPurgeOnNoConsumers); buffer.writeByte(defaultQueueRoutingType == null ? -1 : defaultQueueRoutingType.getType()); @@ -849,7 +849,7 @@ public class AddressSettings implements Mergeable, Serializable result = prime * result + ((queuePrefetch == null) ? 0 : queuePrefetch.hashCode()); result = prime * result + ((maxSizeBytesRejectThreshold == null) ? 0 : maxSizeBytesRejectThreshold.hashCode()); result = prime * result + ((defaultMaxConsumers == null) ? 0 : defaultMaxConsumers.hashCode()); - result = prime * result + ((defaultDeleteOnNoConsumers == null) ? 0 : defaultDeleteOnNoConsumers.hashCode()); + result = prime * result + ((defaultPurgeOnNoConsumers == null) ? 0 : defaultPurgeOnNoConsumers.hashCode()); result = prime * result + ((defaultQueueRoutingType == null) ? 0 : defaultQueueRoutingType.hashCode()); result = prime * result + ((defaultAddressRoutingType == null) ? 0 : defaultAddressRoutingType.hashCode()); return result; @@ -1025,10 +1025,10 @@ public class AddressSettings implements Mergeable, Serializable } else if (!defaultMaxConsumers.equals(other.defaultMaxConsumers)) return false; - if (defaultDeleteOnNoConsumers == null) { - if (other.defaultDeleteOnNoConsumers != null) + if (defaultPurgeOnNoConsumers == null) { + if (other.defaultPurgeOnNoConsumers != null) return false; - } else if (!defaultDeleteOnNoConsumers.equals(other.defaultDeleteOnNoConsumers)) + } else if (!defaultPurgeOnNoConsumers.equals(other.defaultPurgeOnNoConsumers)) return false; if (defaultQueueRoutingType == null) { @@ -1109,8 +1109,8 @@ public class AddressSettings implements Mergeable, Serializable managementBrowsePageSize + ", defaultMaxConsumers=" + defaultMaxConsumers + - ", defaultDeleteOnNoConsumers=" + - defaultDeleteOnNoConsumers + + ", defaultPurgeOnNoConsumers=" + + defaultPurgeOnNoConsumers + ", defaultQueueRoutingType=" + defaultQueueRoutingType + ", defaultAddressRoutingType=" + http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/resources/schema/artemis-configuration.xsd ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd index f0eb67e..4ba268f 100644 --- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd +++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd @@ -2553,10 +2553,11 @@ - + - Purge and pause this queue when the last consumer disconnects + purge the contents of the queue once there are no consumers @@ -2704,7 +2705,7 @@ - + http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java index 7f0d8c1..29f8ed6 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java @@ -305,7 +305,7 @@ public class FileConfigurationTest extends ConfigurationImplTest { assertEquals(true, conf.getAddressesSettings().get("a1").isAutoDeleteJmsQueues()); assertEquals(true, conf.getAddressesSettings().get("a1").isAutoCreateJmsTopics()); assertEquals(true, conf.getAddressesSettings().get("a1").isAutoDeleteJmsTopics()); - assertEquals(false, conf.getAddressesSettings().get("a1").isDefaultDeleteOnNoConsumers()); + assertEquals(false, conf.getAddressesSettings().get("a1").isDefaultPurgeOnNoConsumers()); assertEquals(5, conf.getAddressesSettings().get("a1").getDefaultMaxConsumers()); assertEquals(RoutingType.ANYCAST, conf.getAddressesSettings().get("a1").getDefaultQueueRoutingType()); assertEquals(RoutingType.MULTICAST, conf.getAddressesSettings().get("a1").getDefaultAddressRoutingType()); @@ -324,7 +324,7 @@ public class FileConfigurationTest extends ConfigurationImplTest { assertEquals(false, conf.getAddressesSettings().get("a2").isAutoDeleteJmsQueues()); assertEquals(false, conf.getAddressesSettings().get("a2").isAutoCreateJmsTopics()); assertEquals(false, conf.getAddressesSettings().get("a2").isAutoDeleteJmsTopics()); - assertEquals(true, conf.getAddressesSettings().get("a2").isDefaultDeleteOnNoConsumers()); + assertEquals(true, conf.getAddressesSettings().get("a2").isDefaultPurgeOnNoConsumers()); assertEquals(15, conf.getAddressesSettings().get("a2").getDefaultMaxConsumers()); assertEquals(RoutingType.MULTICAST, conf.getAddressesSettings().get("a2").getDefaultQueueRoutingType()); assertEquals(RoutingType.ANYCAST, conf.getAddressesSettings().get("a2").getDefaultAddressRoutingType()); @@ -398,7 +398,7 @@ public class FileConfigurationTest extends ConfigurationImplTest { assertEquals("q1", queueConfiguration.getName()); assertFalse(queueConfiguration.isDurable()); assertEquals("color='blue'", queueConfiguration.getFilterString()); - assertEquals(ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), queueConfiguration.getDeleteOnNoConsumers()); + assertEquals(ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), queueConfiguration.getPurgeOnNoConsumers()); assertEquals("addr1", queueConfiguration.getAddress()); assertEquals(ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), queueConfiguration.getMaxConsumers()); @@ -409,7 +409,7 @@ public class FileConfigurationTest extends ConfigurationImplTest { assertTrue(queueConfiguration.isDurable()); assertEquals("color='green'", queueConfiguration.getFilterString()); assertEquals(Queue.MAX_CONSUMERS_UNLIMITED, queueConfiguration.getMaxConsumers()); - assertFalse(queueConfiguration.getDeleteOnNoConsumers()); + assertFalse(queueConfiguration.getPurgeOnNoConsumers()); assertEquals("addr1", queueConfiguration.getAddress()); // Addr 2 @@ -427,7 +427,7 @@ public class FileConfigurationTest extends ConfigurationImplTest { assertTrue(queueConfiguration.isDurable()); assertEquals("color='red'", queueConfiguration.getFilterString()); assertEquals(10, queueConfiguration.getMaxConsumers()); - assertEquals(ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), queueConfiguration.getDeleteOnNoConsumers()); + assertEquals(ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), queueConfiguration.getPurgeOnNoConsumers()); assertEquals("addr2", queueConfiguration.getAddress()); // Addr 2 Queue 2 @@ -437,7 +437,7 @@ public class FileConfigurationTest extends ConfigurationImplTest { assertTrue(queueConfiguration.isDurable()); assertNull(queueConfiguration.getFilterString()); assertEquals(ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), queueConfiguration.getMaxConsumers()); - assertTrue(queueConfiguration.getDeleteOnNoConsumers()); + assertTrue(queueConfiguration.getPurgeOnNoConsumers()); assertEquals("addr2", queueConfiguration.getAddress()); // Addr 3 http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java index c68aeed..6016485 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java @@ -838,7 +838,7 @@ public class ScheduledDeliveryHandlerTest extends Assert { public class FakeQueueForScheduleUnitTest implements Queue { @Override - public void setDeleteOnNoConsumers(boolean value) { + public void setPurgeOnNoConsumers(boolean value) { } @@ -922,7 +922,7 @@ public class ScheduledDeliveryHandlerTest extends Assert { } @Override - public boolean isDeleteOnNoConsumers() { + public boolean isPurgeOnNoConsumers() { return false; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java index 48562ec..0497dd7 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java @@ -48,7 +48,7 @@ public class AddressSettingsTest extends ActiveMQTestBase { Assert.assertEquals(AddressSettings.DEFAULT_AUTO_DELETE_QUEUES, addressSettings.isAutoDeleteQueues()); Assert.assertEquals(AddressSettings.DEFAULT_AUTO_CREATE_ADDRESSES, addressSettings.isAutoCreateAddresses()); Assert.assertEquals(AddressSettings.DEFAULT_AUTO_DELETE_ADDRESSES, addressSettings.isAutoDeleteAddresses()); - Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), addressSettings.isDefaultDeleteOnNoConsumers()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), addressSettings.isDefaultPurgeOnNoConsumers()); Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), addressSettings.getDefaultMaxConsumers()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/test/resources/ConfigurationTest-full-config.xml ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml index c493198..65047ac 100644 --- a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml +++ b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml @@ -272,7 +272,7 @@ true true true - false + false 5 ANYCAST MULTICAST @@ -296,7 +296,7 @@ false false false - true + true 15 MULTICAST ANYCAST @@ -321,7 +321,7 @@ false - + true @@ -332,7 +332,7 @@ - + true http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java ---------------------------------------------------------------------- diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java index 700a4cb..65307d5 100644 --- a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java +++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java @@ -29,7 +29,7 @@ public class Address { private String defaultMaxConsumers = "-1"; - private String defaultDeleteOnNoConsumers = "false"; + private String defaultPurgeOnNoConsumers = "false"; private List queues = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-tools/src/test/resources/artemis-configuration.xsd ---------------------------------------------------------------------- diff --git a/artemis-tools/src/test/resources/artemis-configuration.xsd b/artemis-tools/src/test/resources/artemis-configuration.xsd index c9d1f5b..e538ff0 100644 --- a/artemis-tools/src/test/resources/artemis-configuration.xsd +++ b/artemis-tools/src/test/resources/artemis-configuration.xsd @@ -2593,7 +2593,7 @@ - + http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java index fd0f604..98957e2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java @@ -223,13 +223,13 @@ public class AddressingTest extends ActiveMQTestBase { } @Test - public void testDeleteQueueOnNoConsumersTrue() throws Exception { + public void testPurgeOnNoConsumersTrue() throws Exception { SimpleString address = new SimpleString("test.address"); SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString()); // For each address, create 2 Queues with the same address, assert both queues receive message - boolean deleteOnNoConsumers = true; - Queue q1 = server.createQueue(address, RoutingType.MULTICAST, queueName, null, true, false, Queue.MAX_CONSUMERS_UNLIMITED, deleteOnNoConsumers, true); + boolean purgeOnNoConsumers = true; + Queue q1 = server.createQueue(address, RoutingType.MULTICAST, queueName, null, true, false, Queue.MAX_CONSUMERS_UNLIMITED, purgeOnNoConsumers, true); ClientSession session = sessionFactory.createSession(); session.start(); @@ -241,12 +241,12 @@ public class AddressingTest extends ActiveMQTestBase { } @Test - public void testDeleteQueueOnNoConsumersFalse() throws Exception { + public void testPurgeOnNoConsumersFalse() throws Exception { SimpleString address = new SimpleString("test.address"); SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString()); // For each address, create 2 Queues with the same address, assert both queues receive message - boolean deleteOnNoConsumers = false; - Queue q1 = server.createQueue(address,RoutingType.MULTICAST, queueName, null, true, false, Queue.MAX_CONSUMERS_UNLIMITED, deleteOnNoConsumers, true); + boolean purgeOnNoConsumers = false; + Queue q1 = server.createQueue(address,RoutingType.MULTICAST, queueName, null, true, false, Queue.MAX_CONSUMERS_UNLIMITED, purgeOnNoConsumers, true); ClientSession session = sessionFactory.createSession(); session.start(); @@ -262,8 +262,8 @@ public class AddressingTest extends ActiveMQTestBase { SimpleString address = new SimpleString("test.address"); SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString()); // For each address, create 2 Queues with the same address, assert both queues receive message - boolean deleteOnNoConsumers = false; - Queue q1 = server.createQueue(address, RoutingType.MULTICAST, queueName, null, true, false, 0, deleteOnNoConsumers, true); + boolean purgeOnNoConsumers = false; + Queue q1 = server.createQueue(address, RoutingType.MULTICAST, queueName, null, true, false, 0, purgeOnNoConsumers, true); Exception expectedException = null; String expectedMessage = "Maximum Consumer Limit Reached on Queue"; @@ -288,8 +288,8 @@ public class AddressingTest extends ActiveMQTestBase { SimpleString address = new SimpleString("test.address"); SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString()); // For each address, create 2 Queues with the same address, assert both queues receive message - boolean deleteOnNoConsumers = false; - Queue q1 = server.createQueue(address, RoutingType.MULTICAST, queueName, null, true, false, Queue.MAX_CONSUMERS_UNLIMITED, deleteOnNoConsumers, true); + boolean purgeOnNoConsumers = false; + Queue q1 = server.createQueue(address, RoutingType.MULTICAST, queueName, null, true, false, Queue.MAX_CONSUMERS_UNLIMITED, purgeOnNoConsumers, true); ClientSession session = sessionFactory.createSession(); session.start(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java index 614827a..8ce6953 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java @@ -76,7 +76,7 @@ public class QueueCommandTest extends JMSTestBase { Queue queue = server.locateQueue(new SimpleString(queueName)); assertEquals(-1, queue.getMaxConsumers()); - assertEquals(false, queue.isDeleteOnNoConsumers()); + assertEquals(false, queue.isPurgeOnNoConsumers()); assertTrue(server.queueQuery(new SimpleString(queueName)).isExists()); } @@ -100,7 +100,7 @@ public class QueueCommandTest extends JMSTestBase { Queue queue = server.locateQueue(new SimpleString(queueName)); assertEquals(-1, queue.getMaxConsumers()); - assertEquals(false, queue.isDeleteOnNoConsumers()); + assertEquals(false, queue.isPurgeOnNoConsumers()); assertTrue(server.queueQuery(new SimpleString(queueName)).isExists()); } @@ -245,17 +245,17 @@ public class QueueCommandTest extends JMSTestBase { final SimpleString addressSimpleString = new SimpleString(addressName); final int oldMaxConsumers = -1; final RoutingType oldRoutingType = RoutingType.MULTICAST; - final boolean oldDeleteOnNoConsumers = false; + final boolean oldPurgeOnNoConsumers = false; final AddressInfo addressInfo = new AddressInfo(addressSimpleString, EnumSet.of(RoutingType.ANYCAST, RoutingType.MULTICAST)); server.addAddressInfo(addressInfo); - server.createQueue(addressSimpleString, oldRoutingType, queueNameString, null, true, false, oldMaxConsumers, oldDeleteOnNoConsumers, false); + server.createQueue(addressSimpleString, oldRoutingType, queueNameString, null, true, false, oldMaxConsumers, oldPurgeOnNoConsumers, false); final int newMaxConsumers = 1; final RoutingType newRoutingType = RoutingType.ANYCAST; - final boolean newDeleteOnNoConsumers = true; + final boolean newPurgeOnNoConsumers = true; final UpdateQueue updateQueue = new UpdateQueue(); updateQueue.setName(queueName); - updateQueue.setDeleteOnNoConsumers(newDeleteOnNoConsumers); + updateQueue.setPurgeOnNoConsumers(newPurgeOnNoConsumers); updateQueue.setAnycast(true); updateQueue.setMulticast(false); updateQueue.setMaxConsumers(newMaxConsumers); @@ -266,7 +266,7 @@ public class QueueCommandTest extends JMSTestBase { final QueueQueryResult queueQueryResult = server.queueQuery(queueNameString); assertEquals("maxConsumers", newMaxConsumers, queueQueryResult.getMaxConsumers()); assertEquals("routingType", newRoutingType, queueQueryResult.getRoutingType()); - assertTrue("deleteOnNoConsumers", newDeleteOnNoConsumers == queueQueryResult.isDeleteOnNoConsumers()); + assertTrue("purgeOnNoConsumers", newPurgeOnNoConsumers == queueQueryResult.isPurgeOnNoConsumers()); } @Test @@ -277,11 +277,11 @@ public class QueueCommandTest extends JMSTestBase { final SimpleString addressSimpleString = new SimpleString(addressName); final int oldMaxConsumers = 10; final RoutingType oldRoutingType = RoutingType.MULTICAST; - final boolean oldDeleteOnNoConsumers = false; + final boolean oldPurgeOnNoConsumers = false; final Set supportedRoutingTypes = EnumSet.of(oldRoutingType); final AddressInfo addressInfo = new AddressInfo(addressSimpleString, EnumSet.copyOf(supportedRoutingTypes)); server.addAddressInfo(addressInfo); - server.createQueue(addressSimpleString, oldRoutingType, queueNameString, null, true, false, oldMaxConsumers, oldDeleteOnNoConsumers, false); + server.createQueue(addressSimpleString, oldRoutingType, queueNameString, null, true, false, oldMaxConsumers, oldPurgeOnNoConsumers, false); final RoutingType newRoutingType = RoutingType.ANYCAST; final UpdateQueue updateQueue = new UpdateQueue(); @@ -296,7 +296,7 @@ public class QueueCommandTest extends JMSTestBase { final QueueQueryResult queueQueryResult = server.queueQuery(queueNameString); assertEquals("maxConsumers", oldMaxConsumers, queueQueryResult.getMaxConsumers()); assertEquals("routingType", oldRoutingType, queueQueryResult.getRoutingType()); - assertTrue("deleteOnNoConsumers", oldDeleteOnNoConsumers == queueQueryResult.isDeleteOnNoConsumers()); + assertTrue("purgeOnNoConsumers", oldPurgeOnNoConsumers == queueQueryResult.isPurgeOnNoConsumers()); } @Test @@ -307,10 +307,10 @@ public class QueueCommandTest extends JMSTestBase { final SimpleString addressSimpleString = new SimpleString(addressName); final int oldMaxConsumers = 2; final RoutingType oldRoutingType = RoutingType.MULTICAST; - final boolean oldDeleteOnNoConsumers = false; + final boolean oldPurgeOnNoConsumers = false; final AddressInfo addressInfo = new AddressInfo(addressSimpleString, oldRoutingType); server.addAddressInfo(addressInfo); - server.createQueue(addressSimpleString, oldRoutingType, queueNameString, null, true, false, oldMaxConsumers, oldDeleteOnNoConsumers, false); + server.createQueue(addressSimpleString, oldRoutingType, queueNameString, null, true, false, oldMaxConsumers, oldPurgeOnNoConsumers, false); server.locateQueue(queueNameString).addConsumer(new DummyServerConsumer()); server.locateQueue(queueNameString).addConsumer(new DummyServerConsumer()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java index 2c49706..8107425 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java @@ -228,13 +228,13 @@ public class HangConsumerTest extends ActiveMQTestBase { final boolean autoCreated, final RoutingType deliveryMode, final Integer maxConsumers, - final Boolean deleteOnNoConsumers, + final Boolean purgeOnNoConsumers, final ScheduledExecutorService scheduledExecutor, final PostOffice postOffice, final StorageManager storageManager, final HierarchicalRepository addressSettingsRepository, final Executor executor) { - super(id, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, deliveryMode, maxConsumers, deleteOnNoConsumers, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor); + super(id, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, deliveryMode, maxConsumers, purgeOnNoConsumers, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor); } @Override @@ -261,7 +261,7 @@ public class HangConsumerTest extends ActiveMQTestBase { @Override public Queue createQueueWith(final QueueConfig config) { - queue = new MyQueueWithBlocking(config.id(), config.address(), config.name(), config.filter(), config.user(), config.pageSubscription(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.deliveryMode(), config.maxConsumers(), config.isDeleteOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); + queue = new MyQueueWithBlocking(config.id(), config.address(), config.name(), config.filter(), config.user(), config.pageSubscription(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.deliveryMode(), config.maxConsumers(), config.isPurgeOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor()); return queue; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java index 442a314..c11674c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java @@ -544,7 +544,7 @@ public abstract class ClusterTestBase extends ActiveMQTestBase { final String address, final RoutingType routingType, final int defaulMaxConsumers, - boolean defaultDeleteOnNoConsumers) throws Exception { + boolean defaultPurgeOnNoConsumers) throws Exception { AddressInfo addressInfo = new AddressInfo(new SimpleString(address)); addressInfo.addRoutingType(routingType); servers[node].addOrUpdateAddressInfo(addressInfo); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java index d25f413..661f28e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java @@ -141,7 +141,7 @@ public class JmsProducerTest extends JMSTestBase { public void defaultAutoCreatedQueueConfigTest() throws Exception { final String queueName = "q1"; - server.getAddressSettingsRepository().addMatch(queueName, new AddressSettings().setDefaultMaxConsumers(5).setDefaultDeleteOnNoConsumers(true)); + server.getAddressSettingsRepository().addMatch(queueName, new AddressSettings().setDefaultMaxConsumers(5).setDefaultPurgeOnNoConsumers(true)); Queue q1 = context.createQueue(queueName); @@ -150,14 +150,14 @@ public class JmsProducerTest extends JMSTestBase { org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.toSimpleString(queueName)); assertEquals(5, queue.getMaxConsumers()); - assertEquals(true, queue.isDeleteOnNoConsumers()); + assertEquals(true, queue.isPurgeOnNoConsumers()); } @Test public void defaultAutoCreatedQueueConfigTest2() throws Exception { final String queueName = "q1"; - server.getAddressSettingsRepository().addMatch(queueName, new AddressSettings().setDefaultMaxConsumers(5).setDefaultDeleteOnNoConsumers(true)); + server.getAddressSettingsRepository().addMatch(queueName, new AddressSettings().setDefaultMaxConsumers(5).setDefaultPurgeOnNoConsumers(true)); Connection connection = cf.createConnection(); @@ -168,7 +168,7 @@ public class JmsProducerTest extends JMSTestBase { org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.toSimpleString(queueName)); assertEquals(5, queue.getMaxConsumers()); - assertEquals(true, queue.isDeleteOnNoConsumers()); + assertEquals(true, queue.isPurgeOnNoConsumers()); connection.close(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java index 2e76255..4856b5d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/JmsConsumerTest.java @@ -748,7 +748,7 @@ public class JmsConsumerTest extends JMSTestBase { server.getAddressSettingsRepository() .addMatch(queueName, new AddressSettings() .setDefaultMaxConsumers(5) - .setDefaultDeleteOnNoConsumers(true)); + .setDefaultPurgeOnNoConsumers(true)); Connection connection = cf.createConnection(); @@ -759,7 +759,7 @@ public class JmsConsumerTest extends JMSTestBase { org.apache.activemq.artemis.core.server.Queue queue = server.locateQueue(SimpleString.toSimpleString(queueName)); assertEquals(5, queue.getMaxConsumers()); - assertEquals(true, queue.isDeleteOnNoConsumers()); + assertEquals(true, queue.isPurgeOnNoConsumers()); connection.close(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java index 0e04f5e..4db2c22 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java @@ -259,7 +259,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { SimpleString address = RandomUtil.randomSimpleString(); SimpleString name = RandomUtil.randomSimpleString(); boolean durable = RandomUtil.randomBoolean(); - boolean deleteOnNoConsumers = RandomUtil.randomBoolean(); + boolean purgeOnNoConsumers = RandomUtil.randomBoolean(); boolean autoCreateAddress = true; int maxConsumers = RandomUtil.randomInt(); @@ -267,7 +267,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { checkNoResource(ObjectNameBuilder.DEFAULT.getQueueObjectName(address, name, RoutingType.ANYCAST)); serverControl.createAddress(address.toString(), "ANYCAST"); - serverControl.createQueue(address.toString(), RoutingType.ANYCAST.toString(), name.toString(), null, durable, maxConsumers, deleteOnNoConsumers, autoCreateAddress); + serverControl.createQueue(address.toString(), RoutingType.ANYCAST.toString(), name.toString(), null, durable, maxConsumers, purgeOnNoConsumers, autoCreateAddress); checkResource(ObjectNameBuilder.DEFAULT.getQueueObjectName(address, name, RoutingType.ANYCAST)); QueueControl queueControl = ManagementControlHelper.createQueueControl(address, name, RoutingType.ANYCAST, mbeanServer); @@ -275,7 +275,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { Assert.assertEquals(name.toString(), queueControl.getName()); Assert.assertNull(queueControl.getFilter()); Assert.assertEquals(durable, queueControl.isDurable()); - Assert.assertEquals(deleteOnNoConsumers, queueControl.isDeleteOnNoConsumers()); + Assert.assertEquals(purgeOnNoConsumers, queueControl.isPurgeOnNoConsumers()); Assert.assertEquals(maxConsumers, queueControl.getMaxConsumers()); Assert.assertEquals(false, queueControl.isTemporary());