QPID-1730: make it easy to configure queues, fix inheriting settings from the virtualhost.

AMQQueue.configure: new method
AMQQueueFactory: use AMQQueue.configure, don't set things directly
SimpleAMQQueue.configure, MockAMQQueue.configure: implement new method from the interface
QueueConfiguration: use VirtualHostConfiguration for default values if they're unset
VirtualHostConfiguration: if a queue doesn't exist, give it a default configuration. Add methods to get default settings for configuration items
QueueConfigurationTest: test case, checks that inheritance and defaults work along with explicitly set values.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@761733 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 145 insertions, 0 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
new file mode 100644
index 0000000000..b3a792521a
--- /dev/null
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
@@ -0,0 +1,139 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.configuration;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.configuration.PropertiesConfiguration;
+
+public class QueueConfigurationTest extends TestCase
+{
+    
+    private VirtualHostConfiguration _emptyConf;
+    private PropertiesConfiguration _env;
+    private ServerConfiguration _fullServerConf;
+    private VirtualHostConfiguration _fullHostConf;
+
+    public void setUp() throws Exception
+    {
+        _env = new PropertiesConfiguration();
+        ServerConfiguration emptyServerConfig;
+        emptyServerConfig = new ServerConfiguration(_env);
+        _emptyConf = new VirtualHostConfiguration("test", _env, emptyServerConfig);
+        
+        PropertiesConfiguration fullEnv = new PropertiesConfiguration();
+        fullEnv.setProperty("queues.maximumMessageAge", 1);
+        fullEnv.setProperty("queues.maximumQueueDepth", 1);
+        fullEnv.setProperty("queues.maximumMessageSize", 1);
+        fullEnv.setProperty("queues.maximumMessageCount", 1);
+        fullEnv.setProperty("queues.minimumAlertRepeatGap", 1);
+
+        _fullServerConf = new ServerConfiguration(fullEnv);
+        _fullHostConf = new VirtualHostConfiguration("test", fullEnv, _fullServerConf);
+        
+    }
+
+    public void testGetMaximumMessageAge()
+    {
+        // Check default value
+        QueueConfiguration qConf = new QueueConfiguration("test", _env, _emptyConf);        
+        assertEquals(0, qConf.getMaximumMessageAge());
+
+        // Check explicit value
+        PropertiesConfiguration fullEnv = new PropertiesConfiguration();
+        fullEnv.setProperty("maximumMessageAge", 2);
+        qConf = new QueueConfiguration("test", fullEnv, _fullHostConf);        
+        assertEquals(2, qConf.getMaximumMessageAge());
+        
+        // Check inherited value
+        qConf = new QueueConfiguration("test", _env, _fullHostConf);        
+        assertEquals(1, qConf.getMaximumMessageAge());
+    }
+
+    public void testGetMaximumQueueDepth()
+    {
+        // Check default value
+        QueueConfiguration qConf = new QueueConfiguration("test", _env, _emptyConf);        
+        assertEquals(0, qConf.getMaximumQueueDepth());
+
+        // Check explicit value
+        PropertiesConfiguration fullEnv = new PropertiesConfiguration();
+        fullEnv.setProperty("maximumQueueDepth", 2);
+        qConf = new QueueConfiguration("test", fullEnv, _fullHostConf);        
+        assertEquals(2, qConf.getMaximumQueueDepth());
+        
+        // Check inherited value
+        qConf = new QueueConfiguration("test", _env, _fullHostConf);        
+        assertEquals(1, qConf.getMaximumQueueDepth());
+    }
+
+    public void testGetMaximumMessageSize()
+    {
+        // Check default value
+        QueueConfiguration qConf = new QueueConfiguration("test", _env, _emptyConf);        
+        assertEquals(0, qConf.getMaximumMessageSize());
+
+        // Check explicit value
+        PropertiesConfiguration fullEnv = new PropertiesConfiguration();
+        fullEnv.setProperty("maximumMessageSize", 2);
+        qConf = new QueueConfiguration("test", fullEnv, _fullHostConf);        
+        assertEquals(2, qConf.getMaximumMessageSize());
+        
+        // Check inherited value
+        qConf = new QueueConfiguration("test", _env, _fullHostConf);        
+        assertEquals(1, qConf.getMaximumMessageSize());
+    }
+
+    public void testGetMaximumMessageCount()
+    {
+       // Check default value
+        QueueConfiguration qConf = new QueueConfiguration("test", _env, _emptyConf);        
+        assertEquals(0, qConf.getMaximumMessageCount());
+
+        // Check explicit value
+        PropertiesConfiguration fullEnv = new PropertiesConfiguration();
+        fullEnv.setProperty("maximumMessageCount", 2);
+        qConf = new QueueConfiguration("test", fullEnv, _fullHostConf);        
+        assertEquals(2, qConf.getMaximumMessageCount());
+        
+        // Check inherited value
+        qConf = new QueueConfiguration("test", _env, _fullHostConf);        
+        assertEquals(1, qConf.getMaximumMessageCount());
+    }
+
+    public void testGetMinimumAlertRepeatGap()
+    {
+        // Check default value
+        QueueConfiguration qConf = new QueueConfiguration("test", _env, _emptyConf);        
+        assertEquals(0, qConf.getMinimumAlertRepeatGap());
+
+        // Check explicit value
+        PropertiesConfiguration fullEnv = new PropertiesConfiguration();
+        fullEnv.setProperty("minimumAlertRepeatGap", 2);
+        qConf = new QueueConfiguration("test", fullEnv, _fullHostConf);        
+        assertEquals(2, qConf.getMinimumAlertRepeatGap());
+        
+        // Check inherited value
+        qConf = new QueueConfiguration("test", _env, _fullHostConf);        
+        assertEquals(1, qConf.getMinimumAlertRepeatGap());
+    }
+
+}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index ff814840bc..7730e34456 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -24,6 +24,7 @@ import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.configuration.QueueConfiguration;
 import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
@@ -358,4 +359,9 @@ public class MockAMQQueue implements AMQQueue
 
     }
 
+    public void configure(QueueConfiguration config)
+    {
+        
+    }
+
 }