You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/01/17 19:27:43 UTC
[3/5] activemq-artemis git commit: ARTEMIS-922 Rename
deleteOnNoConsumers throughout
ARTEMIS-922 Rename deleteOnNoConsumers throughout
The name "deleteOnNoConsumers" isn't a good match for the semantics underneath.
The name "purgeOnNoConsumers" (and variants) is a better fit.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8cf94623
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8cf94623
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8cf94623
Branch: refs/heads/master
Commit: 8cf94623a4786336930d98ae211d562a809c3259
Parents: bc8d673
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Jan 17 09:49:32 2017 -0600
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Jan 17 11:40:56 2017 -0600
----------------------------------------------------------------------
.../artemis/cli/commands/queue/CreateQueue.java | 2 +-
.../cli/commands/queue/QueueAbstract.java | 40 ++++++++++----------
.../artemis/cli/commands/queue/UpdateQueue.java | 2 +-
.../config/ActiveMQDefaultConfiguration.java | 6 +--
.../artemis/api/core/client/ClientSession.java | 12 +++---
.../core/management/ActiveMQServerControl.java | 8 ++--
.../api/core/management/QueueControl.java | 2 +-
.../core/client/impl/AddressQueryImpl.java | 10 ++---
.../core/client/impl/ClientSessionImpl.java | 24 ++++++------
.../core/client/impl/QueueQueryImpl.java | 10 ++---
.../core/impl/ActiveMQSessionContext.java | 16 ++++----
.../impl/wireformat/CreateQueueMessage_V2.java | 26 ++++++-------
.../SessionBindingQueryResponseMessage_V4.java | 20 +++++-----
.../SessionQueueQueryResponseMessage_V3.java | 28 +++++++-------
.../artemis/core/server/AddressQueryResult.java | 10 ++---
.../artemis/core/server/QueueQueryResult.java | 10 ++---
.../spi/core/remoting/SessionContext.java | 2 +-
.../jms/client/ActiveMQMessageProducer.java | 2 +-
.../artemis/jms/client/ActiveMQSession.java | 12 +++---
.../jms/server/impl/JMSServerManagerImpl.java | 2 +-
.../artemis/junit/EmbeddedActiveMQResource.java | 2 +-
.../client/HornetQClientSessionContext.java | 2 +-
.../core/config/CoreQueueConfiguration.java | 20 +++++-----
.../deployers/impl/FileConfigurationParser.java | 14 +++----
.../impl/ActiveMQServerControlImpl.java | 12 +++---
.../core/management/impl/QueueControlImpl.java | 4 +-
.../core/persistence/QueueBindingInfo.java | 4 +-
.../journal/AbstractJournalStorageManager.java | 2 +-
.../codec/PersistentQueueBindingEncoding.java | 22 +++++------
.../artemis/core/postoffice/PostOffice.java | 2 +-
.../core/postoffice/impl/PostOfficeImpl.java | 6 +--
.../core/ServerSessionPacketHandler.java | 4 +-
.../artemis/core/server/ActiveMQServer.java | 8 ++--
.../artemis/core/server/BindingQueryResult.java | 10 ++---
.../activemq/artemis/core/server/Queue.java | 4 +-
.../artemis/core/server/QueueConfig.java | 26 ++++++-------
.../artemis/core/server/ServerSession.java | 2 +-
.../core/server/impl/ActiveMQServerImpl.java | 34 ++++++++---------
.../impl/AutoCreatedQueueManagerImpl.java | 2 +-
.../core/server/impl/LastValueQueue.java | 4 +-
.../server/impl/PostOfficeJournalLoader.java | 2 +-
.../core/server/impl/QueueFactoryImpl.java | 6 +--
.../artemis/core/server/impl/QueueImpl.java | 16 ++++----
.../core/server/impl/ServerSessionImpl.java | 10 ++---
.../core/settings/impl/AddressSettings.java | 34 ++++++++---------
.../resources/schema/artemis-configuration.xsd | 7 ++--
.../core/config/impl/FileConfigurationTest.java | 12 +++---
.../impl/ScheduledDeliveryHandlerTest.java | 4 +-
.../core/settings/AddressSettingsTest.java | 2 +-
.../resources/ConfigurationTest-full-config.xml | 8 ++--
.../migrate/config/addressing/Address.java | 2 +-
.../test/resources/artemis-configuration.xsd | 2 +-
.../integration/addressing/AddressingTest.java | 20 +++++-----
.../tests/integration/cli/QueueCommandTest.java | 24 ++++++------
.../integration/client/HangConsumerTest.java | 6 +--
.../cluster/distribution/ClusterTestBase.java | 2 +-
.../tests/integration/jms/JmsProducerTest.java | 8 ++--
.../jms/consumer/JmsConsumerTest.java | 4 +-
.../management/ActiveMQServerControlTest.java | 6 +--
.../ActiveMQServerControlUsingCoreTest.java | 8 ++--
.../management/QueueControlUsingCoreTest.java | 4 +-
.../jms/tests/message/MessageHeaderTest.java | 4 +-
.../activemq/artemis/common/AbstractAdmin.java | 2 +-
.../unit/core/postoffice/impl/FakeQueue.java | 4 +-
.../core/server/impl/fakes/FakePostOffice.java | 2 +-
65 files changed, 314 insertions(+), 313 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/CreateQueue.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/CreateQueue.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/CreateQueue.java
index ba3756d..6e23090 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/CreateQueue.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/CreateQueue.java
@@ -36,7 +36,7 @@ public class CreateQueue extends QueueAbstract {
performCoreManagement(new ManagementCallback<ClientMessage>() {
@Override
public void setUpInvocation(ClientMessage message) throws Exception {
- ManagementHelper.putOperationInvocation(message, "broker", "createQueue", getAddress(true), getRoutingType(), getName(), getFilter(), isDurable(), getMaxConsumers(-1), isDeleteOnNoConsumers(true), isAutoCreateAddress());
+ ManagementHelper.putOperationInvocation(message, "broker", "createQueue", getAddress(true), getRoutingType(), getName(), getFilter(), isDurable(), getMaxConsumers(-1), isPurgeOnNoConsumers(true), isAutoCreateAddress());
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/QueueAbstract.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/QueueAbstract.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/QueueAbstract.java
index 6260648..2ff1b6d 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/QueueAbstract.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/QueueAbstract.java
@@ -37,11 +37,11 @@ public class QueueAbstract extends AbstractAction {
@Option(name = "--no-durable", description = "whether the queue is durable or not (default input)")
private Boolean noDurable;
- @Option(name = "--delete-on-no-consumers", description = "whether to delete this queue when it's last consumers disconnects (default input)")
- private Boolean deleteOnNoConsumers;
+ @Option(name = "--purge-on-no-consumers", description = "whether to delete the contents of this queue when its last consumer disconnects (default input)")
+ private Boolean purgeOnNoConsumers;
- @Option(name = "--keep-on-no-consumers", description = "whether to queue this queue when it's last consumers disconnects (default input)")
- private Boolean keepOnNoConsumers;
+ @Option(name = "--preserve-on-no-consumers", description = "whether to preserve the contents of this queue when its last consumer disconnects (default input)")
+ private Boolean preserveOnNoConsumers;
@Option(name = "--max-consumers", description = "Maximum number of consumers allowed on this queue at any one time (default no limit)")
private Integer maxConsumers;
@@ -97,12 +97,12 @@ public class QueueAbstract extends AbstractAction {
return this;
}
- public boolean isKeepOnNoConsumers() {
- return keepOnNoConsumers;
+ public boolean getPreserveOnNoConsumers() {
+ return preserveOnNoConsumers;
}
- public QueueAbstract setKeepOnNoConsumers(boolean keepOnNoConsumers) {
- this.keepOnNoConsumers = keepOnNoConsumers;
+ public QueueAbstract setPreserveOnNoConsumers(boolean preserveOnNoConsumers) {
+ this.preserveOnNoConsumers = preserveOnNoConsumers;
return this;
}
@@ -165,23 +165,23 @@ public class QueueAbstract extends AbstractAction {
return this;
}
- public Boolean isDeleteOnNoConsumers() {
- return isDeleteOnNoConsumers(false);
+ public Boolean isPurgeOnNoConsumers() {
+ return isPurgeOnNoConsumers(false);
}
- public Boolean isDeleteOnNoConsumers(boolean useInput) {
+ public Boolean isPurgeOnNoConsumers(boolean useInput) {
Boolean value = null;
- if (deleteOnNoConsumers != null) {
- value = deleteOnNoConsumers.booleanValue();
- } else if (keepOnNoConsumers != null) {
- value = !keepOnNoConsumers.booleanValue();
+ if (purgeOnNoConsumers != null) {
+ value = purgeOnNoConsumers.booleanValue();
+ } else if (preserveOnNoConsumers != null) {
+ value = !preserveOnNoConsumers.booleanValue();
}
if (value == null && useInput) {
- value = inputBoolean("--delete-on-no-consumers", "Delete on non consumers", false);
+ value = inputBoolean("--purge-on-no-consumers", "Purge the contents of the queue once there are no consumers", false);
}
if (value == null) {
@@ -189,8 +189,8 @@ public class QueueAbstract extends AbstractAction {
return null;
}
- deleteOnNoConsumers = value.booleanValue();
- keepOnNoConsumers = !value.booleanValue();
+ purgeOnNoConsumers = value.booleanValue();
+ preserveOnNoConsumers = !value.booleanValue();
return value;
}
@@ -199,8 +199,8 @@ public class QueueAbstract extends AbstractAction {
this.maxConsumers = maxConsumers;
}
- public void setDeleteOnNoConsumers(boolean deleteOnNoConsumers) {
- this.deleteOnNoConsumers = deleteOnNoConsumers;
+ public void setPurgeOnNoConsumers(boolean purgeOnNoConsumers) {
+ this.purgeOnNoConsumers = purgeOnNoConsumers;
}
public void setAddress(String address) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/UpdateQueue.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/UpdateQueue.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/UpdateQueue.java
index 23a92a4..9c515bc 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/UpdateQueue.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/queue/UpdateQueue.java
@@ -36,7 +36,7 @@ public class UpdateQueue extends QueueAbstract {
performCoreManagement(new ManagementCallback<ClientMessage>() {
@Override
public void setUpInvocation(ClientMessage message) throws Exception {
- ManagementHelper.putOperationInvocation(message, "broker", "updateQueue", getName(), getRoutingType(), getMaxConsumers(null), isDeleteOnNoConsumers());
+ ManagementHelper.putOperationInvocation(message, "broker", "updateQueue", getName(), getRoutingType(), getMaxConsumers(null), isPurgeOnNoConsumers());
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 55571d4..08068b5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -446,7 +446,7 @@ public final class ActiveMQDefaultConfiguration {
public static final int DEFAULT_MAX_QUEUE_CONSUMERS = -1;
- public static final boolean DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS = false;
+ public static final boolean DEFAULT_PURGE_ON_NO_CONSUMERS = false;
public static final RoutingType DEFAULT_ROUTING_TYPE = RoutingType.MULTICAST;
@@ -1217,8 +1217,8 @@ public final class ActiveMQDefaultConfiguration {
return DEFAULT_MAX_QUEUE_CONSUMERS;
}
- public static boolean getDefaultDeleteQueueOnNoConsumers() {
- return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
+ public static boolean getDefaultPurgeOnNoConsumers() {
+ return DEFAULT_PURGE_ON_NO_CONSUMERS;
}
public static String getInternalNamingPrefix() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
index 3530303..f79f561 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
@@ -71,7 +71,7 @@ public interface ClientSession extends XAResource, AutoCloseable {
*/
boolean isAutoCreateAddresses();
- boolean isDefaultDeleteOnNoConsumers();
+ boolean isDefaultPurgeOnNoConsumers();
int getDefaultMaxConsumers();
}
@@ -135,7 +135,7 @@ public interface ClientSession extends XAResource, AutoCloseable {
int getMaxConsumers();
- boolean isDeleteOnNoConsumers();
+ boolean isPurgeOnNoConsumers();
boolean isAutoCreated();
}
@@ -524,11 +524,11 @@ public interface ClientSession extends XAResource, AutoCloseable {
* @param durable whether the queue is durable or not
* @param autoCreated whether to mark this queue as autoCreated or not
* @param maxConsumers how many concurrent consumers will be allowed on this queue
- * @param deleteOnNoConsumers whether to delete the queue when the last consumer disconnects
+ * @param purgeOnNoConsumers whether to delete the contents of the queue when the last consumer disconnects
* @throws ActiveMQException
*/
void createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter,
- boolean durable, boolean autoCreated, int maxConsumers, boolean deleteOnNoConsumers) throws ActiveMQException;
+ boolean durable, boolean autoCreated, int maxConsumers, boolean purgeOnNoConsumers) throws ActiveMQException;
/**
* Creates a <em>non-temporary</em>queue.
@@ -553,11 +553,11 @@ public interface ClientSession extends XAResource, AutoCloseable {
* @param durable whether the queue is durable or not
* @param autoCreated whether to mark this queue as autoCreated or not
* @param maxConsumers how many concurrent consumers will be allowed on this queue
- * @param deleteOnNoConsumers whether to delete the queue when the last consumer disconnects
+ * @param purgeOnNoConsumers whether to delete the contents of the queue when the last consumer disconnects
* @throws ActiveMQException
*/
void createQueue(String address, RoutingType routingType, String queueName, String filter, boolean durable, boolean autoCreated,
- int maxConsumers, boolean deleteOnNoConsumers) throws ActiveMQException;
+ int maxConsumers, boolean purgeOnNoConsumers) throws ActiveMQException;
/**
* Creates a <em>temporary</em> queue.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index bc68469..6c9fd61 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -565,7 +565,7 @@ public interface ActiveMQServerControl {
* @param filterStr filter of the queue
* @param durable is the queue durable?
* @param maxConsumers the maximum number of consumers allowed on this queue at any one time
- * @param deleteOnNoConsumers delete this queue when the last consumer disconnects
+ * @param purgeOnNoConsumers delete this queue when the last consumer disconnects
* @param autoCreateAddress create an address with default values should a matching address not be found
* @return a textual summary of the queue
* @throws Exception
@@ -576,7 +576,7 @@ public interface ActiveMQServerControl {
@Parameter(name = "filter", desc = "Filter of the queue") String filterStr,
@Parameter(name = "durable", desc = "Is the queue durable?") boolean durable,
@Parameter(name = "maxConsumers", desc = "The maximum number of consumers allowed on this queue at any one time") int maxConsumers,
- @Parameter(name = "deleteOnNoConsumers", desc = "Delete this queue when the last consumer disconnects") boolean deleteOnNoConsumers,
+ @Parameter(name = "purgeOnNoConsumers", desc = "Delete this queue when the last consumer disconnects") boolean purgeOnNoConsumers,
@Parameter(name = "autoCreateAddress", desc = "Create an address with default values should a matching address not be found") boolean autoCreateAddress) throws Exception;
/**
@@ -585,14 +585,14 @@ public interface ActiveMQServerControl {
* @param name name of the queue
* @param routingType the routing type used for this address, {@code MULTICAST} or {@code ANYCAST}
* @param maxConsumers the maximum number of consumers allowed on this queue at any one time
- * @param deleteOnNoConsumers delete this queue when the last consumer disconnects
+ * @param purgeOnNoConsumers delete this queue when the last consumer disconnects
* @return a textual summary of the queue
* @throws Exception
*/
String updateQueue(@Parameter(name = "name", desc = "Name of the queue") String name,
@Parameter(name = "routingType", desc = "The routing type used for this address, MULTICAST or ANYCAST") String routingType,
@Parameter(name = "maxConsumers", desc = "The maximum number of consumers allowed on this queue at any one time") Integer maxConsumers,
- @Parameter(name = "deleteOnNoConsumers", desc = "Delete this queue when the last consumer disconnects") Boolean deleteOnNoConsumers) throws Exception;
+ @Parameter(name = "purgeOnNoConsumers", desc = "Delete this queue when the last consumer disconnects") Boolean purgeOnNoConsumers) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
index 25c154f..ac20798 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
@@ -150,7 +150,7 @@ public interface QueueControl {
*
*/
@Attribute(desc = "delete this queue when the last consumer disconnects")
- boolean isDeleteOnNoConsumers();
+ boolean isPurgeOnNoConsumers();
// Operations ----------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java
index 1692cc6..79e2cc9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/AddressQueryImpl.java
@@ -32,7 +32,7 @@ public class AddressQueryImpl implements ClientSession.AddressQuery {
private final boolean autoCreateAddresses;
- private final boolean defaultDeleteOnNoConsumers;
+ private final boolean defaultPurgeOnNoConsumers;
private final int defaultMaxConsumers;
@@ -40,13 +40,13 @@ public class AddressQueryImpl implements ClientSession.AddressQuery {
final List<SimpleString> queueNames,
final boolean autoCreateQueues,
final boolean autoCreateAddresses,
- final boolean defaultDeleteOnNoConsumers,
+ final boolean defaultPurgeOnNoConsumers,
final int defaultMaxConsumers) {
this.exists = exists;
this.queueNames = new ArrayList<>(queueNames);
this.autoCreateQueues = autoCreateQueues;
this.autoCreateAddresses = autoCreateAddresses;
- this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers;
+ this.defaultPurgeOnNoConsumers = defaultPurgeOnNoConsumers;
this.defaultMaxConsumers = defaultMaxConsumers;
}
@@ -71,8 +71,8 @@ public class AddressQueryImpl implements ClientSession.AddressQuery {
}
@Override
- public boolean isDefaultDeleteOnNoConsumers() {
- return defaultDeleteOnNoConsumers;
+ public boolean isDefaultPurgeOnNoConsumers() {
+ return defaultPurgeOnNoConsumers;
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index fb59237..e8210f4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -368,7 +368,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
durable,
false,
ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(),
- ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(),
+ ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(),
autoCreated);
}
@@ -385,20 +385,20 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void createQueue(final SimpleString address, final RoutingType routingType, final SimpleString queueName, final SimpleString filterString,
- final boolean durable, final boolean autoCreated, final int maxConsumers, final boolean deleteOnNoConsumers) throws ActiveMQException {
+ final boolean durable, final boolean autoCreated, final int maxConsumers, final boolean purgeOnNoConsumers) throws ActiveMQException {
internalCreateQueue(address,
queueName, routingType,
filterString,
durable,
false,
maxConsumers,
- deleteOnNoConsumers,
+ purgeOnNoConsumers,
autoCreated);
}
@Override
public void createQueue(final String address, final RoutingType routingType, final String queueName, final String filterString,
- final boolean durable, final boolean autoCreated, final int maxConsumers, final boolean deleteOnNoConsumers) throws ActiveMQException {
+ final boolean durable, final boolean autoCreated, final int maxConsumers, final boolean purgeOnNoConsumers) throws ActiveMQException {
createQueue(SimpleString.toSimpleString(address),
routingType,
SimpleString.toSimpleString(queueName),
@@ -406,7 +406,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
durable,
autoCreated,
maxConsumers,
- deleteOnNoConsumers);
+ purgeOnNoConsumers);
}
@Override
@@ -432,7 +432,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
false,
true,
ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(),
- ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(),
+ ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(),
false);
}
@@ -458,7 +458,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
durable,
false,
ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(),
- ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(),
+ ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(),
false);
}
@@ -533,7 +533,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
false,
true,
ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(),
- ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(),
+ ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(),
false);
}
@@ -554,7 +554,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
false,
false,
ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(),
- ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(),
+ ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(),
false);
}
@@ -578,7 +578,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
durable,
false,
ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(),
- ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(),
+ ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(),
false);
}
@@ -1823,7 +1823,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
final boolean durable,
final boolean temp,
final int maxConsumers,
- final boolean deleteOnNoConsumers,
+ final boolean purgeOnNoConsumers,
final boolean autoCreated) throws ActiveMQException {
checkClosed();
@@ -1840,7 +1840,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
durable,
temp,
maxConsumers,
- deleteOnNoConsumers,
+ purgeOnNoConsumers,
autoCreated);
} finally {
endCall();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/QueueQueryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/QueueQueryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/QueueQueryImpl.java
index 5afdd8d..80e158f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/QueueQueryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/QueueQueryImpl.java
@@ -44,7 +44,7 @@ public class QueueQueryImpl implements ClientSession.QueueQuery {
private final RoutingType routingType;
- private final boolean deleteOnNoConsumers;
+ private final boolean purgeOnNoConsumers;
private final int maxConsumers;
@@ -82,7 +82,7 @@ public class QueueQueryImpl implements ClientSession.QueueQuery {
final boolean autoCreateQueues,
final int maxConsumers,
final boolean autoCreated,
- final boolean deleteOnNoConsumers,
+ final boolean purgeOnNoConsumers,
final RoutingType routingType) {
this.durable = durable;
this.temporary = temporary;
@@ -95,7 +95,7 @@ public class QueueQueryImpl implements ClientSession.QueueQuery {
this.autoCreateQueues = autoCreateQueues;
this.maxConsumers = maxConsumers;
this.autoCreated = autoCreated;
- this.deleteOnNoConsumers = deleteOnNoConsumers;
+ this.purgeOnNoConsumers = purgeOnNoConsumers;
this.routingType = routingType;
}
@@ -155,8 +155,8 @@ public class QueueQueryImpl implements ClientSession.QueueQuery {
}
@Override
- public boolean isDeleteOnNoConsumers() {
- return deleteOnNoConsumers;
+ public boolean isPurgeOnNoConsumers() {
+ return purgeOnNoConsumers;
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index f77817c..92f291c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -310,19 +310,19 @@ public class ActiveMQSessionContext extends SessionContext {
if (sessionChannel.supports(PacketImpl.SESS_BINDINGQUERY_RESP_V4, getServerVersion())) {
Packet packet = sessionChannel.sendBlocking(new SessionBindingQueryMessage(address), PacketImpl.SESS_BINDINGQUERY_RESP_V4);
SessionBindingQueryResponseMessage_V4 response = (SessionBindingQueryResponseMessage_V4) packet;
- return new AddressQueryImpl(response.isExists(), response.getQueueNames(), response.isAutoCreateQueues(), response.isAutoCreateAddresses(), response.isDefaultDeleteOnNoConsumers(), response.getDefaultMaxConsumers());
+ return new AddressQueryImpl(response.isExists(), response.getQueueNames(), response.isAutoCreateQueues(), response.isAutoCreateAddresses(), response.isDefaultPurgeOnNoConsumers(), response.getDefaultMaxConsumers());
} else if (sessionChannel.supports(PacketImpl.SESS_BINDINGQUERY_RESP_V3, getServerVersion())) {
Packet packet = sessionChannel.sendBlocking(new SessionBindingQueryMessage(address), PacketImpl.SESS_BINDINGQUERY_RESP_V3);
SessionBindingQueryResponseMessage_V3 response = (SessionBindingQueryResponseMessage_V3) packet;
- return new AddressQueryImpl(response.isExists(), response.getQueueNames(), response.isAutoCreateQueues(), response.isAutoCreateAddresses(), ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers());
+ return new AddressQueryImpl(response.isExists(), response.getQueueNames(), response.isAutoCreateQueues(), response.isAutoCreateAddresses(), ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers());
} else if (sessionChannel.supports(PacketImpl.SESS_BINDINGQUERY_RESP_V2, getServerVersion())) {
Packet packet = sessionChannel.sendBlocking(new SessionBindingQueryMessage(address), PacketImpl.SESS_BINDINGQUERY_RESP_V2);
SessionBindingQueryResponseMessage_V2 response = (SessionBindingQueryResponseMessage_V2) packet;
- return new AddressQueryImpl(response.isExists(), response.getQueueNames(), response.isAutoCreateQueues(), false, ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers());
+ return new AddressQueryImpl(response.isExists(), response.getQueueNames(), response.isAutoCreateQueues(), false, ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers());
} else {
Packet packet = sessionChannel.sendBlocking(new SessionBindingQueryMessage(address), PacketImpl.SESS_BINDINGQUERY_RESP);
SessionBindingQueryResponseMessage response = (SessionBindingQueryResponseMessage) packet;
- return new AddressQueryImpl(response.isExists(), response.getQueueNames(), false, false, ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers());
+ return new AddressQueryImpl(response.isExists(), response.getQueueNames(), false, false, ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers());
}
}
@@ -617,7 +617,7 @@ public class ActiveMQSessionContext extends SessionContext {
boolean durable,
boolean temp,
boolean autoCreated) throws ActiveMQException {
- createQueue(address, ActiveMQDefaultConfiguration.getDefaultRoutingType(), queueName, filterString, durable, temp, ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), autoCreated);
+ createQueue(address, ActiveMQDefaultConfiguration.getDefaultRoutingType(), queueName, filterString, durable, temp, ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), autoCreated);
}
@Override
@@ -628,9 +628,9 @@ public class ActiveMQSessionContext extends SessionContext {
boolean durable,
boolean temp,
int maxConsumers,
- boolean deleteOnNoConsumers,
+ boolean purgeOnNoConsumers,
boolean autoCreated) throws ActiveMQException {
- CreateQueueMessage request = new CreateQueueMessage_V2(address, queueName, routingType, filterString, durable, temp, maxConsumers, deleteOnNoConsumers, autoCreated, true);
+ CreateQueueMessage request = new CreateQueueMessage_V2(address, queueName, routingType, filterString, durable, temp, maxConsumers, purgeOnNoConsumers, autoCreated, true);
sessionChannel.sendBlocking(request, PacketImpl.NULL_RESPONSE);
}
@@ -715,7 +715,7 @@ public class ActiveMQSessionContext extends SessionContext {
// they are defined in broker.xml
// This allows e.g. JMS non durable subs and temporary queues to continue to be used after failover
if (!queueInfo.isDurable()) {
- CreateQueueMessage_V2 createQueueRequest = new CreateQueueMessage_V2(queueInfo.getAddress(), queueInfo.getName(), queueInfo.getRoutingType(), queueInfo.getFilterString(), false, queueInfo.isTemporary(), queueInfo.getMaxConsumers(), queueInfo.isDeleteOnNoConsumers(), queueInfo.isAutoCreated(), false);
+ CreateQueueMessage_V2 createQueueRequest = new CreateQueueMessage_V2(queueInfo.getAddress(), queueInfo.getName(), queueInfo.getRoutingType(), queueInfo.getFilterString(), false, queueInfo.isTemporary(), queueInfo.getMaxConsumers(), queueInfo.isPurgeOnNoConsumers(), queueInfo.isAutoCreated(), false);
sendPacketWithoutLock(sessionChannel, createQueueRequest);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
index d9def3c..e78ffb5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
@@ -28,7 +28,7 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
private int maxConsumers;
- private boolean deleteOnNoConsumers;
+ private boolean purgeOnNoConsumers;
public CreateQueueMessage_V2(final SimpleString address,
final SimpleString queueName,
@@ -37,7 +37,7 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
final boolean durable,
final boolean temporary,
final int maxConsumers,
- final boolean deleteOnNoConsumers,
+ final boolean purgeOnNoConsumers,
final boolean autoCreated,
final boolean requiresResponse) {
this();
@@ -51,7 +51,7 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
this.requiresResponse = requiresResponse;
this.routingType = routingType;
this.maxConsumers = maxConsumers;
- this.deleteOnNoConsumers = deleteOnNoConsumers;
+ this.purgeOnNoConsumers = purgeOnNoConsumers;
}
public CreateQueueMessage_V2() {
@@ -66,7 +66,7 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
buff.append(", autoCreated=" + autoCreated);
buff.append(", routingType=" + routingType);
buff.append(", maxConsumers=" + maxConsumers);
- buff.append(", deleteOnNoConsumers=" + deleteOnNoConsumers);
+ buff.append(", purgeOnNoConsumers=" + purgeOnNoConsumers);
buff.append("]");
return buff.toString();
}
@@ -87,12 +87,12 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
this.maxConsumers = maxConsumers;
}
- public boolean isDeleteOnNoConsumers() {
- return deleteOnNoConsumers;
+ public boolean isPurgeOnNoConsumers() {
+ return purgeOnNoConsumers;
}
- public void setDeleteOnNoConsumers(boolean deleteOnNoConsumers) {
- this.deleteOnNoConsumers = deleteOnNoConsumers;
+ public void setPurgeOnNoConsumers(boolean purgeOnNoConsumers) {
+ this.purgeOnNoConsumers = purgeOnNoConsumers;
}
public boolean isAutoCreated() {
@@ -109,7 +109,7 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
buffer.writeBoolean(autoCreated);
buffer.writeByte(routingType == null ? -1 : routingType.getType());
buffer.writeInt(maxConsumers);
- buffer.writeBoolean(deleteOnNoConsumers);
+ buffer.writeBoolean(purgeOnNoConsumers);
}
@Override
@@ -118,7 +118,7 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
autoCreated = buffer.readBoolean();
routingType = RoutingType.getType(buffer.readByte());
maxConsumers = buffer.readInt();
- deleteOnNoConsumers = buffer.readBoolean();
+ purgeOnNoConsumers = buffer.readBoolean();
}
@Override
@@ -128,7 +128,7 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
result = prime * result + (autoCreated ? 1231 : 1237);
result = prime * result + (routingType.getType());
result = prime * result + (maxConsumers);
- result = prime * result + (deleteOnNoConsumers ? 1231 : 1237);
+ result = prime * result + (purgeOnNoConsumers ? 1231 : 1237);
return result;
}
@@ -145,9 +145,9 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
return false;
if (maxConsumers != other.maxConsumers)
return false;
- if (deleteOnNoConsumers != other.deleteOnNoConsumers)
+ if (purgeOnNoConsumers != other.purgeOnNoConsumers)
return false;
- if (deleteOnNoConsumers != other.deleteOnNoConsumers)
+ if (purgeOnNoConsumers != other.purgeOnNoConsumers)
return false;
if (routingType == null) {
if (other.routingType != null)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V4.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V4.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V4.java
index f173504..dc0e958 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V4.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V4.java
@@ -23,7 +23,7 @@ import org.apache.activemq.artemis.api.core.SimpleString;
public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryResponseMessage_V3 {
- private boolean defaultDeleteOnNoConsumers;
+ private boolean defaultPurgeOnNoConsumers;
private int defaultMaxConsumers;
@@ -31,7 +31,7 @@ public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryRe
final List<SimpleString> queueNames,
final boolean autoCreateQueues,
final boolean autoCreateAddresses,
- final boolean defaultDeleteOnNoConsumers,
+ final boolean defaultPurgeOnNoConsumers,
final int defaultMaxConsumers) {
super(SESS_BINDINGQUERY_RESP_V4);
@@ -43,7 +43,7 @@ public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryRe
this.autoCreateAddresses = autoCreateAddresses;
- this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers;
+ this.defaultPurgeOnNoConsumers = defaultPurgeOnNoConsumers;
this.defaultMaxConsumers = defaultMaxConsumers;
}
@@ -52,8 +52,8 @@ public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryRe
super(SESS_BINDINGQUERY_RESP_V4);
}
- public boolean isDefaultDeleteOnNoConsumers() {
- return defaultDeleteOnNoConsumers;
+ public boolean isDefaultPurgeOnNoConsumers() {
+ return defaultPurgeOnNoConsumers;
}
public int getDefaultMaxConsumers() {
@@ -63,14 +63,14 @@ public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryRe
@Override
public void encodeRest(final ActiveMQBuffer buffer) {
super.encodeRest(buffer);
- buffer.writeBoolean(defaultDeleteOnNoConsumers);
+ buffer.writeBoolean(defaultPurgeOnNoConsumers);
buffer.writeInt(defaultMaxConsumers);
}
@Override
public void decodeRest(final ActiveMQBuffer buffer) {
super.decodeRest(buffer);
- defaultDeleteOnNoConsumers = buffer.readBoolean();
+ defaultPurgeOnNoConsumers = buffer.readBoolean();
defaultMaxConsumers = buffer.readInt();
}
@@ -78,7 +78,7 @@ public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryRe
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
- result = prime * result + (defaultDeleteOnNoConsumers ? 1231 : 1237);
+ result = prime * result + (defaultPurgeOnNoConsumers ? 1231 : 1237);
result = prime * result + defaultMaxConsumers;
return result;
}
@@ -93,7 +93,7 @@ public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryRe
@Override
public String getParentString() {
StringBuffer buff = new StringBuffer(super.getParentString());
- buff.append(", defaultDeleteOnNoConsumers=" + defaultDeleteOnNoConsumers);
+ buff.append(", defaultPurgeOnNoConsumers=" + defaultPurgeOnNoConsumers);
buff.append(", defaultMaxConsumers=" + defaultMaxConsumers);
return buff.toString();
}
@@ -107,7 +107,7 @@ public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryRe
if (!(obj instanceof SessionBindingQueryResponseMessage_V4))
return false;
SessionBindingQueryResponseMessage_V4 other = (SessionBindingQueryResponseMessage_V4) obj;
- if (defaultDeleteOnNoConsumers != other.defaultDeleteOnNoConsumers)
+ if (defaultPurgeOnNoConsumers != other.defaultPurgeOnNoConsumers)
return false;
if (defaultMaxConsumers != other.defaultMaxConsumers)
return false;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V3.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V3.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V3.java
index b3664da..15ca421 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V3.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V3.java
@@ -27,14 +27,14 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
protected boolean autoCreated;
- protected boolean deleteOnNoConsumers;
+ protected boolean purgeOnNoConsumers;
protected RoutingType routingType;
protected int maxConsumers;
public SessionQueueQueryResponseMessage_V3(final QueueQueryResult result) {
- this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists(), result.isAutoCreateQueues(), result.isAutoCreated(), result.isDeleteOnNoConsumers(), result.getRoutingType(), result.getMaxConsumers());
+ this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists(), result.isAutoCreateQueues(), result.isAutoCreated(), result.isPurgeOnNoConsumers(), result.getRoutingType(), result.getMaxConsumers());
}
public SessionQueueQueryResponseMessage_V3() {
@@ -51,7 +51,7 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
final boolean exists,
final boolean autoCreateQueues,
final boolean autoCreated,
- final boolean deleteOnNoConsumers,
+ final boolean purgeOnNoConsumers,
final RoutingType routingType,
final int maxConsumers) {
super(SESS_QUEUEQUERY_RESP_V3);
@@ -76,7 +76,7 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
this.autoCreated = autoCreated;
- this.deleteOnNoConsumers = deleteOnNoConsumers;
+ this.purgeOnNoConsumers = purgeOnNoConsumers;
this.routingType = routingType;
@@ -91,12 +91,12 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
this.autoCreated = autoCreated;
}
- public boolean isDeleteOnNoConsumers() {
- return deleteOnNoConsumers;
+ public boolean isPurgeOnNoConsumers() {
+ return purgeOnNoConsumers;
}
- public void setDeleteOnNoConsumers(boolean deleteOnNoConsumers) {
- this.deleteOnNoConsumers = deleteOnNoConsumers;
+ public void setPurgeOnNoConsumers(boolean purgeOnNoConsumers) {
+ this.purgeOnNoConsumers = purgeOnNoConsumers;
}
public RoutingType getRoutingType() {
@@ -119,7 +119,7 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
public void encodeRest(final ActiveMQBuffer buffer) {
super.encodeRest(buffer);
buffer.writeBoolean(autoCreated);
- buffer.writeBoolean(deleteOnNoConsumers);
+ buffer.writeBoolean(purgeOnNoConsumers);
buffer.writeByte(routingType.getType());
buffer.writeInt(maxConsumers);
}
@@ -128,7 +128,7 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
public void decodeRest(final ActiveMQBuffer buffer) {
super.decodeRest(buffer);
autoCreated = buffer.readBoolean();
- deleteOnNoConsumers = buffer.readBoolean();
+ purgeOnNoConsumers = buffer.readBoolean();
routingType = RoutingType.getType(buffer.readByte());
maxConsumers = buffer.readInt();
}
@@ -138,7 +138,7 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
final int prime = 31;
int result = super.hashCode();
result = prime * result + (autoCreated ? 1231 : 1237);
- result = prime * result + (deleteOnNoConsumers ? 1231 : 1237);
+ result = prime * result + (purgeOnNoConsumers ? 1231 : 1237);
result = prime * result + routingType.hashCode();
result = prime * result + maxConsumers;
return result;
@@ -155,7 +155,7 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
public String getParentString() {
StringBuffer buff = new StringBuffer(super.getParentString());
buff.append(", autoCreated=" + autoCreated);
- buff.append(", deleteOnNoConsumers=" + deleteOnNoConsumers);
+ buff.append(", purgeOnNoConsumers=" + purgeOnNoConsumers);
buff.append(", routingType=" + routingType);
buff.append(", maxConsumers=" + maxConsumers);
return buff.toString();
@@ -163,7 +163,7 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
@Override
public ClientSession.QueueQuery toQueueQuery() {
- return new QueueQueryImpl(isDurable(), isTemporary(), getConsumerCount(), getMessageCount(), getFilterString(), getAddress(), getName(), isExists(), isAutoCreateQueues(), getMaxConsumers(), isAutoCreated(), isDeleteOnNoConsumers(), getRoutingType());
+ return new QueueQueryImpl(isDurable(), isTemporary(), getConsumerCount(), getMessageCount(), getFilterString(), getAddress(), getName(), isExists(), isAutoCreateQueues(), getMaxConsumers(), isAutoCreated(), isPurgeOnNoConsumers(), getRoutingType());
}
@Override
@@ -177,7 +177,7 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
SessionQueueQueryResponseMessage_V3 other = (SessionQueueQueryResponseMessage_V3) obj;
if (autoCreated != other.autoCreated)
return false;
- if (deleteOnNoConsumers != other.deleteOnNoConsumers)
+ if (purgeOnNoConsumers != other.purgeOnNoConsumers)
return false;
if (routingType == null) {
if (other.routingType != null)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java
index a3bb034..6603f8f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java
@@ -28,10 +28,10 @@ public class AddressQueryResult {
private final boolean autoCreated;
private final boolean exists;
private final boolean autoCreateAddresses;
- private final boolean defaultDeleteOnNoConsumers;
+ private final boolean defaultPurgeOnNoConsumers;
private final int defaultMaxConsumers;
- public AddressQueryResult(SimpleString name, Set<RoutingType> routingTypes, long id, boolean autoCreated, boolean exists, boolean autoCreateAddresses, boolean defaultDeleteOnNoConsumers, int defaultMaxConsumers) {
+ public AddressQueryResult(SimpleString name, Set<RoutingType> routingTypes, long id, boolean autoCreated, boolean exists, boolean autoCreateAddresses, boolean defaultPurgeOnNoConsumers, int defaultMaxConsumers) {
this.name = name;
this.routingTypes = routingTypes;
@@ -40,7 +40,7 @@ public class AddressQueryResult {
this.autoCreated = autoCreated;
this.exists = exists;
this.autoCreateAddresses = autoCreateAddresses;
- this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers;
+ this.defaultPurgeOnNoConsumers = defaultPurgeOnNoConsumers;
this.defaultMaxConsumers = defaultMaxConsumers;
}
@@ -68,8 +68,8 @@ public class AddressQueryResult {
return autoCreateAddresses;
}
- 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-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
index de14888..ac7ba55 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
@@ -40,7 +40,7 @@ public class QueueQueryResult {
private boolean autoCreated;
- private boolean deleteOnNoConsumers;
+ private boolean purgeOnNoConsumers;
private RoutingType routingType;
@@ -56,7 +56,7 @@ public class QueueQueryResult {
final boolean autoCreateQueues,
final boolean exists,
final boolean autoCreated,
- final boolean deleteOnNoConsumers,
+ final boolean purgeOnNoConsumers,
final RoutingType routingType,
final int maxConsumers) {
this.durable = durable;
@@ -79,7 +79,7 @@ public class QueueQueryResult {
this.autoCreated = autoCreated;
- this.deleteOnNoConsumers = deleteOnNoConsumers;
+ this.purgeOnNoConsumers = purgeOnNoConsumers;
this.routingType = routingType;
@@ -126,8 +126,8 @@ public class QueueQueryResult {
return autoCreated;
}
- public boolean isDeleteOnNoConsumers() {
- return deleteOnNoConsumers;
+ public boolean isPurgeOnNoConsumers() {
+ return purgeOnNoConsumers;
}
public RoutingType getRoutingType() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
index 79635d9..28eb34a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
@@ -203,7 +203,7 @@ public abstract class SessionContext {
boolean durable,
boolean temp,
int maxConsumers,
- boolean deleteOnNoConsumers,
+ boolean purgeOnNoConsumers,
boolean autoCreated) throws ActiveMQException;
public abstract ClientSession.QueueQuery queueQuery(SimpleString queueName) throws ActiveMQException;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index e8d1171..aa30264 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
@@ -412,7 +412,7 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To
// TODO is it right to use the address for the queue name here?
clientSession.createTemporaryQueue(address, RoutingType.ANYCAST, address);
} else {
- clientSession.createQueue(address, RoutingType.ANYCAST, address, null, true, true, query.getDefaultMaxConsumers(), query.isDefaultDeleteOnNoConsumers());
+ clientSession.createQueue(address, RoutingType.ANYCAST, address, null, true, true, query.getDefaultMaxConsumers(), query.isDefaultPurgeOnNoConsumers());
}
} else if (!destination.isQueue() && query.isAutoCreateAddresses()) {
clientSession.createAddress(address, RoutingType.MULTICAST, true);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 4b89817..efba9cd 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -303,9 +303,9 @@ public class ActiveMQSession implements QueueSession, TopicSession {
if (!response.isExists()) {
try {
if (jbd.isQueue() && response.isAutoCreateQueues()) {
- // perhaps just relying on the broker to do it is simplest (i.e. deleteOnNoConsumers)
+ // perhaps just relying on the broker to do it is simplest (i.e. purgeOnNoConsumers)
session.createAddress(jbd.getSimpleAddress(), RoutingType.ANYCAST, true);
- session.createQueue(jbd.getSimpleAddress(), RoutingType.ANYCAST, jbd.getSimpleAddress(), null, true, true, response.getDefaultMaxConsumers(), response.isDefaultDeleteOnNoConsumers());
+ session.createQueue(jbd.getSimpleAddress(), RoutingType.ANYCAST, jbd.getSimpleAddress(), null, true, true, response.getDefaultMaxConsumers(), response.isDefaultPurgeOnNoConsumers());
} else if (!jbd.isQueue() && response.isAutoCreateAddresses()) {
session.createAddress(jbd.getSimpleAddress(), RoutingType.MULTICAST, true);
} else {
@@ -667,7 +667,7 @@ public class ActiveMQSession implements QueueSession, TopicSession {
if (!response.isExists() || !response.getQueueNames().contains(dest.getSimpleAddress())) {
if (response.isAutoCreateQueues()) {
try {
- session.createQueue(dest.getSimpleAddress(), RoutingType.ANYCAST, dest.getSimpleAddress(), null, true, true, response.getDefaultMaxConsumers(), response.isDefaultDeleteOnNoConsumers());
+ session.createQueue(dest.getSimpleAddress(), RoutingType.ANYCAST, dest.getSimpleAddress(), null, true, true, response.getDefaultMaxConsumers(), response.isDefaultPurgeOnNoConsumers());
} catch (ActiveMQQueueExistsException e) {
// The queue was created by another client/admin between the query check and send create queue packet
}
@@ -724,7 +724,7 @@ public class ActiveMQSession implements QueueSession, TopicSession {
if (!subResponse.isExists()) {
// durable subscription queues are not technically considered to be auto-created
- session.createQueue(dest.getSimpleAddress(), RoutingType.MULTICAST, queueName, coreFilterString, true, false, response.getDefaultMaxConsumers(), response.isDefaultDeleteOnNoConsumers());
+ session.createQueue(dest.getSimpleAddress(), RoutingType.MULTICAST, queueName, coreFilterString, true, false, response.getDefaultMaxConsumers(), response.isDefaultPurgeOnNoConsumers());
} else {
// Already exists
if (subResponse.getConsumerCount() > 0) {
@@ -755,7 +755,7 @@ public class ActiveMQSession implements QueueSession, TopicSession {
session.deleteQueue(queueName);
// Create the new one
- session.createQueue(dest.getSimpleAddress(), RoutingType.MULTICAST, queueName, coreFilterString, true, false, response.getDefaultMaxConsumers(), response.isDefaultDeleteOnNoConsumers());
+ session.createQueue(dest.getSimpleAddress(), RoutingType.MULTICAST, queueName, coreFilterString, true, false, response.getDefaultMaxConsumers(), response.isDefaultPurgeOnNoConsumers());
}
}
@@ -817,7 +817,7 @@ public class ActiveMQSession implements QueueSession, TopicSession {
AddressQuery response = session.addressQuery(new SimpleString(activeMQDestination.getAddress()));
if (!response.isExists()) {
if (response.isAutoCreateQueues()) {
- session.createQueue(activeMQDestination.getSimpleAddress(), RoutingType.ANYCAST, activeMQDestination.getSimpleAddress(), null, true, true, response.getDefaultMaxConsumers(), response.isDefaultDeleteOnNoConsumers());
+ session.createQueue(activeMQDestination.getSimpleAddress(), RoutingType.ANYCAST, activeMQDestination.getSimpleAddress(), null, true, true, response.getDefaultMaxConsumers(), response.isDefaultPurgeOnNoConsumers());
} else {
throw new InvalidDestinationException("Destination " + activeMQDestination.getName() + " does not exist");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 6e73227..0119f0b 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1078,7 +1078,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
server.addOrUpdateAddressInfo(new AddressInfo(SimpleString.toSimpleString(queueName)).addRoutingType(RoutingType.ANYCAST));
AddressSettings as = server.getAddressSettingsRepository().getMatch(queueName);
- server.createQueue(SimpleString.toSimpleString(queueName), RoutingType.ANYCAST, SimpleString.toSimpleString(queueName), SimpleString.toSimpleString(coreFilterString), null, durable, false, true, false, false, as.getDefaultMaxConsumers(), as.isDefaultDeleteOnNoConsumers(), as.isAutoCreateAddresses());
+ server.createQueue(SimpleString.toSimpleString(queueName), RoutingType.ANYCAST, SimpleString.toSimpleString(queueName), SimpleString.toSimpleString(coreFilterString), null, durable, false, true, false, false, as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), as.isAutoCreateAddresses());
queues.put(queueName, ActiveMQDestination.createQueue(queueName));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
----------------------------------------------------------------------
diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
index fb425d7..08dceb2 100644
--- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
+++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
@@ -361,7 +361,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
boolean temporary = false;
Queue queue = null;
try {
- queue = server.getActiveMQServer().createQueue(address, RoutingType.MULTICAST, name, filter, isUseDurableQueue(), temporary, server.getActiveMQServer().getAddressSettingsRepository().getMatch(address.toString()).getDefaultMaxConsumers(), server.getActiveMQServer().getAddressSettingsRepository().getMatch(address.toString()).isDefaultDeleteOnNoConsumers(), true);
+ queue = server.getActiveMQServer().createQueue(address, RoutingType.MULTICAST, name, filter, isUseDurableQueue(), temporary, server.getActiveMQServer().getAddressSettingsRepository().getMatch(address.toString()).getDefaultMaxConsumers(), server.getActiveMQServer().getAddressSettingsRepository().getMatch(address.toString()).isDefaultPurgeOnNoConsumers(), true);
} catch (Exception ex) {
throw new EmbeddedActiveMQResourceException(String.format("Failed to create queue: queueName = %s, name = %s", address.toString(), name.toString()), ex);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
index 1aad1e4..185feaf 100644
--- a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
+++ b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
@@ -72,7 +72,7 @@ public class HornetQClientSessionContext extends ActiveMQSessionContext {
public ClientSession.AddressQuery addressQuery(final SimpleString address) throws ActiveMQException {
SessionBindingQueryResponseMessage response = (SessionBindingQueryResponseMessage) getSessionChannel().sendBlocking(new SessionBindingQueryMessage(address), PacketImpl.SESS_BINDINGQUERY_RESP);
- return new AddressQueryImpl(response.isExists(), response.getQueueNames(), false, false, ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers());
+ return new AddressQueryImpl(response.isExists(), response.getQueueNames(), false, false, ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(), ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers());
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
index 9e0087b..c8bf6df 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
@@ -35,7 +35,7 @@ public class CoreQueueConfiguration implements Serializable {
private Integer maxConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers();
- private Boolean deleteOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers();
+ private Boolean purgeOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers();
private RoutingType routingType = ActiveMQDefaultConfiguration.getDefaultRoutingType();
@@ -99,15 +99,15 @@ public class CoreQueueConfiguration implements Serializable {
}
/**
- * @param deleteOnNoConsumers delete this queue when consumer count reaches 0, default is false
+ * @param purgeOnNoConsumers delete this queue when consumer count reaches 0, default is false
*/
- public CoreQueueConfiguration setDeleteOnNoConsumers(Boolean deleteOnNoConsumers) {
- this.deleteOnNoConsumers = deleteOnNoConsumers;
+ public CoreQueueConfiguration setPurgeOnNoConsumers(Boolean purgeOnNoConsumers) {
+ this.purgeOnNoConsumers = purgeOnNoConsumers;
return this;
}
- public boolean getDeleteOnNoConsumers() {
- return deleteOnNoConsumers;
+ public boolean getPurgeOnNoConsumers() {
+ return purgeOnNoConsumers;
}
public int getMaxConsumers() {
@@ -132,7 +132,7 @@ public class CoreQueueConfiguration implements Serializable {
result = prime * result + ((filterString == null) ? 0 : filterString.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + ((maxConsumers == null) ? 0 : maxConsumers.hashCode());
- result = prime * result + ((deleteOnNoConsumers == null) ? 0 : deleteOnNoConsumers.hashCode());
+ result = prime * result + ((purgeOnNoConsumers == null) ? 0 : purgeOnNoConsumers.hashCode());
return result;
}
@@ -167,10 +167,10 @@ public class CoreQueueConfiguration implements Serializable {
return false;
} else if (!maxConsumers.equals(other.maxConsumers))
return false;
- if (deleteOnNoConsumers == null) {
- if (other.deleteOnNoConsumers != null)
+ if (purgeOnNoConsumers == null) {
+ if (other.purgeOnNoConsumers != null)
return false;
- } else if (!deleteOnNoConsumers.equals(other.deleteOnNoConsumers)) {
+ } else if (!purgeOnNoConsumers.equals(other.purgeOnNoConsumers)) {
return false;
}
return true;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index 3400a8c..dff6f1b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -185,7 +185,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
private static final String AUTO_DELETE_ADDRESSES = "auto-delete-addresses";
- private static final String DEFAULT_DELETE_ON_NO_CONSUMERS = "default-delete-on-no-consumers";
+ private static final String DEFAULT_PURGE_ON_NO_CONSUMERS = "default-purge-on-no-consumers";
private static final String DEFAULT_MAX_CONSUMERS = "default-max-consumers";
@@ -889,8 +889,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
addressSettings.setAutoDeleteAddresses(XMLUtil.parseBoolean(child));
} else if (MANAGEMENT_BROWSE_PAGE_SIZE.equalsIgnoreCase(name)) {
addressSettings.setManagementBrowsePageSize(XMLUtil.parseInt(child));
- } else if (DEFAULT_DELETE_ON_NO_CONSUMERS.equalsIgnoreCase(name)) {
- addressSettings.setDefaultDeleteOnNoConsumers(XMLUtil.parseBoolean(child));
+ } else if (DEFAULT_PURGE_ON_NO_CONSUMERS.equalsIgnoreCase(name)) {
+ addressSettings.setDefaultPurgeOnNoConsumers(XMLUtil.parseBoolean(child));
} else if (DEFAULT_MAX_CONSUMERS.equalsIgnoreCase(name)) {
addressSettings.setDefaultMaxConsumers(XMLUtil.parseInt(child));
} else if (DEFAULT_QUEUE_ROUTING_TYPE.equalsIgnoreCase(name)) {
@@ -937,7 +937,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
String filterString = null;
boolean durable = true;
int maxConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers();
- boolean deleteOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers();
+ boolean purgeOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers();
NamedNodeMap attributes = node.getAttributes();
for (int i = 0; i < attributes.getLength(); i++) {
@@ -945,8 +945,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
if (item.getNodeName().equals("max-consumers")) {
maxConsumers = Integer.parseInt(item.getNodeValue());
Validators.MAX_QUEUE_CONSUMERS.validate(name, maxConsumers);
- } else if (item.getNodeName().equals("delete-on-no-consumers")) {
- deleteOnNoConsumers = Boolean.parseBoolean(item.getNodeValue());
+ } else if (item.getNodeName().equals("purge-on-no-consumers")) {
+ purgeOnNoConsumers = Boolean.parseBoolean(item.getNodeValue());
}
}
@@ -963,7 +963,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
}
}
- return new CoreQueueConfiguration().setAddress(address).setName(name).setFilterString(filterString).setDurable(durable).setMaxConsumers(maxConsumers).setDeleteOnNoConsumers(deleteOnNoConsumers);
+ return new CoreQueueConfiguration().setAddress(address).setName(name).setFilterString(filterString).setDurable(durable).setMaxConsumers(maxConsumers).setPurgeOnNoConsumers(purgeOnNoConsumers);
}
protected CoreAddressConfiguration parseAddressConfiguration(final Node node) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index e20a74c..271d3e0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -605,7 +605,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
if (maxConsumers != Queue.MAX_CONSUMERS_UNLIMITED) {
output.append(", maxConsumers=").append(queue.getMaxConsumers());
}
- output.append(", deleteOnNoConsumers=").append(queue.isDeleteOnNoConsumers());
+ output.append(", purgeOnNoConsumers=").append(queue.isPurgeOnNoConsumers());
output.append(", autoCreateAddress=").append(queue.isAutoCreated());
output.append(']');
return output;
@@ -725,7 +725,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public void createQueue(final String address, final String name, final String filterStr, final boolean durable, final String routingType) throws Exception {
AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch(address);
- createQueue(address, routingType, name, filterStr, durable, addressSettings.getDefaultMaxConsumers(), addressSettings.isDefaultDeleteOnNoConsumers(), addressSettings.isAutoCreateAddresses());
+ createQueue(address, routingType, name, filterStr, durable, addressSettings.getDefaultMaxConsumers(), addressSettings.isDefaultPurgeOnNoConsumers(), addressSettings.isAutoCreateAddresses());
}
@Override
@@ -735,7 +735,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
String filterStr,
boolean durable,
int maxConsumers,
- boolean deleteOnNoConsumers,
+ boolean purgeOnNoConsumers,
boolean autoCreateAddress) throws Exception {
checkStarted();
@@ -747,7 +747,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
filter = new SimpleString(filterStr);
}
- final Queue queue = server.createQueue(SimpleString.toSimpleString(address), RoutingType.valueOf(routingType.toUpperCase()), new SimpleString(name), filter, durable, false, maxConsumers, deleteOnNoConsumers, autoCreateAddress);
+ final Queue queue = server.createQueue(SimpleString.toSimpleString(address), RoutingType.valueOf(routingType.toUpperCase()), new SimpleString(name), filter, durable, false, maxConsumers, purgeOnNoConsumers, autoCreateAddress);
return QueueTextFormatter.Long.format(queue, new StringBuilder()).toString();
} finally {
blockOnIO();
@@ -758,13 +758,13 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
public String updateQueue(String name,
String routingType,
Integer maxConsumers,
- Boolean deleteOnNoConsumers) throws Exception {
+ Boolean purgeOnNoConsumers) throws Exception {
checkStarted();
clearIO();
try {
- final Queue queue = server.updateQueue(name, routingType != null ? RoutingType.valueOf(routingType) : null, maxConsumers, deleteOnNoConsumers);
+ final Queue queue = server.updateQueue(name, routingType != null ? RoutingType.valueOf(routingType) : null, maxConsumers, purgeOnNoConsumers);
if (queue == null) {
throw ActiveMQMessageBundle.BUNDLE.noSuchQueue(new SimpleString(name));
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index c303b1f..1aa6206 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -344,12 +344,12 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
}
@Override
- public boolean isDeleteOnNoConsumers() {
+ public boolean isPurgeOnNoConsumers() {
checkStarted();
clearIO();
try {
- return queue.isDeleteOnNoConsumers();
+ return queue.isPurgeOnNoConsumers();
} finally {
blockOnIO();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java
index 29f4277..7164cc1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java
@@ -50,9 +50,9 @@ public interface QueueBindingInfo {
void setMaxConsumers(int maxConsumers);
- boolean isDeleteOnNoConsumers();
+ boolean isPurgeOnNoConsumers();
- void setDeleteOnNoConsumers(boolean deleteOnNoConsumers);
+ void setPurgeOnNoConsumers(boolean purgeOnNoConsumers);
byte getRoutingType();
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/AbstractJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index 15083e8..2708c72 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -1221,7 +1221,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
SimpleString filterString = filter == null ? null : filter.getFilterString();
- PersistentQueueBindingEncoding bindingEncoding = new PersistentQueueBindingEncoding(queue.getName(), binding.getAddress(), filterString, queue.getUser(), queue.isAutoCreated(), queue.getMaxConsumers(), queue.isDeleteOnNoConsumers(), queue.getRoutingType().getType());
+ PersistentQueueBindingEncoding bindingEncoding = new PersistentQueueBindingEncoding(queue.getName(), binding.getAddress(), filterString, queue.getUser(), queue.isAutoCreated(), queue.getMaxConsumers(), queue.isPurgeOnNoConsumers(), queue.getRoutingType().getType());
readLock();
try {