rename MessageAnnotation related methods/fields for clarity
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/53d91fb4 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/53d91fb4 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/53d91fb4 Branch: refs/heads/master Commit: 53d91fb41f8f843d14962fa6c27a6fd37f4f3995 Parents: fe79024 Author: Robert Gemmell <[email protected]> Authored: Tue Oct 7 17:34:17 2014 +0100 Committer: Robert Gemmell <[email protected]> Committed: Tue Oct 7 17:40:51 2014 +0100 ---------------------------------------------------------------------- .../amqp/message/AmqpDestinationHelper.java | 12 +-- .../amqp/message/AmqpJmsBytesMessageFacade.java | 2 +- .../amqp/message/AmqpJmsMapMessageFacade.java | 2 +- .../amqp/message/AmqpJmsMessageFacade.java | 80 ++++++++++---------- .../message/AmqpJmsObjectMessageFacade.java | 2 +- .../message/AmqpJmsStreamMessageFacade.java | 2 +- .../amqp/message/AmqpJmsTextMessageFacade.java | 2 +- .../amqp/message/AmqpDestinationHelperTest.java | 60 +++++++-------- .../amqp/message/AmqpJmsMessageFacadeTest.java | 2 +- 9 files changed, 82 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/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 d1ebd8a..d492108 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 @@ -105,7 +105,7 @@ public class AmqpDestinationHelper { public JmsDestination getJmsDestination(AmqpJmsMessageFacade message, JmsDestination consumerDestination) { String to = message.getToAddress(); - String toTypeString = (String) message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); + String toTypeString = (String) message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); Set<String> typeSet = null; if (toTypeString != null) { @@ -117,7 +117,7 @@ public class AmqpDestinationHelper { public JmsDestination getJmsReplyTo(AmqpJmsMessageFacade message, JmsDestination consumerDestination) { String replyTo = message.getReplyToAddress(); - String replyToTypeString = (String) message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); + String replyToTypeString = (String) message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); Set<String> typeSet = null; if (replyToTypeString != null) { @@ -173,9 +173,9 @@ public class AmqpDestinationHelper { message.setToAddress(address); if (address == null || typeString == null) { - message.removeAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); + message.removeMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); } else { - message.setAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, typeString); + message.setMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, typeString); } } @@ -186,9 +186,9 @@ public class AmqpDestinationHelper { message.setReplyToAddress(replyToAddress); if (replyToAddress == null || typeString == null) { - message.removeAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); + message.removeMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); } else { - message.setAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, typeString); + message.setMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, typeString); } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java index e4aebf2..7ab8d4a 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java @@ -62,7 +62,7 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J public AmqpJmsBytesMessageFacade(AmqpConnection connection) { super(connection); setContentType(CONTENT_TYPE); - setAnnotation(JMS_MSG_TYPE, JMS_BYTES_MESSAGE); + setMessageAnnotation(JMS_MSG_TYPE, JMS_BYTES_MESSAGE); } /** http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacade.java index 75763ed..d462c18 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacade.java @@ -50,7 +50,7 @@ public class AmqpJmsMapMessageFacade extends AmqpJmsMessageFacade implements Jms public AmqpJmsMapMessageFacade(AmqpConnection connection) { super(connection); initializeEmptyBody(); - setAnnotation(JMS_MSG_TYPE, JMS_MAP_MESSAGE); + setMessageAnnotation(JMS_MSG_TYPE, JMS_MAP_MESSAGE); } /** http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java index 726665c..b23661b 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java @@ -62,8 +62,8 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { protected final Message message; protected final AmqpConnection connection; - private MessageAnnotations annotations; - private Map<Symbol,Object> annotationsMap; + private MessageAnnotations mesageAnnotations; + private Map<Symbol,Object> messageAnnotationsMap; private Map<String,Object> applicationPropertiesMap; private JmsDestination replyTo; @@ -89,7 +89,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { this.message.setDurable(true); this.connection = connection; - setAnnotation(JMS_MSG_TYPE, JMS_MESSAGE); + setMessageAnnotation(JMS_MSG_TYPE, JMS_MESSAGE); } /** @@ -107,9 +107,9 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { this.connection = consumer.getConnection(); this.consumerDestination = consumer.getDestination(); - annotations = message.getMessageAnnotations(); - if (annotations != null) { - annotationsMap = annotations.getValue(); + mesageAnnotations = message.getMessageAnnotations(); + if (mesageAnnotations != null) { + messageAnnotationsMap = mesageAnnotations.getValue(); } if (message.getApplicationProperties() != null) { @@ -240,7 +240,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { setTimestamp(0); } - setAnnotation(JMS_MSG_TYPE, getJmsMsgType()); + setMessageAnnotation(JMS_MSG_TYPE, getJmsMsgType()); } @Override @@ -335,9 +335,9 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { target.applicationPropertiesMap.putAll(applicationPropertiesMap); } - if (annotationsMap != null) { - target.lazyCreateAnnotations(); - target.annotationsMap.putAll(annotationsMap); + if (messageAnnotationsMap != null) { + target.lazyCreateMessageAnnotations(); + target.messageAnnotationsMap.putAll(messageAnnotationsMap); } } @@ -402,7 +402,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { if (baseIdString == null) { return null; } else { - Object annotation = getAnnotation(AmqpMessageSupport.JMS_APP_CORRELATION_ID); + Object annotation = getMessageAnnotation(AmqpMessageSupport.JMS_APP_CORRELATION_ID); boolean appSpecific = Boolean.TRUE.equals(annotation); if (appSpecific) { @@ -440,9 +440,9 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { } if (appSpecific) { - setAnnotation(AmqpMessageSupport.JMS_APP_CORRELATION_ID, true); + setMessageAnnotation(AmqpMessageSupport.JMS_APP_CORRELATION_ID, true); } else { - removeAnnotation(AmqpMessageSupport.JMS_APP_CORRELATION_ID); + removeMessageAnnotation(AmqpMessageSupport.JMS_APP_CORRELATION_ID); } } } @@ -539,12 +539,12 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { @Override public String getType() { - return (String) getAnnotation(JMS_TYPE); + return (String) getMessageAnnotation(JMS_TYPE); } @Override public void setType(String type) { - setAnnotation(JMS_TYPE, type); + setMessageAnnotation(JMS_TYPE, type); } @Override @@ -645,7 +645,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { @Override public void setDestination(JmsDestination destination) { this.destination = destination; - lazyCreateAnnotations(); + lazyCreateMessageAnnotations(); AmqpDestinationHelper.INSTANCE.setToAddressFromDestination(this, destination); } @@ -666,7 +666,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { @Override public void setReplyTo(JmsDestination replyTo) { this.replyTo = replyTo; - lazyCreateAnnotations(); + lazyCreateMessageAnnotations(); AmqpDestinationHelper.INSTANCE.setReplyToAddressFromDestination(this, replyTo); } @@ -766,30 +766,30 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { * * @return true if the annotation is present, false in not or annotations not initialized. */ - boolean annotationExists(String key) { - if (annotationsMap == null) { + boolean messageAnnotationExists(String key) { + if (messageAnnotationsMap == null) { return false; } - return annotationsMap.containsKey(AmqpMessageSupport.getSymbol(key)); + return messageAnnotationsMap.containsKey(AmqpMessageSupport.getSymbol(key)); } /** - * Given an annotation name, lookup and return the value associated with that - * annotation name. If the message annotations have not been created yet then - * this method will always return null. + * Given a message annotation name, lookup and return the value associated with + * that annotation name. If the message annotations have not been created yet + * then this method will always return null. * * @param key * the Symbol name that should be looked up in the message annotations. * * @return the value of the annotation if it exists, or null if not set or not accessible. */ - Object getAnnotation(String key) { - if (annotationsMap == null) { + Object getMessageAnnotation(String key) { + if (messageAnnotationsMap == null) { return null; } - return annotationsMap.get(AmqpMessageSupport.getSymbol(key)); + return messageAnnotationsMap.get(AmqpMessageSupport.getSymbol(key)); } /** @@ -800,12 +800,12 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { * @param key * the annotation key that is to be removed from the current set. */ - void removeAnnotation(String key) { - if (annotationsMap == null) { + void removeMessageAnnotation(String key) { + if (messageAnnotationsMap == null) { return; } - annotationsMap.remove(AmqpMessageSupport.getSymbol(key)); + messageAnnotationsMap.remove(AmqpMessageSupport.getSymbol(key)); } /** @@ -817,17 +817,17 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { * @param value * The new value to set in the annotations of this message. */ - void setAnnotation(String key, Object value) { - lazyCreateAnnotations(); - annotationsMap.put(AmqpMessageSupport.getSymbol(key), value); + void setMessageAnnotation(String key, Object value) { + lazyCreateMessageAnnotations(); + messageAnnotationsMap.put(AmqpMessageSupport.getSymbol(key), value); } /** * Removes all message annotations from this message. */ - void clearAnnotations() { - annotationsMap = null; - annotations = null; + void clearMessageAnnotations() { + messageAnnotationsMap = null; + mesageAnnotations = null; message.setMessageAnnotations(null); } @@ -889,11 +889,11 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade { } } - private void lazyCreateAnnotations() { - if (annotationsMap == null) { - annotationsMap = new HashMap<Symbol,Object>(); - annotations = new MessageAnnotations(annotationsMap); - message.setMessageAnnotations(annotations); + private void lazyCreateMessageAnnotations() { + if (messageAnnotationsMap == null) { + messageAnnotationsMap = new HashMap<Symbol,Object>(); + mesageAnnotations = new MessageAnnotations(messageAnnotationsMap); + message.setMessageAnnotations(mesageAnnotations); } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java index 3e022a0..6791086 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java @@ -46,7 +46,7 @@ public class AmqpJmsObjectMessageFacade extends AmqpJmsMessageFacade implements */ public AmqpJmsObjectMessageFacade(AmqpConnection connection, boolean isAmqpTypeEncoded) { super(connection); - setAnnotation(JMS_MSG_TYPE, JMS_OBJECT_MESSAGE); + setMessageAnnotation(JMS_MSG_TYPE, JMS_OBJECT_MESSAGE); initDelegate(isAmqpTypeEncoded); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java index f0355bf..8e5fa04 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java @@ -52,7 +52,7 @@ public class AmqpJmsStreamMessageFacade extends AmqpJmsMessageFacade implements public AmqpJmsStreamMessageFacade(AmqpConnection connection) { super(connection); list = initializeEmptyBodyList(true); - setAnnotation(JMS_MSG_TYPE, JMS_STREAM_MESSAGE); + setMessageAnnotation(JMS_MSG_TYPE, JMS_STREAM_MESSAGE); } /** http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java index 53359a6..a7a55cd 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java @@ -61,7 +61,7 @@ public class AmqpJmsTextMessageFacade extends AmqpJmsMessageFacade implements Jm */ public AmqpJmsTextMessageFacade(AmqpConnection connection) { super(connection); - setAnnotation(JMS_MSG_TYPE, JMS_TEXT_MESSAGE); + setMessageAnnotation(JMS_MSG_TYPE, JMS_TEXT_MESSAGE); setText(null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/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 b7cfbcc..2caf770 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 @@ -138,7 +138,7 @@ public class AmqpDestinationHelperTest { public void testGetJmsDestinationWithNullAddressAndNullConsumerDestReturnsNull() throws Exception { AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(null); - Mockito.when(message.getAnnotation( + Mockito.when(message.getMessageAnnotation( TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTES_STRING); assertNull(helper.getJmsDestination(message, null)); @@ -148,7 +148,7 @@ public class AmqpDestinationHelperTest { public void testGetJmsDestinationWithNullAddressWithConsumerDestReturnsSameConsumerDestObject() throws Exception { AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(null); - Mockito.when(message.getAnnotation( + Mockito.when(message.getMessageAnnotation( TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTES_STRING); JmsQueue consumerDestination = new JmsQueue("ConsumerDestination"); @@ -160,7 +160,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); + Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); JmsQueue consumerDestination = new JmsQueue("ConsumerDestination"); JmsDestination destination = helper.getJmsDestination(message, consumerDestination); @@ -175,7 +175,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); + Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); JmsDestination consumerDestination = new JmsTopic("ConsumerDestination"); JmsDestination destination = helper.getJmsDestination(message, consumerDestination); @@ -190,7 +190,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); + Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); JmsDestination consumerDestination = new JmsTemporaryQueue("ConsumerDestination"); JmsDestination destination = helper.getJmsDestination(message, consumerDestination); @@ -205,7 +205,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); + Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); JmsDestination consumerDestination = new JmsTemporaryTopic("ConsumerDestination"); JmsDestination destination = helper.getJmsDestination(message, consumerDestination); @@ -220,7 +220,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTES_STRING); + Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTES_STRING); JmsDestination destination = helper.getJmsDestination(message, null); assertNotNull(destination); @@ -234,7 +234,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TOPIC_ATTRIBUTES_STRING); + Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TOPIC_ATTRIBUTES_STRING); JmsDestination destination = helper.getJmsDestination(message, null); assertNotNull(destination); @@ -248,7 +248,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_QUEUE_ATTRIBUTES_STRING); + Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_QUEUE_ATTRIBUTES_STRING); JmsDestination destination = helper.getJmsDestination(message, null); assertNotNull(destination); @@ -262,7 +262,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_TOPIC_ATTRIBUTES_STRING); + Mockito.when(message.getMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_TOPIC_ATTRIBUTES_STRING); JmsDestination destination = helper.getJmsDestination(message, null); assertNotNull(destination); @@ -277,7 +277,7 @@ public class AmqpDestinationHelperTest { public void testGetJmsReplyToWithNullAddressAndNullConsumerDestReturnsNull() throws Exception { AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(null); - Mockito.when(message.getAnnotation( + Mockito.when(message.getMessageAnnotation( REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTES_STRING); assertNull(helper.getJmsDestination(message, null)); @@ -287,7 +287,7 @@ public class AmqpDestinationHelperTest { public void testGetJmsReplyToWithNullAddressWithConsumerDestReturnsNull() throws Exception { AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(null); - Mockito.when(message.getAnnotation( + Mockito.when(message.getMessageAnnotation( REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTES_STRING); JmsQueue consumerDestination = new JmsQueue("ConsumerDestination"); @@ -299,7 +299,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); + Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); JmsQueue consumerDestination = new JmsQueue("ConsumerDestination"); JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination); @@ -314,7 +314,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); + Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); JmsTopic consumerDestination = new JmsTopic("ConsumerDestination"); JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination); @@ -329,7 +329,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); + Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); JmsTemporaryQueue consumerDestination = new JmsTemporaryQueue("ConsumerDestination"); JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination); @@ -344,7 +344,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); + Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(null); JmsTemporaryTopic consumerDestination = new JmsTemporaryTopic("ConsumerDestination"); JmsDestination destination = helper.getJmsReplyTo(message, consumerDestination); @@ -359,7 +359,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTES_STRING); + Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(QUEUE_ATTRIBUTES_STRING); JmsDestination destination = helper.getJmsReplyTo(message, null); assertNotNull(destination); @@ -373,7 +373,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TOPIC_ATTRIBUTES_STRING); + Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TOPIC_ATTRIBUTES_STRING); JmsDestination destination = helper.getJmsReplyTo(message, null); assertNotNull(destination); @@ -387,7 +387,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_QUEUE_ATTRIBUTES_STRING); + Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_QUEUE_ATTRIBUTES_STRING); JmsDestination destination = helper.getJmsReplyTo(message, null); assertNotNull(destination); @@ -401,7 +401,7 @@ public class AmqpDestinationHelperTest { String testAddress = "testAddress"; AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); Mockito.when(message.getReplyToAddress()).thenReturn(testAddress); - Mockito.when(message.getAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_TOPIC_ATTRIBUTES_STRING); + Mockito.when(message.getMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME)).thenReturn(TEMP_TOPIC_ATTRIBUTES_STRING); JmsDestination destination = helper.getJmsReplyTo(message, null); assertNotNull(destination); @@ -417,7 +417,7 @@ public class AmqpDestinationHelperTest { AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); helper.setToAddressFromDestination(message, null); Mockito.verify(message).setToAddress(null); - Mockito.verify(message).removeAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); + Mockito.verify(message).removeMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); } @Test(expected=NullPointerException.class) @@ -440,7 +440,7 @@ public class AmqpDestinationHelperTest { helper.setToAddressFromDestination(message, destination); Mockito.verify(message).setToAddress(testAddress); - Mockito.verify(message).setAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, QUEUE_ATTRIBUTES_STRING); + Mockito.verify(message).setMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, QUEUE_ATTRIBUTES_STRING); } @Test @@ -452,7 +452,7 @@ public class AmqpDestinationHelperTest { helper.setToAddressFromDestination(message, destination); Mockito.verify(message).setToAddress(testAddress); - Mockito.verify(message).setAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TOPIC_ATTRIBUTES_STRING); + Mockito.verify(message).setMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TOPIC_ATTRIBUTES_STRING); } @Test @@ -464,7 +464,7 @@ public class AmqpDestinationHelperTest { helper.setToAddressFromDestination(message, destination); Mockito.verify(message).setToAddress(testAddress); - Mockito.verify(message).setAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TEMP_QUEUE_ATTRIBUTES_STRING); + Mockito.verify(message).setMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TEMP_QUEUE_ATTRIBUTES_STRING); } @Test @@ -476,7 +476,7 @@ public class AmqpDestinationHelperTest { helper.setToAddressFromDestination(message, destination); Mockito.verify(message).setToAddress(testAddress); - Mockito.verify(message).setAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TEMP_TOPIC_ATTRIBUTES_STRING); + Mockito.verify(message).setMessageAnnotation(TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TEMP_TOPIC_ATTRIBUTES_STRING); } //--------------- Test setReplyToAddressFromDestination method -----------// @@ -486,7 +486,7 @@ public class AmqpDestinationHelperTest { AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class); helper.setReplyToAddressFromDestination(message, null); Mockito.verify(message).setReplyToAddress(null); - Mockito.verify(message).removeAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); + Mockito.verify(message).removeMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME); } @Test(expected=NullPointerException.class) @@ -509,7 +509,7 @@ public class AmqpDestinationHelperTest { helper.setReplyToAddressFromDestination(message, destination); Mockito.verify(message).setReplyToAddress(testAddress); - Mockito.verify(message).setAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, QUEUE_ATTRIBUTES_STRING); + Mockito.verify(message).setMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, QUEUE_ATTRIBUTES_STRING); } @Test @@ -521,7 +521,7 @@ public class AmqpDestinationHelperTest { helper.setReplyToAddressFromDestination(message, destination); Mockito.verify(message).setReplyToAddress(testAddress); - Mockito.verify(message).setAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TOPIC_ATTRIBUTES_STRING); + Mockito.verify(message).setMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TOPIC_ATTRIBUTES_STRING); } @Test @@ -533,7 +533,7 @@ public class AmqpDestinationHelperTest { helper.setReplyToAddressFromDestination(message, destination); Mockito.verify(message).setReplyToAddress(testAddress); - Mockito.verify(message).setAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TEMP_QUEUE_ATTRIBUTES_STRING); + Mockito.verify(message).setMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TEMP_QUEUE_ATTRIBUTES_STRING); } @Test @@ -545,7 +545,7 @@ public class AmqpDestinationHelperTest { helper.setReplyToAddressFromDestination(message, destination); Mockito.verify(message).setReplyToAddress(testAddress); - Mockito.verify(message).setAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TEMP_TOPIC_ATTRIBUTES_STRING); + Mockito.verify(message).setMessageAnnotation(REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME, TEMP_TOPIC_ATTRIBUTES_STRING); } //--------------- Test Support Methods -----------------------------------// http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/53d91fb4/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java index 963fefd..efa430f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java @@ -787,7 +787,7 @@ public class AmqpJmsMessageFacadeTest { assertEquals("Unexpected correlationId value on underlying AMQP message", stripped, amqpMessage.getCorrelationId()); assertEquals("Expected correlationId not returned from facade", testCorrelationId, amqpMessageFacade.getCorrelationId()); - assertNull("Message annotation " + AmqpMessageSupport.JMS_APP_CORRELATION_ID + " not null as expected", amqpMessageFacade.getAnnotation(AmqpMessageSupport.JMS_APP_CORRELATION_ID)); + assertNull("Message annotation " + AmqpMessageSupport.JMS_APP_CORRELATION_ID + " not null as expected", amqpMessageFacade.getMessageAnnotation(AmqpMessageSupport.JMS_APP_CORRELATION_ID)); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
