Repository: activemq-artemis Updated Branches: refs/heads/master 01503ed46 -> 507deb6a8
ARTEMIS-763 Remove the legacy Qpid JMS client annotations Removes the append of the destination annotations from the outbound JMS transformer as the legacy client has be unsupported at Qpid for quite some time now. Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/67fc4901 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/67fc4901 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/67fc4901 Branch: refs/heads/master Commit: 67fc49014e85a9e527810dacf4e7a461a183e88a Parents: 01503ed Author: Timothy Bish <[email protected]> Authored: Thu Sep 29 15:37:47 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Thu Sep 29 15:37:47 2016 -0400 ---------------------------------------------------------------------- .../message/JMSMappingOutboundTransformer.java | 39 -------------------- 1 file changed, 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67fc4901/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java index 7de9408..42ee9f2 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java @@ -67,16 +67,6 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer { public static final byte TEMP_QUEUE_TYPE = 0x02; public static final byte TEMP_TOPIC_TYPE = 0x03; - // Deprecated legacy values used by old QPid AMQP 1.0 JMS client. - - public static final Symbol LEGACY_JMS_DEST_TYPE_MSG_ANNOTATION = Symbol.valueOf("x-opt-to-type"); - public static final Symbol LEGACY_JMS_REPLY_TO_TYPE_MSG_ANNOTATION = Symbol.valueOf("x-opt-reply-type"); - - public static final String LEGACY_QUEUE_TYPE = "queue"; - public static final String LEGACY_TOPIC_TYPE = "topic"; - public static final String LEGACY_TEMP_QUEUE_TYPE = "temporary,queue"; - public static final String LEGACY_TEMP_TOPIC_TYPE = "temporary,topic"; - public JMSMappingOutboundTransformer(JMSVendor vendor) { super(vendor); } @@ -184,9 +174,6 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer { maMap = new HashMap<>(); } maMap.put(JMS_DEST_TYPE_MSG_ANNOTATION, destinationType(msg.getJMSDestination())); - - // Deprecated: used by legacy QPid AMQP 1.0 JMS client - maMap.put(LEGACY_JMS_DEST_TYPE_MSG_ANNOTATION, destinationAttributes(msg.getJMSDestination())); } if (msg.getJMSReplyTo() != null) { props.setReplyTo(vendor.toAddress(msg.getJMSReplyTo())); @@ -194,9 +181,6 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer { maMap = new HashMap<>(); } maMap.put(JMS_REPLY_TO_TYPE_MSG_ANNOTATION, destinationType(msg.getJMSReplyTo())); - - // Deprecated: used by legacy QPid AMQP 1.0 JMS client - maMap.put(LEGACY_JMS_REPLY_TO_TYPE_MSG_ANNOTATION, destinationAttributes(msg.getJMSReplyTo())); } if (msg.getJMSCorrelationID() != null) { String correlationId = msg.getJMSCorrelationID(); @@ -339,27 +323,4 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer { throw new IllegalArgumentException("Unknown Destination Type passed to JMS Transformer."); } - - // Used by legacy QPid AMQP 1.0 JMS client. - @Deprecated - private static String destinationAttributes(Destination destination) { - if (destination instanceof Queue) { - if (destination instanceof TemporaryQueue) { - return LEGACY_TEMP_QUEUE_TYPE; - } - else { - return LEGACY_QUEUE_TYPE; - } - } - else if (destination instanceof Topic) { - if (destination instanceof TemporaryTopic) { - return LEGACY_TEMP_TOPIC_TYPE; - } - else { - return LEGACY_TOPIC_TYPE; - } - } - - throw new IllegalArgumentException("Unknown Destination Type passed to JMS Transformer."); - } }
