Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Timothy Bish 2016-09-29 15:37:47 -04:00
parent 01503ed46e
commit 67fc49014e
1 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformer.java
View File

@ -67,16 +67,6 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
public static final byte TEMP_QUEUE_TYPE = 0x02; public static final byte TEMP_QUEUE_TYPE = 0x02;
public static final byte TEMP_TOPIC_TYPE = 0x03; 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) { public JMSMappingOutboundTransformer(JMSVendor vendor) {
super(vendor); super(vendor);
} }
@ -184,9 +174,6 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
maMap = new HashMap<>(); maMap = new HashMap<>();
} }
maMap.put(JMS_DEST_TYPE_MSG_ANNOTATION, destinationType(msg.getJMSDestination())); 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) { if (msg.getJMSReplyTo() != null) {
props.setReplyTo(vendor.toAddress(msg.getJMSReplyTo())); props.setReplyTo(vendor.toAddress(msg.getJMSReplyTo()));
@ -194,9 +181,6 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
maMap = new HashMap<>(); maMap = new HashMap<>();
} }
maMap.put(JMS_REPLY_TO_TYPE_MSG_ANNOTATION, destinationType(msg.getJMSReplyTo())); 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) { if (msg.getJMSCorrelationID() != null) {
String correlationId = msg.getJMSCorrelationID(); String correlationId = msg.getJMSCorrelationID();
@ -339,27 +323,4 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
throw new IllegalArgumentException("Unknown Destination Type passed to JMS Transformer."); 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.");
}
} }