QPID-4167: Fix setting of queue attributes via web management console and rest interfaces. Also import Subscription into the bundle to resolve CDNFExcept ion when viewing a queue with Consumers.

Work by Oleksandr Rudyy, Keith Wall and myself.


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

2 files changed, 75 insertions, 10 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/Asserts.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/Asserts.java
index db5306b08d..2595007574 100644
--- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/Asserts.java
+++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/Asserts.java
@@ -79,6 +79,11 @@ public class Asserts
 
     public static void assertQueue(String queueName, String queueType, Map<String, Object> queueData)
     {
+        assertQueue(queueName, queueType, queueData, null);
+    }
+
+    public static void assertQueue(String queueName, String queueType, Map<String, Object> queueData, Map<String, Object> expectedAttributes)
+    {
         assertNotNull("Queue " + queueName + " is not found!", queueData);
         Asserts.assertAttributesPresent(queueData, Queue.AVAILABLE_ATTRIBUTES, Queue.CREATED, Queue.UPDATED,
                 Queue.DESCRIPTION, Queue.TIME_TO_LIVE, Queue.ALTERNATE_EXCHANGE, Queue.OWNER, Queue.NO_LOCAL, Queue.LVQ_KEY,
@@ -91,18 +96,28 @@ public class Asserts
         assertEquals("Unexpected value of queue attribute " + Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
                 queueData.get(Queue.LIFETIME_POLICY));
         assertEquals("Unexpected value of queue attribute " + Queue.TYPE, queueType, queueData.get(Queue.TYPE));
-        assertEquals("Unexpected value of queue attribute " + Queue.EXCLUSIVE, Boolean.FALSE, queueData.get(Queue.EXCLUSIVE));
-        assertEquals("Unexpected value of queue attribute " + Queue.MAXIMUM_DELIVERY_ATTEMPTS, 0,
-                queueData.get(Queue.MAXIMUM_DELIVERY_ATTEMPTS));
-        assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 0,
-                queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES));
-        assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 0,
-                queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES));
-        assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_STOPPED, Boolean.FALSE,
-                queueData.get(Queue.QUEUE_FLOW_STOPPED));
+        if (expectedAttributes == null)
+        {
+            assertEquals("Unexpected value of queue attribute " + Queue.EXCLUSIVE, Boolean.FALSE, queueData.get(Queue.EXCLUSIVE));
+            assertEquals("Unexpected value of queue attribute " + Queue.MAXIMUM_DELIVERY_ATTEMPTS, 0,
+                    queueData.get(Queue.MAXIMUM_DELIVERY_ATTEMPTS));
+            assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 0,
+                    queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES));
+            assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 0,
+                    queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES));
+            assertEquals("Unexpected value of queue attribute " + Queue.QUEUE_FLOW_STOPPED, Boolean.FALSE,
+                    queueData.get(Queue.QUEUE_FLOW_STOPPED));
+        }
+        else
+        {
+            for (Map.Entry<String, Object> attribute : expectedAttributes.entrySet())
+            {
+                assertEquals("Unexpected value of " + queueName + " queue attribute " + attribute.getKey(),
+                        attribute.getValue(), queueData.get(attribute.getKey()));
+            }
+        }
 
         assertNotNull("Unexpected value of queue attribute statistics", queueData.get(Asserts.STATISTICS_ATTRIBUTE));
-
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) queueData.get(Asserts.STATISTICS_ATTRIBUTE);
         Asserts.assertAttributesPresent(statistics, Queue.AVAILABLE_STATISTICS, Queue.DISCARDS_TTL_BYTES,
diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
index eaf2e60478..32edc3e305 100644
--- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
+++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
@@ -296,6 +296,56 @@ public class VirtualHostRestTest extends QpidRestTestCase
         assertEquals("Exchange should be deleted", 0, queues.size());
     }
 
+    public void testPutCreateQueueWithAttributes() throws Exception
+    {
+        String queueName = getTestQueueName();
+
+        Map<String, Object> attributes = new HashMap<String, Object>();
+        attributes.put(Queue.ALERT_REPEAT_GAP, 1000);
+        attributes.put(Queue.ALERT_THRESHOLD_MESSAGE_AGE, 3600000);
+        attributes.put(Queue.ALERT_THRESHOLD_MESSAGE_SIZE, 1000000000);
+        attributes.put(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 800);
+        attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 15);
+        attributes.put(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 2000000000);
+        attributes.put(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 1500000000);
+
+        createQueue(queueName + "-standard", "standard", attributes);
+
+        Map<String, Object> sortedQueueAttributes = new HashMap<String, Object>();
+        sortedQueueAttributes.putAll(attributes);
+        sortedQueueAttributes.put(Queue.SORT_KEY, "sortme");
+        createQueue(queueName + "-sorted", "sorted", sortedQueueAttributes);
+
+        Map<String, Object> priorityQueueAttributes = new HashMap<String, Object>();
+        priorityQueueAttributes.putAll(attributes);
+        priorityQueueAttributes.put(Queue.PRIORITIES, 10);
+        createQueue(queueName + "-priority", "priority", priorityQueueAttributes);
+
+        Map<String, Object> lvqQueueAttributes = new HashMap<String, Object>();
+        lvqQueueAttributes.putAll(attributes);
+        lvqQueueAttributes.put(Queue.LVQ_KEY, "LVQ");
+        createQueue(queueName + "-lvq", "lvq", lvqQueueAttributes);
+
+        Map<String, Object> hostDetails = getJsonAsSingletonList("/rest/virtualhost/test");
+
+        @SuppressWarnings("unchecked")
+        List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
+        Map<String, Object> standardQueue = find(Queue.NAME, queueName + "-standard" , queues);
+        Map<String, Object> sortedQueue = find(Queue.NAME, queueName + "-sorted" , queues);
+        Map<String, Object> priorityQueue = find(Queue.NAME, queueName + "-priority" , queues);
+        Map<String, Object> lvqQueue = find(Queue.NAME, queueName + "-lvq" , queues);
+
+        attributes.put(Queue.DURABLE, Boolean.TRUE);
+        Asserts.assertQueue(queueName + "-standard", "standard", standardQueue, attributes);
+        Asserts.assertQueue(queueName + "-sorted", "sorted", sortedQueue, attributes);
+        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));
+    }
+
     private void createExchange(String exchangeName, String exchangeType) throws IOException
     {
         HttpURLConnection connection = openManagementConection("/rest/exchange/test/" + exchangeName, "PUT");