consolidate location of constants for destination type capability
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/752f1cc0 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/752f1cc0 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/752f1cc0 Branch: refs/heads/master Commit: 752f1cc0887029fd2643534e7a13a3ce2dff549d Parents: 9d922ca Author: Robert Gemmell <[email protected]> Authored: Wed Jan 7 14:13:03 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Wed Jan 7 16:34:47 2015 +0000 ---------------------------------------------------------------------- .../provider/amqp/AmqpTemporaryDestination.java | 7 +++---- .../amqp/message/AmqpDestinationHelper.java | 13 ++++++++----- .../jms/integration/SessionIntegrationTest.java | 18 +++++++++--------- .../qpid/jms/test/testpeer/TestAmqpPeer.java | 5 +++-- 4 files changed, 23 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/752f1cc0/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java index b1af06a..5ab5607 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.qpid.jms.JmsDestination; +import org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.messaging.DeleteOnClose; import org.apache.qpid.proton.amqp.messaging.Source; @@ -48,8 +49,6 @@ import org.slf4j.LoggerFactory; public class AmqpTemporaryDestination extends AmqpAbstractResource<JmsDestination, Sender> { public static final Symbol DYNAMIC_NODE_LIFETIME_POLICY = Symbol.valueOf("lifetime-policy"); - public static final Symbol TEMP_QUEUE_CAPABILITY = Symbol.valueOf("temporary-queue");//TODO: decide location of constant - public static final Symbol TEMP_TOPIC_CAPABILITY = Symbol.valueOf("temporary-topic");//TODO: decide location of constant private static final String TEMP_QUEUE_CREATOR = "temp-queue-creator:"; private static final String TEMP_TOPIC_CREATOR = "temp-topic-creator:"; @@ -120,9 +119,9 @@ public class AmqpTemporaryDestination extends AmqpAbstractResource<JmsDestinatio // Set the capability to indicate the node type being created if (resource.isQueue()) { - target.setCapabilities(TEMP_QUEUE_CAPABILITY); + target.setCapabilities(AmqpDestinationHelper.TEMP_QUEUE_CAPABILITY); } else { - target.setCapabilities(TEMP_TOPIC_CAPABILITY); + target.setCapabilities(AmqpDestinationHelper.TEMP_TOPIC_CAPABILITY); } Sender sender = session.getProtonSession().sender(senderLinkName); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/752f1cc0/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java index afeeb69..140616e 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java @@ -25,7 +25,6 @@ import org.apache.qpid.jms.JmsTemporaryQueue; import org.apache.qpid.jms.JmsTemporaryTopic; import org.apache.qpid.jms.JmsTopic; import org.apache.qpid.jms.provider.amqp.AmqpConnection; -import org.apache.qpid.jms.provider.amqp.AmqpTemporaryDestination; import org.apache.qpid.proton.amqp.Symbol; /** @@ -41,6 +40,10 @@ public class AmqpDestinationHelper { public static final byte TOPIC_TYPE = 0x01; public static final byte TEMP_QUEUE_TYPE = 0x02; public static final byte TEMP_TOPIC_TYPE = 0x03; + public static final Symbol QUEUE_CAPABILITY = Symbol.valueOf("queue"); + public static final Symbol TOPIC_CAPABILITY = Symbol.valueOf("topic"); + public static final Symbol TEMP_QUEUE_CAPABILITY = Symbol.valueOf("temporary-queue"); + public static final Symbol TEMP_TOPIC_CAPABILITY = Symbol.valueOf("temporary-topic"); private static final byte UNKNOWN_TYPE = -1; /** @@ -301,15 +304,15 @@ public class AmqpDestinationHelper { if (destination.isQueue()) { if (destination.isTemporary()) { - return AmqpTemporaryDestination.TEMP_QUEUE_CAPABILITY; + return TEMP_QUEUE_CAPABILITY; } else { - return Symbol.valueOf("queue");// TODO: constant; + return QUEUE_CAPABILITY; } } else if (destination.isTopic()) { if (destination.isTemporary()) { - return AmqpTemporaryDestination.TEMP_TOPIC_CAPABILITY; + return TEMP_TOPIC_CAPABILITY; } else { - return Symbol.valueOf("topic");// TODO: constant; + return TOPIC_CAPABILITY; } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/752f1cc0/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java index d11692a..48ae0ca 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java @@ -48,7 +48,7 @@ import javax.jms.TopicSubscriber; import org.apache.qpid.jms.JmsConnection; import org.apache.qpid.jms.provider.amqp.AmqpConnectionProperties; -import org.apache.qpid.jms.provider.amqp.AmqpTemporaryDestination; +import org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper; import org.apache.qpid.jms.test.QpidJmsTestCase; import org.apache.qpid.jms.test.testpeer.TestAmqpPeer; import org.apache.qpid.jms.test.testpeer.basictypes.TerminusDurability; @@ -228,18 +228,18 @@ public class SessionIntegrationTest extends QpidJmsTestCase { Destination dest = null; if (destType == Queue.class) { dest = session.createQueue(destName); - nodeTypeCapability = Symbol.valueOf("queue");// TODO: constant + nodeTypeCapability = AmqpDestinationHelper.QUEUE_CAPABILITY; } else if (destType == Topic.class) { dest = session.createTopic(destName); - nodeTypeCapability = Symbol.valueOf("topic");// TODO: constant + nodeTypeCapability = AmqpDestinationHelper.TOPIC_CAPABILITY; } else if (destType == TemporaryQueue.class) { testPeer.expectTempQueueCreationAttach(destName); dest = session.createTemporaryQueue(); - nodeTypeCapability = AmqpTemporaryDestination.TEMP_QUEUE_CAPABILITY; + nodeTypeCapability = AmqpDestinationHelper.TEMP_QUEUE_CAPABILITY; } else if (destType == TemporaryTopic.class) { testPeer.expectTempTopicCreationAttach(destName); dest = session.createTemporaryTopic(); - nodeTypeCapability = AmqpTemporaryDestination.TEMP_TOPIC_CAPABILITY; + nodeTypeCapability = AmqpDestinationHelper.TEMP_TOPIC_CAPABILITY; } else { fail("unexpected type"); } @@ -320,18 +320,18 @@ public class SessionIntegrationTest extends QpidJmsTestCase { Destination dest = null; if (destType == Queue.class) { dest = session.createQueue(destName); - nodeTypeCapability = Symbol.valueOf("queue");// TODO: constant + nodeTypeCapability = AmqpDestinationHelper.QUEUE_CAPABILITY; } else if (destType == Topic.class) { dest = session.createTopic(destName); - nodeTypeCapability = Symbol.valueOf("topic");// TODO: constant + nodeTypeCapability = AmqpDestinationHelper.TOPIC_CAPABILITY; } else if (destType == TemporaryQueue.class) { testPeer.expectTempQueueCreationAttach(destName); dest = session.createTemporaryQueue(); - nodeTypeCapability = AmqpTemporaryDestination.TEMP_QUEUE_CAPABILITY; + nodeTypeCapability = AmqpDestinationHelper.TEMP_QUEUE_CAPABILITY; } else if (destType == TemporaryTopic.class) { testPeer.expectTempTopicCreationAttach(destName); dest = session.createTemporaryTopic(); - nodeTypeCapability = AmqpTemporaryDestination.TEMP_TOPIC_CAPABILITY; + nodeTypeCapability = AmqpDestinationHelper.TEMP_TOPIC_CAPABILITY; } else { fail("unexpected type"); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/752f1cc0/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java index 7933bd4..0604ac8 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java @@ -34,6 +34,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.apache.qpid.jms.provider.amqp.AmqpTemporaryDestination; +import org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper; import org.apache.qpid.jms.test.testpeer.basictypes.ReceiverSettleMode; import org.apache.qpid.jms.test.testpeer.basictypes.Role; import org.apache.qpid.jms.test.testpeer.basictypes.SenderSettleMode; @@ -441,12 +442,12 @@ public class TestAmqpPeer implements AutoCloseable public void expectTempQueueCreationAttach(final String dynamicAddress) { - expectTempNodeCreationAttach(dynamicAddress, AmqpTemporaryDestination.TEMP_QUEUE_CAPABILITY); + expectTempNodeCreationAttach(dynamicAddress, AmqpDestinationHelper.TEMP_QUEUE_CAPABILITY); } public void expectTempTopicCreationAttach(final String dynamicAddress) { - expectTempNodeCreationAttach(dynamicAddress, AmqpTemporaryDestination.TEMP_TOPIC_CAPABILITY); + expectTempNodeCreationAttach(dynamicAddress, AmqpDestinationHelper.TEMP_TOPIC_CAPABILITY); } private void expectTempNodeCreationAttach(final String dynamicAddress, final Symbol nodeTypeCapability) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
