QPID-5580 : [Java Broker] Introduce explicit type hierarchy for queues in the ConfiguredObject model

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

5 files changed, 42 insertions, 34 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/LastValueQueueTest.java
index 0e59e9cceb..dc30c02951 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/LastValueQueueTest.java
@@ -47,9 +47,9 @@ import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-public class ConflationQueueTest extends QpidBrokerTestCase
+public class LastValueQueueTest extends QpidBrokerTestCase
 {
-    private static final Logger LOGGER = Logger.getLogger(ConflationQueueTest.class);
+    private static final Logger LOGGER = Logger.getLogger(LastValueQueueTest.class);
 
     private static final String MESSAGE_SEQUENCE_NUMBER_PROPERTY = "msg";
     private static final String KEY_PROPERTY = "key";
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
index d857bb4ce0..9949102af8 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
@@ -50,9 +50,11 @@ import org.apache.qpid.server.plugin.ExchangeType;
 import org.apache.qpid.server.protocol.v0_8.AMQMessage;
 import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.ConflationQueue;
+import org.apache.qpid.server.queue.LastValueQueue;
+import org.apache.qpid.server.queue.LastValueQueueImpl;
 import org.apache.qpid.server.queue.PriorityQueue;
-import org.apache.qpid.server.queue.StandardQueue;
+import org.apache.qpid.server.queue.PriorityQueueImpl;
+import org.apache.qpid.server.queue.StandardQueueImpl;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.BrokerTestHelper;
@@ -553,18 +555,18 @@ public class VirtualHostMessageStoreTest extends QpidTestCase
 
         if (usePriority)
         {
-            assertEquals("Queue is no longer a Priority Queue", PriorityQueue.class, queue.getClass());
+            assertEquals("Queue is no longer a Priority Queue", PriorityQueueImpl.class, queue.getClass());
             assertEquals("Priority Queue does not have set priorities",
-                    DEFAULT_PRIORTY_LEVEL, ((PriorityQueue) queue).getPriorities());
+                    DEFAULT_PRIORTY_LEVEL, ((PriorityQueueImpl) queue).getPriorities());
         }
         else if (lastValueQueue)
         {
-            assertEquals("Queue is no longer a LastValue Queue", ConflationQueue.class, queue.getClass());
-            assertEquals("LastValue Queue Key has changed", LVQ_KEY, ((ConflationQueue) queue).getConflationKey());
+            assertEquals("Queue is no longer a LastValue Queue", LastValueQueueImpl.class, queue.getClass());
+            assertEquals("LastValue Queue Key has changed", LVQ_KEY, ((LastValueQueueImpl) queue).getConflationKey());
         }
         else
         {
-            assertEquals("Queue is not 'simple'", StandardQueue.class, queue.getClass());
+            assertEquals("Queue is not 'simple'", StandardQueueImpl.class, queue.getClass());
         }
 
         assertEquals("Queue owner is not as expected for queue " + queue.getName(), exclusive ? queueOwner : null, queue.getOwner());
@@ -660,12 +662,12 @@ public class VirtualHostMessageStoreTest extends QpidTestCase
 
         if (usePriority)
         {
-            queueArguments.put(Queue.PRIORITIES, DEFAULT_PRIORTY_LEVEL);
+            queueArguments.put(PriorityQueue.PRIORITIES, DEFAULT_PRIORTY_LEVEL);
         }
 
         if (lastValueQueue)
         {
-            queueArguments.put(Queue.LVQ_KEY, LVQ_KEY);
+            queueArguments.put(LastValueQueue.LVQ_KEY, LVQ_KEY);
         }
 
         queueArguments.put(Queue.ID, UUIDGenerator.generateRandomUUID());
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 931974942f..3bd91faa3e 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,7 +28,7 @@ import org.apache.qpid.management.common.mbeans.ManagedBroker;
 import org.apache.qpid.management.common.mbeans.ManagedQueue;
 import org.apache.qpid.server.queue.NotificationCheckTest;
 import org.apache.qpid.server.queue.QueueArgumentsConverter;
-import org.apache.qpid.server.queue.StandardQueue;
+import org.apache.qpid.server.queue.StandardQueueImpl;
 import org.apache.qpid.test.client.destination.AddressBasedDestinationTest;
 import org.apache.qpid.test.utils.JMXTestUtils;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -660,7 +660,7 @@ public class QueueManagementTest extends QpidBrokerTestCase
         final Object messageGroupKey = "test";
         final Map<String, Object> arguments = new HashMap<String, Object>(2);
         arguments.put(QueueArgumentsConverter.QPID_GROUP_HEADER_KEY, messageGroupKey);
-        arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP, StandardQueue.SHARED_MSG_GROUP_ARG_VALUE);
+        arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP, StandardQueueImpl.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/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index a2bb05dd00..47a25dbbec 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -43,6 +43,9 @@ import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.queue.LastValueQueue;
+import org.apache.qpid.server.queue.PriorityQueue;
+import org.apache.qpid.server.queue.SortedQueue;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 public class Asserts
@@ -113,11 +116,11 @@ public class Asserts
                                         Queue.ALTERNATE_EXCHANGE,
                                         Queue.OWNER,
                                         Queue.NO_LOCAL,
-                                        Queue.LVQ_KEY,
-                                        Queue.SORT_KEY,
+                                        LastValueQueue.LVQ_KEY,
+                                        SortedQueue.SORT_KEY,
                                         Queue.MESSAGE_GROUP_KEY,
                                         Queue.MESSAGE_GROUP_SHARED_GROUPS,
-                                        Queue.PRIORITIES,
+                                        PriorityQueue.PRIORITIES,
                                         ConfiguredObject.CONTEXT);
 
         assertEquals("Unexpected value of queue attribute " + Queue.NAME, queueName, queueData.get(Queue.NAME));
@@ -127,9 +130,9 @@ public class Asserts
                      queueData.get(Queue.STATE));
         assertEquals("Unexpected value of queue attribute " + Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
                      queueData.get(Queue.LIFETIME_POLICY));
-        assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_TYPE,
+        assertEquals("Unexpected value of queue attribute " + Queue.TYPE,
                      queueType,
-                     queueData.get(Queue.QUEUE_TYPE));
+                     queueData.get(Queue.TYPE));
         if (expectedAttributes == null)
         {
             assertEquals("Unexpected value of queue attribute " + Queue.EXCLUSIVE,
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 421c609e46..4535425ea4 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,7 +37,10 @@ import org.apache.qpid.client.AMQConnection;
 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.ConflationQueue;
+import org.apache.qpid.server.queue.LastValueQueue;
+import org.apache.qpid.server.queue.LastValueQueueImpl;
+import org.apache.qpid.server.queue.PriorityQueue;
+import org.apache.qpid.server.queue.SortedQueue;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.virtualhost.StandardVirtualHost;
 import org.apache.qpid.util.FileUtils;
@@ -193,15 +196,15 @@ public class VirtualHostRestTest extends QpidRestTestCase
         createQueue(queueName + "-standard", "standard", null);
 
         Map<String, Object> sortedQueueAttributes = new HashMap<String, Object>();
-        sortedQueueAttributes.put(Queue.SORT_KEY, "sortme");
+        sortedQueueAttributes.put(SortedQueue.SORT_KEY, "sortme");
         createQueue(queueName + "-sorted", "sorted", sortedQueueAttributes);
 
         Map<String, Object> priorityQueueAttributes = new HashMap<String, Object>();
-        priorityQueueAttributes.put(Queue.PRIORITIES, 10);
+        priorityQueueAttributes.put(PriorityQueue.PRIORITIES, 10);
         createQueue(queueName + "-priority", "priority", priorityQueueAttributes);
 
         Map<String, Object> lvqQueueAttributes = new HashMap<String, Object>();
-        lvqQueueAttributes.put(Queue.LVQ_KEY, "LVQ");
+        lvqQueueAttributes.put(LastValueQueue.LVQ_KEY, "LVQ");
         createQueue(queueName + "-lvq", "lvq", lvqQueueAttributes);
 
         Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test");
@@ -223,9 +226,9 @@ public class VirtualHostRestTest extends QpidRestTestCase
         assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, priorityQueue.get(Queue.DURABLE));
         assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, lvqQueue.get(Queue.DURABLE));
 
-        assertEquals("Unexpected sorted key attribute", "sortme", sortedQueue.get(Queue.SORT_KEY));
-        assertEquals("Unexpected lvq key attribute", "LVQ", lvqQueue.get(Queue.LVQ_KEY));
-        assertEquals("Unexpected priorities key attribute", 10, priorityQueue.get(Queue.PRIORITIES));
+        assertEquals("Unexpected sorted key attribute", "sortme", sortedQueue.get(SortedQueue.SORT_KEY));
+        assertEquals("Unexpected lvq key attribute", "LVQ", lvqQueue.get(LastValueQueue.LVQ_KEY));
+        assertEquals("Unexpected priorities key attribute", 10, priorityQueue.get(PriorityQueue.PRIORITIES));
     }
 
     public void testPutCreateExchange() throws Exception
@@ -271,7 +274,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", ConflationQueue.DEFAULT_LVQ_KEY, lvqQueue.get(Queue.LVQ_KEY));
+        assertEquals("Unexpected lvq key attribute", LastValueQueueImpl.DEFAULT_LVQ_KEY, lvqQueue.get(LastValueQueue.LVQ_KEY));
     }
 
     public void testPutCreateSortedQueueWithoutKey() throws Exception
@@ -302,7 +305,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
 
         Asserts.assertQueue(queueName , "priority", priorityQueue);
         assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, priorityQueue.get(Queue.DURABLE));
-        assertEquals("Unexpected number of priorities", 10, priorityQueue.get(Queue.PRIORITIES));
+        assertEquals("Unexpected number of priorities", 10, priorityQueue.get(PriorityQueue.PRIORITIES));
     }
 
     public void testPutCreateStandardQueueWithoutType() throws Exception
@@ -401,17 +404,17 @@ public class VirtualHostRestTest extends QpidRestTestCase
 
         Map<String, Object> sortedQueueAttributes = new HashMap<String, Object>();
         sortedQueueAttributes.putAll(attributes);
-        sortedQueueAttributes.put(Queue.SORT_KEY, "sortme");
+        sortedQueueAttributes.put(SortedQueue.SORT_KEY, "sortme");
         createQueue(queueName + "-sorted", "sorted", sortedQueueAttributes);
 
         Map<String, Object> priorityQueueAttributes = new HashMap<String, Object>();
         priorityQueueAttributes.putAll(attributes);
-        priorityQueueAttributes.put(Queue.PRIORITIES, 10);
+        priorityQueueAttributes.put(PriorityQueue.PRIORITIES, 10);
         createQueue(queueName + "-priority", "priority", priorityQueueAttributes);
 
         Map<String, Object> lvqQueueAttributes = new HashMap<String, Object>();
         lvqQueueAttributes.putAll(attributes);
-        lvqQueueAttributes.put(Queue.LVQ_KEY, "LVQ");
+        lvqQueueAttributes.put(LastValueQueue.LVQ_KEY, "LVQ");
         createQueue(queueName + "-lvq", "lvq", lvqQueueAttributes);
 
         Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test");
@@ -429,9 +432,9 @@ public class VirtualHostRestTest extends QpidRestTestCase
         Asserts.assertQueue(queueName + "-priority", "priority", priorityQueue, attributes);
         Asserts.assertQueue(queueName + "-lvq", "lvq", lvqQueue, attributes);
 
-        assertEquals("Unexpected sorted key attribute", "sortme", sortedQueue.get(Queue.SORT_KEY));
-        assertEquals("Unexpected lvq key attribute", "LVQ", lvqQueue.get(Queue.LVQ_KEY));
-        assertEquals("Unexpected priorities key attribute", 10, priorityQueue.get(Queue.PRIORITIES));
+        assertEquals("Unexpected sorted key attribute", "sortme", sortedQueue.get(SortedQueue.SORT_KEY));
+        assertEquals("Unexpected lvq key attribute", "LVQ", lvqQueue.get(LastValueQueue.LVQ_KEY));
+        assertEquals("Unexpected priorities key attribute", 10, priorityQueue.get(PriorityQueue.PRIORITIES));
     }
 
     @SuppressWarnings("unchecked")
@@ -506,7 +509,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
         queueData.put(Queue.DURABLE, Boolean.TRUE);
         if (queueType != null)
         {
-            queueData.put(Queue.QUEUE_TYPE, queueType);
+            queueData.put(Queue.TYPE, queueType);
         }
         if (attributes != null)
         {