diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-07-01 20:02:30 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-07-01 20:02:30 +0000 |
| commit | 9dae5ddc233d8871f00cf65b80ec14edb9c6d105 (patch) | |
| tree | a2a25f95bf9982f24c2f740ed219d243e75fee08 /qpid/java/broker/src/main | |
| parent | 56bf10cb7a1ac41f84c26e938d8b9f8fb019fc2a (diff) | |
| download | qpid-python-9dae5ddc233d8871f00cf65b80ec14edb9c6d105.tar.gz | |
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
Diffstat (limited to 'qpid/java/broker/src/main')
3 files changed, 4 insertions, 25 deletions
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, |