QPID-3923: remove deprecated test-only AMQQueueFactory method and update tests accordingly, rename method for generating random IDs.

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

15 files changed, 75 insertions, 123 deletions

diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
index e97323c5f2..eef9f7eab4 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
@@ -407,7 +407,7 @@ public class BDBMessageStoreTest extends org.apache.qpid.server.store.MessageSto
 
         AbstractBDBMessageStore bdbStore = assertBDBStore(log);
 
-        final UUID mockQueueId = UUIDGenerator.generateUUID();
+        final UUID mockQueueId = UUIDGenerator.generateRandomUUID();
         TransactionLogResource mockQueue = new TransactionLogResource()
         {
             @Override
@@ -445,7 +445,7 @@ public class BDBMessageStoreTest extends org.apache.qpid.server.store.MessageSto
 
         AbstractBDBMessageStore bdbStore = assertBDBStore(log);
 
-        final UUID mockQueueId = UUIDGenerator.generateUUID();
+        final UUID mockQueueId = UUIDGenerator.generateRandomUUID();
         TransactionLogResource mockQueue = new TransactionLogResource()
         {
             @Override
@@ -486,7 +486,7 @@ public class BDBMessageStoreTest extends org.apache.qpid.server.store.MessageSto
 
         AbstractBDBMessageStore bdbStore = assertBDBStore(log);
 
-        final UUID mockQueueId = UUIDGenerator.generateUUID();
+        final UUID mockQueueId = UUIDGenerator.generateRandomUUID();
         TransactionLogResource mockQueue = new TransactionLogResource()
         {
             @Override
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
index f8aeb7f7b0..7f93f5691e 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBindingTest.java
@@ -42,7 +42,7 @@ public class ConfiguredObjectBindingTest extends TestCase
     {
         super.setUp();
         _configuredObjectBinding = ConfiguredObjectBinding.getInstance();
-        _object = new ConfiguredObjectRecord(UUIDGenerator.generateUUID(), DUMMY_TYPE_STRING, DUMMY_ATTRIBUTES_STRING);
+        _object = new ConfiguredObjectRecord(UUIDGenerator.generateRandomUUID(), DUMMY_TYPE_STRING, DUMMY_ATTRIBUTES_STRING);
     }
 
     public void testObjectToEntryAndEntryToObject()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
index 0d48aec562..f6ceae6c0e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
@@ -84,7 +84,7 @@ public class ManagementExchange implements Exchange, QMFService.Listener
 
     private class ManagementQueue implements BaseQueue
     {
-        private final UUID QUEUE_ID =  UUIDGenerator.generateUUID();
+        private final UUID QUEUE_ID =  UUIDGenerator.generateRandomUUID();
         private final String NAME_AS_STRING = "##__mgmt_pseudo_queue__##" + QUEUE_ID.toString();
         private final AMQShortString NAME_AS_SHORT_STRING = new AMQShortString(NAME_AS_STRING);
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
index 8e1940c54a..fa59226642 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
@@ -24,7 +24,8 @@ import java.util.UUID;
 
 public class UUIDGenerator
 {
-    public static UUID generateUUID()
+    //Generates a random UUID. Used primarily by tests.
+    public static UUID generateRandomUUID()
     {
         return UUID.randomUUID();
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
index 429b721d47..3a18fae2ec 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
@@ -171,29 +171,7 @@ public class AMQQueueFactory
     };
 
     /**
-     * Creates a new queue with a random id.
-     *
-     * @see #createAMQQueueImpl(UUID, String, boolean, String, boolean, boolean, VirtualHost, Map)
-     * @deprecated because only called from unit tests
-     * */
-    @Deprecated
-    public static AMQQueue createAMQQueueImpl(AMQShortString name,
-                                              boolean durable,
-                                              AMQShortString owner,
-                                              boolean autoDelete,
-                                              boolean exclusive,
-                                              VirtualHost virtualHost, final FieldTable arguments) throws AMQException
-    {
-        return createAMQQueueImpl(UUIDGenerator.generateUUID(),
-                                  name == null ? null : name.toString(),
-                                  durable,
-                                  owner == null ? null : owner.toString(),
-                                  autoDelete,
-                                  exclusive, virtualHost, FieldTable.convertToMap(arguments));
-    }
-
-    /**
-     * @param id the id to use. If default then one is generated from queueName. TODO check correctness of calls that pass a null value.
+     * @param id the id to use.
      */
     public static AMQQueue createAMQQueueImpl(UUID id,
                                               String queueName,
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
index 59cd0cf1db..caf74a89ec 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
@@ -26,8 +26,8 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.AMQSecurityException;
 import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.util.InternalBrokerBaseCase;
@@ -77,7 +77,7 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase
     public void testSubscriptionWithTopicCreation() throws ConfigurationException, AMQException
     {
 
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString(getName()+":stockSubscription"), false, new AMQShortString("testowner"),
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), getName()+":stockSubscription", false, "testowner",
                                                     false, false, getVirtualHost(), null);
 
         getVirtualHost().getQueueRegistry().registerQueue(queue);
@@ -107,7 +107,7 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase
     public void testSubscriptionCreation() throws ConfigurationException, AMQException
     {
 
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString(getName()+":stockSubscription"), false, new AMQShortString("testowner"),
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID() ,getName()+":stockSubscription", false, "testowner",
                                                     false, false, getVirtualHost(), null);
 
         getVirtualHost().getQueueRegistry().registerQueue(queue);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index afd8fd9ed2..73046b0345 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -276,7 +276,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
 
         public TestQueue(AMQShortString name) throws AMQException
         {
-            super(UUIDGenerator.generateUUID(), name, false, new AMQShortString("test"), true, false,ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test"), Collections.EMPTY_MAP);
+            super(UUIDGenerator.generateRandomUUID(), name, false, new AMQShortString("test"), true, false,ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test"), Collections.EMPTY_MAP);
             ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry().registerQueue(this);
         }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index 00c8a18d9f..6e29a7ba31 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
@@ -30,6 +30,7 @@ import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.message.AMQMessage;
 import org.apache.qpid.server.message.MessageMetaData;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
@@ -64,7 +65,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testNoRoute() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a*#b"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a*#b", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.*.#.b", queue,_exchange, null));
 
 
@@ -76,7 +77,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testDirectMatch() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("ab"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "ab", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.b", queue,_exchange, null));
 
 
@@ -103,7 +104,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testStarMatch() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a*"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a*", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.*", queue,_exchange, null));
 
 
@@ -142,7 +143,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testHashMatch() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a#"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.#", queue,_exchange, null));
 
 
@@ -205,7 +206,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testMidHash() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.*.#.b", queue,_exchange, null));
 
 
@@ -235,7 +236,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testMatchafterHash() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a#"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.*.#.b.c", queue,_exchange, null));
 
 
@@ -281,7 +282,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testHashAfterHash() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a#"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.*.#.b.c.#.d", queue,_exchange, null));
 
 
@@ -308,7 +309,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testHashHash() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a#"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.#.*.#.d", queue,_exchange, null));
 
 
@@ -334,7 +335,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testSubMatchFails() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.b.c.d", queue,_exchange, null));
 
 
@@ -364,7 +365,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testMoreRouting() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.b", queue,_exchange, null));
 
 
@@ -379,7 +380,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     public void testMoreQueue() throws AMQException
     {
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a"), false, null, false, false, _vhost, null);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
         _exchange.registerQueue(new Binding(null,"a.b", queue,_exchange, null));
 
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 337ff194c3..186be4dff7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
@@ -33,6 +33,7 @@ import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.logging.SystemOutMessageLogger;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.TestLogActor;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.util.TestApplicationRegistry;
@@ -97,8 +98,8 @@ public class AMQQueueFactoryTest extends QpidTestCase
         fieldTable.put(new AMQShortString(AMQQueueFactory.X_QPID_PRIORITIES), 5);
 
 
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testPriorityQueue"), false, new AMQShortString("owner"), false,
-                                           false, _virtualHost, fieldTable);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "testPriorityQueue", false, "owner", false,
+                                           false, _virtualHost, FieldTable.convertToMap(fieldTable));
 
         assertEquals("Queue not a priorty queue", AMQPriorityQueue.class, queue.getClass());
         verifyQueueRegistered("testPriorityQueue");
@@ -108,13 +109,13 @@ public class AMQQueueFactoryTest extends QpidTestCase
 
     public void testSimpleQueueRegistration() throws Exception
     {
-        AMQShortString queueName = new AMQShortString("testSimpleQueueRegistration");
+        String queueName = getName();
         AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
 
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(queueName, false, new AMQShortString("owner"), false,
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", false,
                                            false, _virtualHost, null);
         assertEquals("Queue not a simple queue", SimpleAMQQueue.class, queue.getClass());
-        verifyQueueRegistered("testSimpleQueueRegistration");
+        verifyQueueRegistered(queueName);
 
         //verify that no alternate exchange or DLQ were produced
         QueueRegistry qReg = _virtualHost.getQueueRegistry();
@@ -135,7 +136,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
         FieldTable fieldTable = new FieldTable();
         fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
 
-        AMQShortString queueName = new AMQShortString("testDeadLetterQueueEnabled");
+        String queueName = "testDeadLetterQueueEnabled";
         AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
         AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
 
@@ -145,8 +146,8 @@ public class AMQQueueFactoryTest extends QpidTestCase
         assertNull("The DLQ should not yet exist", qReg.getQueue(dlQueueName));
         assertNull("The alternate exchange should not yet exist", exReg.getExchange(dlExchangeName));
 
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(queueName, false, new AMQShortString("owner"), false, false,
-                                           _virtualHost, fieldTable);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", false, false,
+                                           _virtualHost, FieldTable.convertToMap(fieldTable));
 
         Exchange altExchange = queue.getAlternateExchange();
         assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
@@ -176,7 +177,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
         ApplicationRegistry.getInstance().getConfiguration().getConfig().addProperty("deadLetterQueues","true");
         ApplicationRegistry.getInstance().getConfiguration().getConfig().addProperty("maximumDeliveryCount","5");
 
-        AMQShortString queueName = new AMQShortString("testDeadLetterQueueEnabled");
+        String queueName = "testDeadLetterQueueEnabled";
         AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
         AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
 
@@ -186,7 +187,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
         assertNull("The DLQ should not yet exist", qReg.getQueue(dlQueueName));
         assertNull("The alternate exchange should not yet exist", exReg.getExchange(dlExchangeName));
 
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(queueName, false, new AMQShortString("owner"), false, false,
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", false, false,
                                            _virtualHost, null);
 
         assertEquals("Unexpected maximum delivery count", 5, queue.getMaximumDeliveryCount());
@@ -218,7 +219,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
         FieldTable fieldTable = new FieldTable();
         fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, false);
 
-        AMQShortString queueName = new AMQShortString("testDeadLetterQueueDisabled");
+        String queueName = "testDeadLetterQueueDisabled";
         AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
         AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
 
@@ -228,8 +229,8 @@ public class AMQQueueFactoryTest extends QpidTestCase
         assertNull("The DLQ should not yet exist", qReg.getQueue(dlQueueName));
         assertNull("The alternate exchange should not exist", exReg.getExchange(dlExchangeName));
 
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(queueName, false, new AMQShortString("owner"), false, false,
-                                           _virtualHost, fieldTable);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", false, false,
+                                           _virtualHost, FieldTable.convertToMap(fieldTable));
 
         assertNull("Queue should not have an alternate exchange as DLQ is disabled", queue.getAlternateExchange());
         assertNull("The alternate exchange should still not exist", exReg.getExchange(dlExchangeName));
@@ -251,7 +252,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
         FieldTable fieldTable = new FieldTable();
         fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
 
-        AMQShortString queueName = new AMQShortString("testDeadLetterQueueNotCreatedForAutodeleteQueues");
+        String queueName = "testDeadLetterQueueNotCreatedForAutodeleteQueues";
         AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
         AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
 
@@ -262,8 +263,8 @@ public class AMQQueueFactoryTest extends QpidTestCase
         assertNull("The alternate exchange should not exist", exReg.getExchange(dlExchangeName));
 
         //create an autodelete queue
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(queueName, false, new AMQShortString("owner"), true, false,
-                                           _virtualHost, fieldTable);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", true, false,
+                                           _virtualHost, FieldTable.convertToMap(fieldTable));
         assertTrue("Queue should be autodelete", queue.isAutoDelete());
 
         //ensure that the autodelete property overrides the request to enable DLQ
@@ -284,10 +285,8 @@ public class AMQQueueFactoryTest extends QpidTestCase
         final FieldTable fieldTable = new FieldTable();
         fieldTable.setInteger(AMQQueueFactory.X_QPID_MAXIMUM_DELIVERY_COUNT, 5);
 
-        final AMQShortString queueName = new AMQShortString("testMaximumDeliveryCount");
-
-        final AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(queueName, false, new AMQShortString("owner"), false, false,
-                                           _virtualHost, fieldTable);
+        final AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "testMaximumDeliveryCount", false, "owner", false, false,
+                                           _virtualHost, FieldTable.convertToMap(fieldTable));
 
         assertNotNull("The queue was not registered as expected ", queue);
         assertEquals("Maximum delivery count not as expected", 5, queue.getMaximumDeliveryCount());
@@ -301,10 +300,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
      */
     public void testMaximumDeliveryCountDefault() throws Exception
     {
-
-        final AMQShortString queueName = new AMQShortString("testMaximumDeliveryCount");
-
-        final AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(queueName, false, new AMQShortString("owner"), false, false,
+        final AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "testMaximumDeliveryCount", false, "owner", false, false,
                                            _virtualHost, null);
 
         assertNotNull("The queue was not registered as expected ", queue);
@@ -320,7 +316,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
     {
         try
         {
-            AMQQueueFactory.createAMQQueueImpl(null, false, new AMQShortString("owner"), true, false, _virtualHost, null);
+            AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), null, false, "owner", true, false, _virtualHost, null);
             fail("queue with null name can not be created!");
         }
         catch (Exception e)
@@ -347,8 +343,8 @@ public class AMQQueueFactoryTest extends QpidTestCase
 
             FieldTable fieldTable = new FieldTable();
             fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
-            AMQQueueFactory.createAMQQueueImpl(new AMQShortString(queueName), false, new AMQShortString("owner"),
-                    false, false, _virtualHost, fieldTable);
+            AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner",
+                    false, false, _virtualHost, FieldTable.convertToMap(fieldTable));
             fail("queue with DLQ name having more than 255 characters can not be created!");
         }
         catch (Exception e)
@@ -383,8 +379,8 @@ public class AMQQueueFactoryTest extends QpidTestCase
 
             FieldTable fieldTable = new FieldTable();
             fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
-            AMQQueueFactory.createAMQQueueImpl(new AMQShortString(queueName), false, new AMQShortString("owner"),
-                    false, false, _virtualHost, fieldTable);
+            AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner",
+                    false, false, _virtualHost, FieldTable.convertToMap(fieldTable));
             fail("queue with DLE name having more than 255 characters can not be created!");
         }
         catch (Exception e)
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
index 409b9fd92e..190d5c777b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
@@ -32,6 +32,7 @@ import org.apache.qpid.server.flow.LimitlessCreditManager;
 import org.apache.qpid.server.flow.Pre0_10CreditManager;
 import org.apache.qpid.server.message.AMQMessage;
 import org.apache.qpid.server.message.MessageMetaData;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -76,7 +77,7 @@ public class AckTest extends InternalBrokerBaseCase
 
         _protocolSession.addChannel(_channel);
 
-        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("myQ"), false, new AMQShortString("guest"), true, false,
+        _queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "myQ", false, "guest", true, false,
                                                     _virtualHost, null);
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index d2fe529856..2cd423d4c9 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -117,7 +117,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         _virtualHost = new VirtualHostImpl(ApplicationRegistry.getInstance(), vhostConfig);
         applicationRegistry.getVirtualHostRegistry().registerVirtualHost(_virtualHost);
 
-        _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(_qname, false, _owner, false, false, _virtualHost, _arguments);
+        _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), _qname.asString(), false, _owner.asString(), false, false, _virtualHost, FieldTable.convertToMap(_arguments));
 
         _exchange = (DirectExchange)_virtualHost.getExchangeRegistry().getExchange(ExchangeDefaults.DIRECT_EXCHANGE_NAME);
     }
@@ -133,7 +133,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
     {
         _queue.stop();
         try {
-            _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(null, false, _owner, false, false, _virtualHost, _arguments );
+            _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), null, false, _owner.asString(), false, false, _virtualHost, FieldTable.convertToMap(_arguments));
             assertNull("Queue was created", _queue);
         }
         catch (IllegalArgumentException e)
@@ -143,7 +143,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         }
 
         try {
-            _queue = new SimpleAMQQueue(UUIDGenerator.generateUUID(), _qname, false, _owner, false,false, null, Collections.EMPTY_MAP);
+            _queue = new SimpleAMQQueue(UUIDGenerator.generateRandomUUID(), _qname, false, _owner, false,false, null, Collections.EMPTY_MAP);
             assertNull("Queue was created", _queue);
         }
         catch (IllegalArgumentException e)
@@ -152,8 +152,8 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
                     e.getMessage().contains("Host"));
         }
 
-        _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(_qname, false, _owner, false,
-                                                                false, _virtualHost, _arguments);
+        _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), _qname.asString(), false, _owner.asString(), false,
+                                                                false, _virtualHost, FieldTable.convertToMap(_arguments));
         assertNotNull("Queue was not created", _queue);
     }
 
@@ -485,7 +485,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
     public void testAutoDeleteQueue() throws Exception
     {
        _queue.stop();
-       _queue = new SimpleAMQQueue(UUIDGenerator.generateUUID(), _qname, false, null, true, false, _virtualHost, Collections.EMPTY_MAP);
+       _queue = new SimpleAMQQueue(UUIDGenerator.generateRandomUUID(), _qname, false, null, true, false, _virtualHost, Collections.EMPTY_MAP);
        _queue.setDeleteOnNoConsumers(true);
        _queue.registerSubscription(_subscription, false);
        AMQMessage message = createMessage(new Long(25));
@@ -697,7 +697,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
     public void testProcessQueueWithUniqueSelectors() throws Exception
     {
         TestSimpleQueueEntryListFactory factory = new TestSimpleQueueEntryListFactory();
-        SimpleAMQQueue testQueue = new SimpleAMQQueue(UUIDGenerator.generateUUID(), "testQueue", false,"testOwner",
+        SimpleAMQQueue testQueue = new SimpleAMQQueue(UUIDGenerator.generateRandomUUID(), "testQueue", false,"testOwner",
                                                       false, false, _virtualHost, factory, null)
         {
             @Override
@@ -921,7 +921,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         int dequeueMessageIndex = 1;
 
         // create queue with overridden method deliverAsync
-        SimpleAMQQueue testQueue = new SimpleAMQQueue(UUIDGenerator.generateUUID(), new AMQShortString("test"),
+        SimpleAMQQueue testQueue = new SimpleAMQQueue(UUIDGenerator.generateRandomUUID(), new AMQShortString("test"),
                 false, new AMQShortString("testOwner"), false, false, _virtualHost, null)
         {
             @Override
@@ -992,7 +992,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
     public void testEnqueueDequeuedEntry()
     {
         // create a queue where each even entry is considered a dequeued
-        SimpleAMQQueue queue = new SimpleAMQQueue(UUIDGenerator.generateUUID(), new AMQShortString("test"), false,
+        SimpleAMQQueue queue = new SimpleAMQQueue(UUIDGenerator.generateRandomUUID(), new AMQShortString("test"), false,
                 new AMQShortString("testOwner"), false, false, _virtualHost, new QueueEntryListFactory()
                 {
                     public QueueEntryList createQueueEntryList(AMQQueue queue)
@@ -1070,7 +1070,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
 
     public void testActiveConsumerCount() throws Exception
     {
-        final SimpleAMQQueue queue = new SimpleAMQQueue(UUIDGenerator.generateUUID(), new AMQShortString("testActiveConsumerCount"), false,
+        final SimpleAMQQueue queue = new SimpleAMQQueue(UUIDGenerator.generateRandomUUID(), new AMQShortString("testActiveConsumerCount"), false,
                 new AMQShortString("testOwner"), false, false, _virtualHost, new SimpleQueueEntryList.Factory(), null);
 
         //verify adding an active subscription increases the count
@@ -1158,31 +1158,6 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
     }
 
     /**
-     * A helper method to create a queue with given name
-     *
-     * @param name
-     *            queue name
-     * @return queue
-     */
-    private SimpleAMQQueue createQueue(String name)
-    {
-        SimpleAMQQueue queue = null;
-        try
-        {
-            AMQShortString queueName = new AMQShortString(name);
-            AMQShortString ownerName = new AMQShortString(name + "Owner");
-            queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(queueName, false, ownerName, false, false,
-                    _virtualHost, _arguments);
-        }
-        catch (AMQException e)
-        {
-            fail("Failure to create a queue:" + e.getMessage());
-        }
-        assertNotNull("Queue was not created", queue);
-        return queue;
-    }
-
-    /**
      * A helper method to put given number of messages into queue
      * <p>
      * All messages are asserted that they are present on queue
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
index 39ddd1d500..6b82cd361a 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
@@ -21,8 +21,8 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.pool.ReferenceCountingExecutorService;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.util.InternalBrokerBaseCase;
 import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -37,9 +37,8 @@ public class SimpleAMQQueueThreadPoolTest extends InternalBrokerBaseCase
 
         try
         {
-            SimpleAMQQueue queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(new AMQShortString("test"), false,
-                                                                                       new AMQShortString("owner"),
-                                                                                       false, false, test, null);
+            SimpleAMQQueue queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "test", false,
+                                                                                       "owner", false, false, test, null);
 
             assertFalse("Creation did not start Pool.", ReferenceCountingExecutorService.getInstance().getPool().isShutdown());
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
index 8ab32d9710..6dd1aa7dbf 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
@@ -94,8 +94,8 @@ public class DurableConfigurationStoreTest extends QpidTestCase
     {
         super.setUp();
 
-        _queueId = UUIDGenerator.generateUUID();
-        _exchangeId = UUIDGenerator.generateUUID();
+        _queueId = UUIDGenerator.generateRandomUUID();
+        _exchangeId = UUIDGenerator.generateRandomUUID();
 
         _storeName = getName();
         _storePath = TMP_FOLDER + File.separator + _storeName;
@@ -161,7 +161,7 @@ public class DurableConfigurationStoreTest extends QpidTestCase
     public void testBindQueue() throws Exception
     {
         AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false);
-        Binding binding = new Binding(UUIDGenerator.generateUUID(), ROUTING_KEY, queue, _exchange,
+        Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue, _exchange,
                 FieldTable.convertToMap(_bindingArgs));
         _store.bindQueue(binding);
 
@@ -175,7 +175,7 @@ public class DurableConfigurationStoreTest extends QpidTestCase
     public void testUnbindQueue() throws Exception
     {
         AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false);
-        Binding binding = new Binding(UUIDGenerator.generateUUID(), ROUTING_KEY, queue, _exchange,
+        Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue, _exchange,
                 FieldTable.convertToMap(_bindingArgs));
         _store.bindQueue(binding);
 
@@ -360,7 +360,7 @@ public class DurableConfigurationStoreTest extends QpidTestCase
 
     private Record getTestRecord(long messageNumber)
     {
-        UUID queueId1 = UUIDGenerator.generateUUID();
+        UUID queueId1 = UUIDGenerator.generateRandomUUID();
         TransactionLogResource queue1 = mock(TransactionLogResource.class);
         when(queue1.getId()).thenReturn(queueId1);
         EnqueableMessage message1 = mock(EnqueableMessage.class);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index 93f3701c85..a1536565ad 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -695,8 +695,8 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         //Ideally we would be able to use the QueueDeclareHandler here.
         try
         {
-            queue = AMQQueueFactory.createAMQQueueImpl(queueName, durable, queueOwner, false, exclusive,
-                    getVirtualHost(), queueArguments);
+            queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName.asString(), durable, queueOwner.asString(), false, exclusive,
+                    getVirtualHost(), FieldTable.convertToMap(queueArguments));
 
             validateQueueProperties(queue, usePriority, durable, exclusive, lastValueQueue);
 
@@ -734,7 +734,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
         try
         {
-            exchange = type.newInstance(UUIDGenerator.generateUUID(), getVirtualHost(), name, durable, 0, false);
+            exchange = type.newInstance(UUIDGenerator.generateRandomUUID(), getVirtualHost(), name, durable, 0, false);
         }
         catch (AMQException e)
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index 8a18aaff9e..5a54df144f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -37,6 +37,7 @@ import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.logging.SystemOutMessageLogger;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.TestLogActor;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
@@ -91,7 +92,7 @@ public class InternalBrokerBaseCase extends QpidTestCase
         QUEUE_NAME = new AMQShortString("test");        
         // Create a queue on the test Vhost.. this will aid in diagnosing duff tests
         // as the ExpiredMessage Task will log with the test Name.
-        _queue = AMQQueueFactory.createAMQQueueImpl(QUEUE_NAME, false, new AMQShortString("testowner"),
+        _queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), QUEUE_NAME.asString(), false, "testowner",
                                                     false, false, _virtualHost, null);
 
         Exchange defaultExchange = _virtualHost.getExchangeRegistry().getDefaultExchange();
@@ -100,7 +101,7 @@ public class InternalBrokerBaseCase extends QpidTestCase
         _virtualHost = _registry.getVirtualHostRegistry().getVirtualHost("test");
         _messageStore = _virtualHost.getMessageStore();
 
-        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString(getName()), false, new AMQShortString("testowner"),
+        _queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), getName(), false, "testowner",
                                                     false, false, _virtualHost, null);
 
         _virtualHost.getQueueRegistry().registerQueue(_queue);