activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/5] activemq-artemis git commit: ARTEMIS-922 Rename deleteOnNoConsumers throughout
Date Tue, 17 Jan 2017 19:27:41 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master bc8d673e8 -> a79094b6e


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/ActiveMQServerControlUsingCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
index f606035..d2ebe8d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
@@ -113,17 +113,17 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
                                    String filterStr,
                                    boolean durable,
                                    int maxConsumers,
-                                   boolean deleteOnNoConsumers,
+                                   boolean purgeOnNoConsumers,
                                    boolean autoCreateAddress) throws Exception {
-            return (String) proxy.invokeOperation("createQueue", address, routingType, name,
filterStr, durable, maxConsumers, deleteOnNoConsumers, autoCreateAddress);
+            return (String) proxy.invokeOperation("createQueue", address, routingType, name,
filterStr, durable, maxConsumers, purgeOnNoConsumers, autoCreateAddress);
          }
 
          @Override
          public 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
{
-            return (String) proxy.invokeOperation("updateQueue", name, routingType, maxConsumers,
deleteOnNoConsumers);
+                                   @Parameter(name = "purgeOnNoConsumers", desc = "Delete
this queue when the last consumer disconnects") Boolean purgeOnNoConsumers) throws Exception
{
+            return (String) proxy.invokeOperation("updateQueue", name, routingType, maxConsumers,
purgeOnNoConsumers);
          }
 
          @Override

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/QueueControlUsingCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
index 34a6e4f..a389d65 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlUsingCoreTest.java
@@ -87,8 +87,8 @@ public class QueueControlUsingCoreTest extends QueueControlTest {
          }
 
          @Override
-         public boolean isDeleteOnNoConsumers() {
-            return (Boolean) proxy.retrieveAttributeValue("deleteOnNoConsumers");
+         public boolean isPurgeOnNoConsumers() {
+            return (Boolean) proxy.retrieveAttributeValue("purgeOnNoConsumers");
          }
 
          @Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
index 4bf8950..159bf6e 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
@@ -1013,7 +1013,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
                               boolean durable,
                               boolean autoCreated,
                               int maxConsumers,
-                              boolean deleteOnNoConsumers) throws ActiveMQException {
+                              boolean purgeOnNoConsumers) throws ActiveMQException {
 
       }
 
@@ -1043,7 +1043,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
                               boolean durable,
                               boolean autoCreated,
                               int maxConsumers,
-                              boolean deleteOnNoConsumers) throws ActiveMQException {
+                              boolean purgeOnNoConsumers) throws ActiveMQException {
 
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/AbstractAdmin.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/AbstractAdmin.java
b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/AbstractAdmin.java
index bcff21b..372458c 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/AbstractAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/AbstractAdmin.java
@@ -120,7 +120,7 @@ public class AbstractAdmin implements Admin {
    public void createQueue(final String name) {
       Boolean result;
       try {
-         invokeSyncOperation(ResourceNames.BROKER, "createQueue", name, RoutingType.ANYCAST.toString(),
name, null, true, ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(),
true);
+         invokeSyncOperation(ResourceNames.BROKER, "createQueue", name, RoutingType.ANYCAST.toString(),
name, null, true, ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(), ActiveMQDefaultConfiguration.getDefaultPurgeOnNoConsumers(),
true);
       } catch (Exception e) {
          throw new IllegalStateException(e);
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
index bc7d61a..ef7355e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
@@ -39,7 +39,7 @@ import org.apache.activemq.artemis.utils.ReferenceCounter;
 public class FakeQueue implements Queue {
 
    @Override
-   public void setDeleteOnNoConsumers(boolean value) {
+   public void setPurgeOnNoConsumers(boolean value) {
 
    }
 
@@ -455,7 +455,7 @@ public class FakeQueue implements Queue {
    }
 
    @Override
-   public boolean isDeleteOnNoConsumers() {
+   public boolean isPurgeOnNoConsumers() {
       return false;
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cf94623/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
index fdd4438..a9b3367 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
@@ -46,7 +46,7 @@ public class FakePostOffice implements PostOffice {
    public QueueBinding updateQueue(SimpleString name,
                                    RoutingType routingType,
                                    Integer maxConsumers,
-                                   Boolean deleteOnNoConsumers) throws Exception {
+                                   Boolean purgeOnNoConsumers) throws Exception {
       return null;
    }
 


Mime
View raw message