QPID-5081 : [Java Broker] Refactor Queue Creation

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1515079 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 93 insertions, 121 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
index 602bdb66b5..c9f3aca91f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
@@ -97,7 +97,7 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
 
         String clientID = _connection.getClientID();
         assertNotNull("clientID should not be null", clientID);
-        
+
         validateQueueProperties(results, false, false, clientID);
     }
 
@@ -256,7 +256,7 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
 
         validateQueueProperties(results, true, true, null);
     }
-    
+
     private List<String> waitForMesssage() throws IOException
     {
         // Validation
@@ -267,14 +267,14 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
 
         // Only 1 Queue message should hav been logged
         assertEquals("Result set size not as expected", 1, results.size());
-        
+
         return results;
     }
 
     public void validateQueueProperties(List<String> results, boolean hasPriority, boolean hasAutodelete, String clientID)
     {
         String log = getLogMessage(results, 0);
-        
+
         // Message Should be a QUE-1001
         validateMessageID("QUE-1001", log);
 
@@ -290,7 +290,7 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
                 fromMessage(log).contains("Priority: " + PRIORITIES));
 
         // Queue is AutoDelete
-        assertEquals("Unexpected AutoDelete status:" + fromMessage(log), hasAutodelete, 
+        assertEquals("Unexpected AutoDelete status:" + fromMessage(log), hasAutodelete,
                 fromMessage(log).contains("AutoDelete"));
 
         if(clientID != null)
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
index 14dee60124..844e3ecc11 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
@@ -336,7 +336,7 @@ public class SortedQueueTest extends QpidBrokerTestCase
     private Queue createQueue() throws AMQException, JMSException
     {
         final Map<String, Object> arguments = new HashMap<String, Object>();
-        arguments.put(AMQQueueFactory.QPID_QUEUE_SORT_KEY, TEST_SORT_KEY);
+        arguments.put(QueueArgumentsConverter.QPID_QUEUE_SORT_KEY, TEST_SORT_KEY);
         ((AMQSession<?,?>) _producerSession).createQueue(new AMQShortString(getTestQueueName()), false, true, false, arguments);
         final Queue queue = new AMQQueue("amq.direct", getTestQueueName());
         ((AMQSession<?,?>) _producerSession).declareAndBind((AMQDestination) queue);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
index a3551b8952..a57eca23bd 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.store;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
 import org.apache.qpid.AMQException;
@@ -38,6 +39,7 @@ import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.DirectExchange;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.exchange.TopicExchange;
+import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.protocol.v0_8.AMQMessage;
 import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
 import org.apache.qpid.server.model.Broker;
@@ -49,7 +51,7 @@ import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.ConflationQueue;
 import org.apache.qpid.server.protocol.v0_8.IncomingMessage;
-import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.queue.SimpleAMQQueue;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
@@ -83,17 +85,17 @@ public class MessageStoreTest extends QpidTestCase
     private String directExchangeName = "MST-DirectExchange";
     private String topicExchangeName = "MST-TopicExchange";
 
-    private AMQShortString durablePriorityTopicQueueName = new AMQShortString("MST-PriorityTopicQueue-Durable");
-    private AMQShortString durableTopicQueueName = new AMQShortString("MST-TopicQueue-Durable");
-    private AMQShortString priorityTopicQueueName = new AMQShortString("MST-PriorityTopicQueue");
-    private AMQShortString topicQueueName = new AMQShortString("MST-TopicQueue");
+    private String durablePriorityTopicQueueName = "MST-PriorityTopicQueue-Durable";
+    private String durableTopicQueueName = "MST-TopicQueue-Durable";
+    private String priorityTopicQueueName = "MST-PriorityTopicQueue";
+    private String topicQueueName = "MST-TopicQueue";
 
-    private AMQShortString durableExclusiveQueueName = new AMQShortString("MST-Queue-Durable-Exclusive");
-    private AMQShortString durablePriorityQueueName = new AMQShortString("MST-PriorityQueue-Durable");
-    private AMQShortString durableLastValueQueueName = new AMQShortString("MST-LastValueQueue-Durable");
-    private AMQShortString durableQueueName = new AMQShortString("MST-Queue-Durable");
-    private AMQShortString priorityQueueName = new AMQShortString("MST-PriorityQueue");
-    private AMQShortString queueName = new AMQShortString("MST-Queue");
+    private String durableExclusiveQueueName = "MST-Queue-Durable-Exclusive";
+    private String durablePriorityQueueName = "MST-PriorityQueue-Durable";
+    private String durableLastValueQueueName = "MST-LastValueQueue-Durable";
+    private String durableQueueName = "MST-Queue-Durable";
+    private String priorityQueueName = "MST-PriorityQueue";
+    private String queueName = "MST-Queue";
 
     private AMQShortString directRouting = new AMQShortString("MST-direct");
     private AMQShortString topicRouting = new AMQShortString("MST-topic");
@@ -202,7 +204,7 @@ public class MessageStoreTest extends QpidTestCase
      */
     public void testQueueExchangeAndBindingCreation() throws Exception
     {
-        assertEquals("Should not be any existing queues", 0,  getVirtualHost().getQueueRegistry().getQueues().size());
+        assertEquals("Should not be any existing queues", 0,  getVirtualHost().getQueues().size());
 
         createAllQueues();
         createAllTopicQueues();
@@ -240,7 +242,7 @@ public class MessageStoreTest extends QpidTestCase
         validateMessageOnTopics(2, true);
 
         assertEquals("Not all queues correctly registered",
-                10, getVirtualHost().getQueueRegistry().getQueues().size());
+                10, getVirtualHost().getQueues().size());
     }
 
     /**
@@ -269,13 +271,11 @@ public class MessageStoreTest extends QpidTestCase
     {
         testMessagePersistence();
 
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
-
         assertEquals("Incorrect number of queues registered after recovery",
-                6,  queueRegistry.getQueues().size());
+                6,  getVirtualHost().getQueues().size());
 
         //clear the queue
-        queueRegistry.getQueue(durableQueueName).clearQueue();
+        _virtualHost.getQueue(durableQueueName).clearQueue();
 
         //check the messages are gone
         validateMessageOnQueue(durableQueueName, 0);
@@ -294,7 +294,7 @@ public class MessageStoreTest extends QpidTestCase
     public void testQueuePersistence() throws Exception
     {
         assertEquals("Should not be any existing queues",
-                0, getVirtualHost().getQueueRegistry().getQueues().size());
+                0, getVirtualHost().getQueues().size());
 
         //create durable and non durable queues/topics
         createAllQueues();
@@ -303,20 +303,18 @@ public class MessageStoreTest extends QpidTestCase
         //reload the virtual host, prompting recovery of the queues/topics
         reloadVirtualHost();
 
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
-
         assertEquals("Incorrect number of queues registered after recovery",
-                6,  queueRegistry.getQueues().size());
+                6,  getVirtualHost().getQueues().size());
 
         //Validate the non-Durable Queues were not recovered.
         assertNull("Non-Durable queue still registered:" + priorityQueueName,
-                queueRegistry.getQueue(priorityQueueName));
+                getVirtualHost().getQueue(priorityQueueName));
         assertNull("Non-Durable queue still registered:" + queueName,
-                queueRegistry.getQueue(queueName));
+                getVirtualHost().getQueue(queueName));
         assertNull("Non-Durable queue still registered:" + priorityTopicQueueName,
-                queueRegistry.getQueue(priorityTopicQueueName));
+                getVirtualHost().getQueue(priorityTopicQueueName));
         assertNull("Non-Durable queue still registered:" + topicQueueName,
-                queueRegistry.getQueue(topicQueueName));
+                getVirtualHost().getQueue(topicQueueName));
 
         //Validate normally expected properties of Queues/Topics
         validateDurableQueueProperties();
@@ -336,27 +334,24 @@ public class MessageStoreTest extends QpidTestCase
         //Register Durable Queue
         createQueue(durableQueueName, false, true, false, false);
 
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of queues registered before recovery",
-                1,  queueRegistry.getQueues().size());
+                1,  getVirtualHost().getQueues().size());
 
         reloadVirtualHost();
 
-        queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of queues registered after first recovery",
-                1,  queueRegistry.getQueues().size());
+                1,  getVirtualHost().getQueues().size());
 
         //test that removing the queue means it is not recovered next time
-        final AMQQueue queue = queueRegistry.getQueue(durableQueueName);
+        final AMQQueue queue = getVirtualHost().getQueue(durableQueueName);
         DurableConfigurationStoreHelper.removeQueue(getVirtualHost().getDurableConfigurationStore(),queue);
 
         reloadVirtualHost();
 
-        queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of queues registered after second recovery",
-                0,  queueRegistry.getQueues().size());
+                0,  getVirtualHost().getQueues().size());
         assertNull("Durable queue was not removed:" + durableQueueName,
-                queueRegistry.getQueue(durableQueueName));
+                getVirtualHost().getQueue(durableQueueName));
     }
 
     /**
@@ -450,34 +445,30 @@ public class MessageStoreTest extends QpidTestCase
      */
     public void testDurableBindingRemoval() throws Exception
     {
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
-
         //create durable queue and exchange, bind them
         Exchange exch = createExchange(DirectExchange.TYPE, directExchangeName, true);
         createQueue(durableQueueName, false, true, false, false);
-        bindQueueToExchange(exch, directRouting, queueRegistry.getQueue(durableQueueName), false, null);
+        bindQueueToExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false, null);
 
         assertEquals("Incorrect number of bindings registered before recovery",
-                1, queueRegistry.getQueue(durableQueueName).getBindings().size());
+                1, getVirtualHost().getQueue(durableQueueName).getBindings().size());
 
         //verify binding is actually normally recovered
         reloadVirtualHost();
 
-        queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of bindings registered after first recovery",
-                1, queueRegistry.getQueue(durableQueueName).getBindings().size());
+                1, getVirtualHost().getQueue(durableQueueName).getBindings().size());
 
         exch = getVirtualHost().getExchange(directExchangeName);
         assertNotNull("Exchange was not recovered", exch);
 
         //remove the binding and verify result after recovery
-        unbindQueueFromExchange(exch, directRouting, queueRegistry.getQueue(durableQueueName), false, null);
+        unbindQueueFromExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false, null);
 
         reloadVirtualHost();
 
-        queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of bindings registered after second recovery",
-                0, queueRegistry.getQueue(durableQueueName).getBindings().size());
+                0, getVirtualHost().getQueue(durableQueueName).getBindings().size());
     }
 
     /**
@@ -514,15 +505,14 @@ public class MessageStoreTest extends QpidTestCase
     /** Validates the Durable queues and their properties are as expected following recovery */
     private void validateBindingProperties()
     {
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
-        assertEquals("Incorrect number of (durable) queues following recovery", 6, queueRegistry.getQueues().size());
+        assertEquals("Incorrect number of (durable) queues following recovery", 6, getVirtualHost().getQueues().size());
 
-        validateBindingProperties(queueRegistry.getQueue(durablePriorityQueueName).getBindings(), false);
-        validateBindingProperties(queueRegistry.getQueue(durablePriorityTopicQueueName).getBindings(), true);
-        validateBindingProperties(queueRegistry.getQueue(durableQueueName).getBindings(), false);
-        validateBindingProperties(queueRegistry.getQueue(durableTopicQueueName).getBindings(), true);
-        validateBindingProperties(queueRegistry.getQueue(durableExclusiveQueueName).getBindings(), false);
+        validateBindingProperties(getVirtualHost().getQueue(durablePriorityQueueName).getBindings(), false);
+        validateBindingProperties(getVirtualHost().getQueue(durablePriorityTopicQueueName).getBindings(), true);
+        validateBindingProperties(getVirtualHost().getQueue(durableQueueName).getBindings(), false);
+        validateBindingProperties(getVirtualHost().getQueue(durableTopicQueueName).getBindings(), true);
+        validateBindingProperties(getVirtualHost().getQueue(durableExclusiveQueueName).getBindings(), false);
     }
 
     /**
@@ -550,18 +540,14 @@ public class MessageStoreTest extends QpidTestCase
 
     private void setQueueExclusivity(boolean exclusive) throws AMQException
     {
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
-
-        AMQQueue queue = queueRegistry.getQueue(durableExclusiveQueueName);
+        AMQQueue queue = getVirtualHost().getQueue(durableExclusiveQueueName);
 
         queue.setExclusive(exclusive);
     }
 
     private void validateQueueExclusivityProperty(boolean expected)
     {
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
-
-        AMQQueue queue = queueRegistry.getQueue(durableExclusiveQueueName);
+        AMQQueue queue = getVirtualHost().getQueue(durableExclusiveQueueName);
 
         assertEquals("Queue exclusivity was incorrect", queue.isExclusive(), expected);
     }
@@ -569,14 +555,12 @@ public class MessageStoreTest extends QpidTestCase
 
     private void validateDurableQueueProperties()
     {
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
-
-        validateQueueProperties(queueRegistry.getQueue(durablePriorityQueueName), true, true, false, false);
-        validateQueueProperties(queueRegistry.getQueue(durablePriorityTopicQueueName), true, true, false, false);
-        validateQueueProperties(queueRegistry.getQueue(durableQueueName), false, true, false, false);
-        validateQueueProperties(queueRegistry.getQueue(durableTopicQueueName), false, true, false, false);
-        validateQueueProperties(queueRegistry.getQueue(durableExclusiveQueueName), false, true, true, false);
-        validateQueueProperties(queueRegistry.getQueue(durableLastValueQueueName), false, true, true, true);
+        validateQueueProperties(getVirtualHost().getQueue(durablePriorityQueueName), true, true, false, false);
+        validateQueueProperties(getVirtualHost().getQueue(durablePriorityTopicQueueName), true, true, false, false);
+        validateQueueProperties(getVirtualHost().getQueue(durableQueueName), false, true, false, false);
+        validateQueueProperties(getVirtualHost().getQueue(durableTopicQueueName), false, true, false, false);
+        validateQueueProperties(getVirtualHost().getQueue(durableExclusiveQueueName), false, true, true, false);
+        validateQueueProperties(getVirtualHost().getQueue(durableLastValueQueueName), false, true, true, true);
     }
 
     private void validateQueueProperties(AMQQueue queue, boolean usePriority, boolean durable, boolean exclusive, boolean lastValueQueue)
@@ -724,10 +708,10 @@ public class MessageStoreTest extends QpidTestCase
         createQueue(topicQueueName, false, false, false, false);
     }
 
-    private void createQueue(AMQShortString queueName, boolean usePriority, boolean durable, boolean exclusive, boolean lastValueQueue)
+    private void createQueue(String queueName, boolean usePriority, boolean durable, boolean exclusive, boolean lastValueQueue)
     {
 
-        FieldTable queueArguments = null;
+        Map<String,Object> queueArguments = null;
 
         if(usePriority || lastValueQueue)
         {
@@ -736,14 +720,12 @@ public class MessageStoreTest extends QpidTestCase
 
         if (usePriority)
         {
-            queueArguments = new FieldTable();
-            queueArguments.put(new AMQShortString(AMQQueueFactory.X_QPID_PRIORITIES), DEFAULT_PRIORTY_LEVEL);
+            queueArguments = Collections.singletonMap(Queue.PRIORITIES, (Object) DEFAULT_PRIORTY_LEVEL);
         }
 
         if (lastValueQueue)
         {
-            queueArguments = new FieldTable();
-            queueArguments.put(new AMQShortString(AMQQueueFactory.QPID_LAST_VALUE_QUEUE_KEY), LVQ_KEY);
+            queueArguments = Collections.singletonMap(Queue.LVQ_KEY, (Object) LVQ_KEY);
         }
 
         AMQQueue queue = null;
@@ -751,25 +733,17 @@ public class MessageStoreTest extends QpidTestCase
         //Ideally we would be able to use the QueueDeclareHandler here.
         try
         {
-            queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName.asString(), durable, queueOwner.asString(), false, exclusive,
-                    getVirtualHost(), FieldTable.convertToMap(queueArguments));
+            queue = getVirtualHost().createQueue(UUIDGenerator.generateRandomUUID(), queueName, durable, queueOwner.asString(), false, exclusive,
+                    false, queueArguments);
 
             validateQueueProperties(queue, usePriority, durable, exclusive, lastValueQueue);
 
-            if (queue.isDurable() && !queue.isAutoDelete())
-            {
-                DurableConfigurationStoreHelper.createQueue(getVirtualHost().getDurableConfigurationStore(),
-                        queue,
-                        queueArguments);
-            }
         }
         catch (AMQException e)
         {
             fail(e.getMessage());
         }
 
-        getVirtualHost().getQueueRegistry().registerQueue(queue);
-
     }
 
     private Map<String, Exchange> createExchanges()
@@ -805,28 +779,24 @@ public class MessageStoreTest extends QpidTestCase
     private void bindAllQueuesToExchange(Exchange exchange, AMQShortString routingKey)
     {
         FieldTable queueArguments = new FieldTable();
-        queueArguments.put(new AMQShortString(AMQQueueFactory.X_QPID_PRIORITIES), DEFAULT_PRIORTY_LEVEL);
+        queueArguments.put(new AMQShortString(QueueArgumentsConverter.X_QPID_PRIORITIES), DEFAULT_PRIORTY_LEVEL);
 
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
-
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durablePriorityQueueName), false, queueArguments);
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durableQueueName), false, null);
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(priorityQueueName), false, queueArguments);
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(queueName), false, null);
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durableExclusiveQueueName), false, null);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityQueueName), false, queueArguments);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableQueueName), false, null);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(priorityQueueName), false, queueArguments);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(queueName), false, null);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableExclusiveQueueName), false, null);
     }
 
     private void bindAllTopicQueuesToExchange(Exchange exchange, AMQShortString routingKey)
     {
         FieldTable queueArguments = new FieldTable();
-        queueArguments.put(new AMQShortString(AMQQueueFactory.X_QPID_PRIORITIES), DEFAULT_PRIORTY_LEVEL);
-
-        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
+        queueArguments.put(new AMQShortString(QueueArgumentsConverter.X_QPID_PRIORITIES), DEFAULT_PRIORTY_LEVEL);
 
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durablePriorityTopicQueueName), true, queueArguments);
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durableTopicQueueName), true, null);
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(priorityTopicQueueName), true, queueArguments);
-        bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(topicQueueName), true, null);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityTopicQueueName), true, queueArguments);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableTopicQueueName), true, null);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(priorityTopicQueueName), true, queueArguments);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(topicQueueName), true, null);
     }
 
 
@@ -894,9 +864,9 @@ public class MessageStoreTest extends QpidTestCase
         }
     }
 
-    private void validateMessageOnQueue(AMQShortString queueName, long messageCount)
+    private void validateMessageOnQueue(String queueName, long messageCount)
     {
-        AMQQueue queue = getVirtualHost().getQueueRegistry().getQueue(queueName);
+        AMQQueue queue = getVirtualHost().getQueue(queueName);
 
         assertNotNull("Queue(" + queueName + ") not correctly registered:", queue);
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
index cf066e3c01..2d6943f643 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
@@ -28,6 +28,7 @@ import org.apache.qpid.management.common.mbeans.ManagedBroker;
 import org.apache.qpid.management.common.mbeans.ManagedQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.NotificationCheckTest;
+import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.queue.SimpleAMQQueue;
 import org.apache.qpid.server.queue.SimpleAMQQueueTest;
 import org.apache.qpid.test.client.destination.AddressBasedDestinationTest;
@@ -168,7 +169,7 @@ public class QueueManagementTest extends QpidBrokerTestCase
     public void testNewQueueWithDescription() throws Exception
     {
         String queueName = getTestQueueName();
-        Map<String, Object> arguments = Collections.singletonMap(AMQQueueFactory.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION);
+        Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION);
         ((AMQSession<?, ?>)_session).createQueue(AMQShortString.valueOf(queueName), false, true, false, arguments);
 
         final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName);
@@ -181,7 +182,7 @@ public class QueueManagementTest extends QpidBrokerTestCase
     public void testQueueDescriptionSurvivesRestart() throws Exception
     {
         String queueName = getTestQueueName();
-        Map<String, Object> arguments = Collections.singletonMap(AMQQueueFactory.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION);
+        Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION);
 
         ((AMQSession<?, ?>)_session).createQueue(AMQShortString.valueOf(queueName), false, true, false, arguments);
 
@@ -195,7 +196,7 @@ public class QueueManagementTest extends QpidBrokerTestCase
     }
 
     /**
-     * Tests queue creation with {@link AMQQueueFactory#X_QPID_MAXIMUM_DELIVERY_COUNT} argument.  Also tests
+     * Tests queue creation with {@link QueueArgumentsConverter#X_QPID_MAXIMUM_DELIVERY_COUNT} argument.  Also tests
      * that the attribute is exposed correctly through {@link ManagedQueue#getMaximumDeliveryCount()}.
      */
     public void testCreateQueueWithMaximumDeliveryCountSet() throws Exception
@@ -204,7 +205,7 @@ public class QueueManagementTest extends QpidBrokerTestCase
         final ManagedBroker managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST);
 
         final Integer deliveryCount = 1;
-        final Map<String, Object> arguments = Collections.singletonMap(AMQQueueFactory.X_QPID_MAXIMUM_DELIVERY_COUNT, (Object)deliveryCount);
+        final Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.X_QPID_MAXIMUM_DELIVERY_COUNT, (Object)deliveryCount);
         managedBroker.createNewQueue(queueName, null, true, arguments);
 
         // Ensure the queue exists
@@ -225,10 +226,10 @@ public class QueueManagementTest extends QpidBrokerTestCase
         final Long maximumQueueDepth = 300l;
         final Long maximumMessageAge = 400l;
         final Map<String, Object> arguments = new HashMap<String, Object>();
-        arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_COUNT, maximumMessageCount);
-        arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_SIZE, maximumMessageSize);
-        arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_QUEUE_DEPTH, maximumQueueDepth);
-        arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_AGE, maximumMessageAge);
+        arguments.put(QueueArgumentsConverter.X_QPID_MAXIMUM_MESSAGE_COUNT, maximumMessageCount);
+        arguments.put(QueueArgumentsConverter.X_QPID_MAXIMUM_MESSAGE_SIZE, maximumMessageSize);
+        arguments.put(QueueArgumentsConverter.X_QPID_MAXIMUM_QUEUE_DEPTH, maximumQueueDepth);
+        arguments.put(QueueArgumentsConverter.X_QPID_MAXIMUM_MESSAGE_AGE, maximumMessageAge);
 
         managedBroker.createNewQueue(queueName, null, true, arguments);
 
@@ -642,7 +643,7 @@ public class QueueManagementTest extends QpidBrokerTestCase
         final ManagedBroker managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST);
 
         final Object messageGroupKey = "test";
-        final Map<String, Object> arguments = Collections.singletonMap(SimpleAMQQueue.QPID_GROUP_HEADER_KEY, messageGroupKey);
+        final Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.QPID_GROUP_HEADER_KEY, messageGroupKey);
         managedBroker.createNewQueue(queueName, null, true, arguments);
 
         final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName);
@@ -659,8 +660,8 @@ public class QueueManagementTest extends QpidBrokerTestCase
 
         final Object messageGroupKey = "test";
         final Map<String, Object> arguments = new HashMap<String, Object>(2);
-        arguments.put(SimpleAMQQueue.QPID_GROUP_HEADER_KEY, messageGroupKey);
-        arguments.put(SimpleAMQQueue.QPID_SHARED_MSG_GROUP, SimpleAMQQueue.SHARED_MSG_GROUP_ARG_VALUE);
+        arguments.put(QueueArgumentsConverter.QPID_GROUP_HEADER_KEY, messageGroupKey);
+        arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP, SimpleAMQQueue.SHARED_MSG_GROUP_ARG_VALUE);
         managedBroker.createNewQueue(queueName, null, true, arguments);
 
         final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
index 940d6a3298..969f222316 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
@@ -37,6 +37,7 @@ import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueueFactory;
+import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 import org.apache.qpid.test.utils.TestFileUtils;
 import org.apache.qpid.util.FileUtils;
@@ -291,7 +292,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
 
         Asserts.assertQueue(queueName , "lvq", lvqQueue);
         assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, lvqQueue.get(Queue.DURABLE));
-        assertEquals("Unexpected lvq key attribute", AMQQueueFactory.QPID_LVQ_KEY, lvqQueue.get(Queue.LVQ_KEY));
+        assertEquals("Unexpected lvq key attribute", AMQQueueFactory.QPID_DEFAULT_LVQ_KEY, lvqQueue.get(Queue.LVQ_KEY));
     }
 
     public void testPutCreateSortedQueueWithoutKey() throws Exception
@@ -460,7 +461,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
         String queueName = getTestQueueName();
 
         Map<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
+        attributes.put(Queue.CREATE_DLQ_ON_CREATION, true);
 
         //verify the starting state
         Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test");
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
index 67a2988ad1..bd826259bc 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
@@ -200,8 +200,8 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
                                  "{" +
                                      "exclusive: true," +
                                      "arguments: {" +
-                                        "'qpid.max_size': 1000," +
-                                        "'qpid.max_count': 100" +
+                                        "'qpid.alert_size': 1000," +
+                                        "'qpid.alert_count': 100" +
                                      "}" +
                                   "}, " +
                                   "x-bindings: [{exchange : 'amq.direct', key : test}, " +
@@ -401,7 +401,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
                                "x-declare: " +
                                "{ " +
                                      "auto-delete: true," +
-                                     "arguments: {'qpid.max_count': 100}" +
+                                     "arguments: {'qpid.alert_count': 100}" +
                                "}, " +
                                "x-bindings: [{exchange : 'amq.direct', key : test}, " +
                                             "{exchange : 'amq.topic', key : 'a.#'}," +
@@ -485,7 +485,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
     {
         Hashtable<String,String> map = new Hashtable<String,String>();
         map.put("destination.myQueue1", "ADDR:my-queue/hello; {create: always, node: " +
-                "{x-declare: {auto-delete: true, arguments : {'qpid.max_size': 1000}}}}");
+                "{x-declare: {auto-delete: true, arguments : {'qpid.alert_size': 1000}}}}");
 
         map.put("destination.myQueue2", "ADDR:my-queue2; { create: receiver }");
 
@@ -603,7 +603,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
         String addr = "ADDR:amq.direct/x512; {" +
         "link : {name : 'MY.RESP.QUEUE', " +
         "x-declare : { auto-delete: true, exclusive: true, " +
-                     "arguments : {'qpid.max_size': 1000, 'qpid.policy_type': ring} } } }";
+                     "arguments : {'qpid.alert_size': 1000, 'qpid.policy_type': ring} } } }";
         queue = ssn.createQueue(addr);
 
         cons = ssn.createConsumer(queue);
@@ -1403,7 +1403,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
         Session ssn = _connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
         String xDeclareArgs = "x-declare: { exclusive: false, auto-delete: false," +
                                            "alternate-exchange: 'amq.fanout'," +
-                                           "arguments: {'qpid.max_size': 1000,'qpid.max_count': 100}" +
+                                           "arguments: {'qpid.alert_size': 1000,'qpid.alert_count': 100}" +
                                           "}";
 
         String addr = "ADDR:amq.topic/test; {link: {name:my-queue, durable:true," + xDeclareArgs + "}}";