You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/01/02 17:21:17 UTC
[4/9] qpid-jms git commit: rename constants to make their usage
clearer
rename constants to make their usage clearer
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/03463f8f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/03463f8f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/03463f8f
Branch: refs/heads/master
Commit: 03463f8fdf3e26157886400cb7223246ec81a4c9
Parents: f797c60
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Jan 2 14:50:28 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Jan 2 14:50:28 2015 +0000
----------------------------------------------------------------------
.../amqp/message/AmqpDestinationHelper.java | 26 +++---
.../jms/integration/MessageIntegrationTest.java | 10 +-
.../amqp/message/AmqpDestinationHelperTest.java | 98 ++++++++++----------
3 files changed, 67 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/03463f8f/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 fb6f9b4..16c9a0a 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
@@ -43,11 +43,11 @@ public class AmqpDestinationHelper {
private static final byte UNKNOWN_TYPE = -1;
// For support of old string type values
- public static final String TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME = "x-opt-to-type";
- public static final String REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME = "x-opt-reply-type";
- public static final String QUEUE_ATTRIBUTE = "queue";
- public static final String TOPIC_ATTRIBUTE = "topic";
- public static final String TEMPORARY_ATTRIBUTE = "temporary";
+ public static final String LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME = "x-opt-to-type";
+ public static final String LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME = "x-opt-reply-type";
+ public static final String LEGACY_QUEUE_ATTRIBUTE = "queue";
+ public static final String LEGACY_TOPIC_ATTRIBUTE = "topic";
+ public static final String LEGACY_TEMPORARY_ATTRIBUTE = "temporary";
/**
* Decode the provided To address, type description, and consumer destination
@@ -67,7 +67,7 @@ public class AmqpDestinationHelper {
byte typeByte = getTypeByte(message, JMS_DEST_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
if (typeByte == UNKNOWN_TYPE) {
// Try the legacy string type annotation
- typeByte = getTypeByte(message, TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
+ typeByte = getTypeByte(message, LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
}
String name = stripPrefixIfNecessary(to, message.getConnection(), typeByte, consumerDestination);
@@ -80,7 +80,7 @@ public class AmqpDestinationHelper {
byte typeByte = getTypeByte(message, JMS_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
if (typeByte == UNKNOWN_TYPE) {
// Try the legacy string type annotation
- typeByte = getTypeByte(message, REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
+ typeByte = getTypeByte(message, LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
}
String name = stripPrefixIfNecessary(replyTo, message.getConnection(), typeByte, consumerDestination);
@@ -168,7 +168,7 @@ public class AmqpDestinationHelper {
}
// Always clear the legacy string type annotation
- message.removeMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
+ message.removeMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
}
public void setReplyToAddressFromDestination(AmqpJmsMessageFacade message, JmsDestination destination) {
@@ -185,7 +185,7 @@ public class AmqpDestinationHelper {
}
// Always clear the legacy string type annotation
- message.removeMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
+ message.removeMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
}
public String getDestinationAddress(JmsDestination destination, AmqpConnection conn) {
@@ -278,14 +278,14 @@ public class AmqpDestinationHelper {
}
if (typeSet != null && !typeSet.isEmpty()) {
- if (typeSet.contains(QUEUE_ATTRIBUTE)) {
- if (typeSet.contains(TEMPORARY_ATTRIBUTE)) {
+ if (typeSet.contains(LEGACY_QUEUE_ATTRIBUTE)) {
+ if (typeSet.contains(LEGACY_TEMPORARY_ATTRIBUTE)) {
return TEMP_QUEUE_TYPE;
} else {
return QUEUE_TYPE;
}
- } else if (typeSet.contains(TOPIC_ATTRIBUTE)) {
- if (typeSet.contains(TEMPORARY_ATTRIBUTE)) {
+ } else if (typeSet.contains(LEGACY_TOPIC_ATTRIBUTE)) {
+ if (typeSet.contains(LEGACY_TEMPORARY_ATTRIBUTE)) {
return TEMP_TOPIC_TYPE;
} else {
return TOPIC_TYPE;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/03463f8f/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java
index 78aecf9..49bab7d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java
@@ -919,7 +919,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that lack of any destination type annotation value (via either
* {@link AmqpDestinationHelper#JMS_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME}
- * or {@link AmqpDestinationHelper#REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME}) set
+ * or {@link AmqpDestinationHelper#LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME}) set
* on a message to indicate type of its 'reply-to' address results in it
* being classed as the same type as the consumer destination.
*/
@@ -1042,7 +1042,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase
// --- old string destination type annotation values --- //
/**
- * Tests that the {@link AmqpDestinationHelper#TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME} set on a message to
+ * Tests that the {@link AmqpDestinationHelper#LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME} set on a message to
* indicate its 'to' address represents a Topic results in the JMSDestination object being a
* Topic. Ensure the consumers destination is not used by consuming from a Queue.
*/
@@ -1058,7 +1058,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase
Queue queue = session.createQueue("myQueue");
MessageAnnotationsDescribedType msgAnnotations = new MessageAnnotationsDescribedType();
- msgAnnotations.setSymbolKeyedAnnotation(AmqpDestinationHelper.TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, AmqpDestinationHelper.TOPIC_ATTRIBUTE);
+ msgAnnotations.setSymbolKeyedAnnotation(AmqpDestinationHelper.LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, AmqpDestinationHelper.LEGACY_TOPIC_ATTRIBUTE);
PropertiesDescribedType props = new PropertiesDescribedType();
String myTopicAddress = "myTopicAddress";
@@ -1084,7 +1084,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase
}
/**
- * Tests that the {@link AmqpDestinationHelper#REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME} set on a message to
+ * Tests that the {@link AmqpDestinationHelper#LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME} set on a message to
* indicate its 'reply-to' address represents a Topic results in the JMSReplyTo object being a
* Topic. Ensure the consumers destination is not used by consuming from a Queue.
*/
@@ -1100,7 +1100,7 @@ public class MessageIntegrationTest extends QpidJmsTestCase
Queue queue = session.createQueue("myQueue");
MessageAnnotationsDescribedType msgAnnotations = new MessageAnnotationsDescribedType();
- msgAnnotations.setSymbolKeyedAnnotation(AmqpDestinationHelper.REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, AmqpDestinationHelper.TOPIC_ATTRIBUTE);
+ msgAnnotations.setSymbolKeyedAnnotation(AmqpDestinationHelper.LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, AmqpDestinationHelper.LEGACY_TOPIC_ATTRIBUTE);
PropertiesDescribedType props = new PropertiesDescribedType();
String myTopicAddress = "myTopicAddress";
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/03463f8f/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelperTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelperTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelperTest.java
index dea756b..d47aa24 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelperTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelperTest.java
@@ -18,15 +18,15 @@ package org.apache.qpid.jms.provider.amqp.message;
import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.JMS_DEST_TYPE_MSG_ANNOTATION_SYMBOL_NAME;
import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.JMS_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME;
-import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.QUEUE_ATTRIBUTE;
+import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.LEGACY_QUEUE_ATTRIBUTE;
import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.QUEUE_TYPE;
-import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME;
-import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.TEMPORARY_ATTRIBUTE;
+import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME;
+import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.LEGACY_TEMPORARY_ATTRIBUTE;
import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.TEMP_QUEUE_TYPE;
import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.TEMP_TOPIC_TYPE;
-import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.TOPIC_ATTRIBUTE;
+import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.LEGACY_TOPIC_ATTRIBUTE;
import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.TOPIC_TYPE;
-import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME;
+import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -47,8 +47,8 @@ import org.junit.Test;
import org.mockito.Mockito;
public class AmqpDestinationHelperTest {
- public static final String TEMP_QUEUE_ATTRIBUTES_STRING = QUEUE_ATTRIBUTE + "," + TEMPORARY_ATTRIBUTE;
- public static final String TEMP_TOPIC_ATTRIBUTES_STRING = TOPIC_ATTRIBUTE + "," + TEMPORARY_ATTRIBUTE;
+ public static final String TEMP_QUEUE_ATTRIBUTES_STRING = LEGACY_QUEUE_ATTRIBUTE + "," + LEGACY_TEMPORARY_ATTRIBUTE;
+ public static final String TEMP_TOPIC_ATTRIBUTES_STRING = LEGACY_TOPIC_ATTRIBUTE + "," + LEGACY_TEMPORARY_ATTRIBUTE;
private final AmqpDestinationHelper helper = AmqpDestinationHelper.INSTANCE;
@@ -60,7 +60,7 @@ public class AmqpDestinationHelperTest {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
Mockito.when(message.getToAddress()).thenReturn(null);
Mockito.when(message.getMessageAnnotation(
- TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTE);
+ LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(LEGACY_QUEUE_ATTRIBUTE);
assertNull(helper.getJmsDestination(message, null));
}
@@ -70,7 +70,7 @@ public class AmqpDestinationHelperTest {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
Mockito.when(message.getToAddress()).thenReturn(null);
Mockito.when(message.getMessageAnnotation(
- TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTE);
+ LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(LEGACY_QUEUE_ATTRIBUTE);
JmsDestination consumerDestination = new JmsQueue("ConsumerDestination");
assertSame(consumerDestination, helper.getJmsDestination(message, consumerDestination));
@@ -86,7 +86,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn("");
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn("");
JmsQueue consumerDestination = new JmsQueue("ConsumerDestination");
JmsDestination destination = helper.getJmsDestination(message, consumerDestination);
@@ -103,7 +103,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn("jms.queue");
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn("jms.queue");
JmsQueue consumerDestination = new JmsQueue("ConsumerDestination");
JmsDestination destination = helper.getJmsDestination(message, consumerDestination);
@@ -120,7 +120,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsDestination consumerDestination = Mockito.mock(JmsDestination.class);
Mockito.when(consumerDestination.getName()).thenReturn("ConsumerDestination");
@@ -139,7 +139,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsQueue consumerDestination = new JmsQueue("ConsumerDestination");
JmsDestination destination = helper.getJmsDestination(message, consumerDestination);
@@ -156,7 +156,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsDestination consumerDestination = new JmsTopic("ConsumerDestination");
JmsDestination destination = helper.getJmsDestination(message, consumerDestination);
@@ -173,7 +173,7 @@ public class AmqpDestinationHelperTest {
Mockito.when(message.getToAddress()).thenReturn(testAddress);
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsDestination consumerDestination = new JmsTemporaryQueue("ConsumerDestination");
JmsDestination destination = helper.getJmsDestination(message, consumerDestination);
@@ -190,7 +190,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsDestination consumerDestination = new JmsTemporaryTopic("ConsumerDestination");
JmsDestination destination = helper.getJmsDestination(message, consumerDestination);
@@ -207,7 +207,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTE);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(LEGACY_QUEUE_ATTRIBUTE);
JmsDestination destination = helper.getJmsDestination(message, null);
assertNotNull(destination);
@@ -223,7 +223,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TOPIC_ATTRIBUTE);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(LEGACY_TOPIC_ATTRIBUTE);
JmsDestination destination = helper.getJmsDestination(message, null);
assertNotNull(destination);
@@ -237,7 +237,7 @@ public class AmqpDestinationHelperTest {
String testAddress = "testAddress";
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_QUEUE_ATTRIBUTES_STRING);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_QUEUE_ATTRIBUTES_STRING);
JmsDestination destination = helper.getJmsDestination(message, null);
assertNotNull(destination);
@@ -251,7 +251,7 @@ public class AmqpDestinationHelperTest {
String testAddress = "testAddress";
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
Mockito.when(message.getToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_TOPIC_ATTRIBUTES_STRING);
+ Mockito.when(message.getMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_TOPIC_ATTRIBUTES_STRING);
JmsDestination destination = helper.getJmsDestination(message, null);
assertNotNull(destination);
@@ -268,7 +268,7 @@ public class AmqpDestinationHelperTest {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
Mockito.when(message.getReplyToAddress()).thenReturn(null);
Mockito.when(message.getMessageAnnotation(
- REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTE);
+ LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(LEGACY_QUEUE_ATTRIBUTE);
assertNull(helper.getJmsDestination(message, null));
}
@@ -278,7 +278,7 @@ public class AmqpDestinationHelperTest {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
Mockito.when(message.getReplyToAddress()).thenReturn(null);
Mockito.when(message.getMessageAnnotation(
- REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTE);
+ LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(LEGACY_QUEUE_ATTRIBUTE);
JmsQueue consumerDestination = new JmsQueue("ConsumerDestination");
assertNull(helper.getJmsReplyTo(message, consumerDestination));
@@ -292,7 +292,7 @@ public class AmqpDestinationHelperTest {
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsQueue consumerDestination = new JmsQueue("ConsumerDestination");
JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination);
@@ -309,7 +309,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsDestination consumerDestination = Mockito.mock(JmsDestination.class);
Mockito.when(consumerDestination.getName()).thenReturn("ConsumerDestination");
@@ -328,7 +328,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn("");
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn("");
JmsQueue consumerDestination = new JmsQueue("ConsumerDestination");
JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination);
@@ -345,7 +345,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn("jms.queue");
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn("jms.queue");
JmsQueue consumerDestination = new JmsQueue("ConsumerDestination");
JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination);
@@ -362,7 +362,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsTopic consumerDestination = new JmsTopic("ConsumerDestination");
JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination);
@@ -379,7 +379,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsTemporaryQueue consumerDestination = new JmsTemporaryQueue("ConsumerDestination");
JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination);
@@ -396,7 +396,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null);
JmsTemporaryTopic consumerDestination = new JmsTemporaryTopic("ConsumerDestination");
JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination);
@@ -413,7 +413,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTE);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(LEGACY_QUEUE_ATTRIBUTE);
JmsDestination destination = helper.getJmsReplyTo(message, null);
assertNotNull(destination);
@@ -429,7 +429,7 @@ public class AmqpDestinationHelperTest {
AmqpConnection conn = Mockito.mock(AmqpConnection.class);
Mockito.when(message.getConnection()).thenReturn(conn);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TOPIC_ATTRIBUTE);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(LEGACY_TOPIC_ATTRIBUTE);
JmsDestination destination = helper.getJmsReplyTo(message, null);
assertNotNull(destination);
@@ -443,7 +443,7 @@ public class AmqpDestinationHelperTest {
String testAddress = "testAddress";
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_QUEUE_ATTRIBUTES_STRING);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_QUEUE_ATTRIBUTES_STRING);
JmsDestination destination = helper.getJmsReplyTo(message, null);
assertNotNull(destination);
@@ -457,7 +457,7 @@ public class AmqpDestinationHelperTest {
String testAddress = "testAddress";
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
Mockito.when(message.getReplyToAddress()).thenReturn(testAddress);
- Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_TOPIC_ATTRIBUTES_STRING);
+ Mockito.when(message.getMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_TOPIC_ATTRIBUTES_STRING);
JmsDestination destination = helper.getJmsReplyTo(message, null);
assertNotNull(destination);
@@ -499,7 +499,7 @@ public class AmqpDestinationHelperTest {
helper.setToAddressFromDestination(message, destination);
Mockito.verify(message).setToAddress(testAddress);
- Mockito.verify(message).removeMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
+ Mockito.verify(message).removeMessageAnnotation(LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
}
@Test
@@ -614,7 +614,7 @@ public class AmqpDestinationHelperTest {
helper.setReplyToAddressFromDestination(message, destination);
Mockito.verify(message).setReplyToAddress(testAddress);
- Mockito.verify(message).removeMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
+ Mockito.verify(message).removeMessageAnnotation(LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME);
}
@Test
@@ -675,34 +675,34 @@ public class AmqpDestinationHelperTest {
public void testSplitAttributeWithExtraneousCommas() throws Exception {
Set<String> set = new HashSet<String>();
- set.add(AmqpDestinationHelper.QUEUE_ATTRIBUTE);
- set.add(AmqpDestinationHelper.TEMPORARY_ATTRIBUTE);
+ set.add(AmqpDestinationHelper.LEGACY_QUEUE_ATTRIBUTE);
+ set.add(AmqpDestinationHelper.LEGACY_TEMPORARY_ATTRIBUTE);
// test for no NPE errors.
assertNull(helper.splitAttributesString(null));
// test a single comma separator produces expected set
- assertEquals(set, helper.splitAttributesString(QUEUE_ATTRIBUTE + "," +
- AmqpDestinationHelper.TEMPORARY_ATTRIBUTE));
+ assertEquals(set, helper.splitAttributesString(LEGACY_QUEUE_ATTRIBUTE + "," +
+ AmqpDestinationHelper.LEGACY_TEMPORARY_ATTRIBUTE));
// test trailing comma doesn't alter produced set
- assertEquals(set, helper.splitAttributesString(QUEUE_ATTRIBUTE + "," +
- AmqpDestinationHelper.TEMPORARY_ATTRIBUTE + ","));
+ assertEquals(set, helper.splitAttributesString(LEGACY_QUEUE_ATTRIBUTE + "," +
+ AmqpDestinationHelper.LEGACY_TEMPORARY_ATTRIBUTE + ","));
// test leading comma doesn't alter produced set
- assertEquals(set, helper.splitAttributesString("," + QUEUE_ATTRIBUTE + ","
- + AmqpDestinationHelper.TEMPORARY_ATTRIBUTE));
+ assertEquals(set, helper.splitAttributesString("," + LEGACY_QUEUE_ATTRIBUTE + ","
+ + AmqpDestinationHelper.LEGACY_TEMPORARY_ATTRIBUTE));
// test consecutive central commas don't alter produced set
- assertEquals(set, helper.splitAttributesString(QUEUE_ATTRIBUTE + ",," +
- AmqpDestinationHelper.TEMPORARY_ATTRIBUTE));
+ assertEquals(set, helper.splitAttributesString(LEGACY_QUEUE_ATTRIBUTE + ",," +
+ AmqpDestinationHelper.LEGACY_TEMPORARY_ATTRIBUTE));
// test consecutive trailing commas don't alter produced set
- assertEquals(set, helper.splitAttributesString(QUEUE_ATTRIBUTE + "," +
- AmqpDestinationHelper.TEMPORARY_ATTRIBUTE + ",,"));
+ assertEquals(set, helper.splitAttributesString(LEGACY_QUEUE_ATTRIBUTE + "," +
+ AmqpDestinationHelper.LEGACY_TEMPORARY_ATTRIBUTE + ",,"));
// test consecutive leading commas don't alter produced set
- assertEquals(set, helper.splitAttributesString("," + QUEUE_ATTRIBUTE + ","
- + AmqpDestinationHelper.TEMPORARY_ATTRIBUTE));
+ assertEquals(set, helper.splitAttributesString("," + LEGACY_QUEUE_ATTRIBUTE + ","
+ + AmqpDestinationHelper.LEGACY_TEMPORARY_ATTRIBUTE));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org