QPID-5081 : [Java Broker] Refactor Queue Creation

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

4 files changed, 17 insertions, 9 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 2350e28ee2..a4383d94c4 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -1403,6 +1403,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore, DurableCo
     {
         if (_stateManager.isInState(State.ACTIVE))
         {
+            LOGGER.debug("Storing configured object: " + configuredObject);
             DatabaseEntry key = new DatabaseEntry();
             UUIDTupleBinding keyBinding = UUIDTupleBinding.getInstance();
             keyBinding.objectToEntry(configuredObject.getId(), key);
@@ -1430,6 +1431,8 @@ public abstract class AbstractBDBMessageStore implements MessageStore, DurableCo
 
     private OperationStatus removeConfiguredObject(Transaction tx, UUID id) throws AMQStoreException
     {
+
+        LOGGER.debug("Removing configured object: " + id);
         DatabaseEntry key = new DatabaseEntry();
         UUIDTupleBinding uuidBinding = UUIDTupleBinding.getInstance();
         uuidBinding.objectToEntry(id, key);
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
index 464608ff59..5d84dc2c91 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
@@ -46,6 +46,7 @@ import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.queue.AMQQueueFactory;
+import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.store.berkeleydb.AMQShortStringEncoding;
 import org.apache.qpid.server.store.berkeleydb.FieldTableEncoding;
 import org.apache.qpid.server.util.MapJsonSerializer;
@@ -91,6 +92,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
             ExchangeDefaults.HEADERS_EXCHANGE_NAME.asString(), ExchangeDefaults.TOPIC_EXCHANGE_NAME.asString(),
             ExchangeDefaults.DIRECT_EXCHANGE_NAME.asString() };
     private static final Set<String> DEFAULT_EXCHANGES_SET = new HashSet<String>(Arrays.asList(DEFAULT_EXCHANGES));
+    private static final String ARGUMENTS = "arguments";
 
     private MapJsonSerializer _serializer = new MapJsonSerializer();
 
@@ -580,10 +582,10 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
 
         if (moveNonExclusiveOwnerToDescription(owner, exclusive))
         {
-            _logger.info("Non-exclusive owner " + owner + " for queue " + queueName + " moved to " + AMQQueueFactory.X_QPID_DESCRIPTION);
+            _logger.info("Non-exclusive owner " + owner + " for queue " + queueName + " moved to " + QueueArgumentsConverter.X_QPID_DESCRIPTION);
 
             attributesMap.put(Queue.OWNER, null);
-            argumentsCopy.put(AMQShortString.valueOf(AMQQueueFactory.X_QPID_DESCRIPTION), owner);
+            argumentsCopy.put(AMQShortString.valueOf(QueueArgumentsConverter.X_QPID_DESCRIPTION), owner);
         }
         else
         {
@@ -591,7 +593,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
         }
         if (!argumentsCopy.isEmpty())
         {
-            attributesMap.put(Queue.ARGUMENTS, FieldTable.convertToMap(argumentsCopy));
+            attributesMap.put(ARGUMENTS, FieldTable.convertToMap(argumentsCopy));
         }
         return attributesMap;
     }
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
index 390d667db0..63af8d3840 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
@@ -48,6 +48,7 @@ import org.apache.qpid.client.AMQConnectionFactory;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.url.URLSyntaxException;
 
 /**
@@ -159,7 +160,7 @@ public class BDBStoreUpgradeTestPreparer
         session = connection.createSession(true,  Session.SESSION_TRANSACTED);
         // Create a priority queue on broker
         final Map<String,Object> priorityQueueArguments = new HashMap<String, Object>();
-        priorityQueueArguments.put("x-qpid-priorities",10);
+        priorityQueueArguments.put(QueueArgumentsConverter.X_QPID_PRIORITIES,10);
         createAndBindQueueOnBroker(session, PRIORITY_QUEUE_NAME, priorityQueueArguments);
 
         // Create a queue that has a DLQ
@@ -342,4 +343,4 @@ public class BDBStoreUpgradeTestPreparer
         BDBStoreUpgradeTestPreparer producer = new BDBStoreUpgradeTestPreparer();
         producer.prepareBroker();
     }
-}
\ No newline at end of file
+}
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
index c33d427868..44f0861275 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
@@ -48,6 +48,7 @@ import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.queue.AMQQueueFactory;
+import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.store.berkeleydb.entry.Xid;
 import org.apache.qpid.server.store.berkeleydb.tuple.XidBinding;
 import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.CompoundKey;
@@ -76,6 +77,7 @@ import com.sleepycat.je.Transaction;
 public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase
 {
     private static final Logger _logger = Logger.getLogger(UpgradeFrom5To6Test.class);
+    private static final String ARGUMENTS = "arguments";
 
     @Override
     protected String getStoreDirectoryName()
@@ -287,12 +289,12 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase
         expected.add(createExpectedQueueMap("clientid:myDurSubName", Boolean.TRUE, "clientid", null));
 
         final Map<String, Object> queueWithOwnerArguments = new HashMap<String, Object>();
-        queueWithOwnerArguments.put("x-qpid-priorities", 10);
-        queueWithOwnerArguments.put(AMQQueueFactory.X_QPID_DESCRIPTION, "misused-owner-as-description");
+        queueWithOwnerArguments.put(QueueArgumentsConverter.X_QPID_PRIORITIES, 10);
+        queueWithOwnerArguments.put(QueueArgumentsConverter.X_QPID_DESCRIPTION, "misused-owner-as-description");
         expected.add(createExpectedQueueMap("nonexclusive-with-erroneous-owner", Boolean.FALSE, null,queueWithOwnerArguments));
 
         final Map<String, Object> priorityQueueArguments = new HashMap<String, Object>();
-        priorityQueueArguments.put("x-qpid-priorities", 10);
+        priorityQueueArguments.put(QueueArgumentsConverter.X_QPID_PRIORITIES, 10);
         expected.add(createExpectedQueueMap(PRIORITY_QUEUE_NAME, Boolean.FALSE, null, priorityQueueArguments));
 
         final Map<String, Object> queueWithDLQArguments = new HashMap<String, Object>();
@@ -388,7 +390,7 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase
         expectedQueueEntry.put(Queue.OWNER, owner);
         if (argumentMap != null)
         {
-            expectedQueueEntry.put(Queue.ARGUMENTS, argumentMap);
+            expectedQueueEntry.put(ARGUMENTS, argumentMap);
         }
         return expectedQueueEntry;
     }