Author: robbie
Date: Wed Jul 2 12:18:03 2014
New Revision: 1607337
URL: http://svn.apache.org/r1607337
Log:
PROTON-627: restrict keys for DeliveryAnnotations to be Symbols, update the
transformers in contrib/proton-jms accordingly
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java?rev=1607337&r1=1607336&r2=1607337&view=diff
==============================================================================
---
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
(original)
+++
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/InboundTransformer.java
Wed Jul 2 12:18:03 2014
@@ -129,7 +129,7 @@ public abstract class InboundTransformer
final DeliveryAnnotations da = amqp.getDeliveryAnnotations();
if( da!=null ) {
- for (Map.Entry entry : (Set<Map.Entry>)da.getValue().entrySet()) {
+ for (Map.Entry<?,?> entry : da.getValue().entrySet()) {
String key = entry.getKey().toString();
setProperty(jms, prefixVendor + prefixDeliveryAnnotations +
key, entry.getValue());
}
@@ -140,7 +140,7 @@ public abstract class InboundTransformer
final MessageAnnotations ma = amqp.getMessageAnnotations();
if( ma!=null ) {
- for (Map.Entry entry :
(Set<Map.Entry<Symbol,Object>>)ma.getValue().entrySet()) {
+ for (Map.Entry<?,?> entry : ma.getValue().entrySet()) {
String key = entry.getKey().toString();
if( "x-opt-jms-type".equals(key.toString()) ) {
jms.setJMSType(entry.getValue().toString());
Modified:
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java?rev=1607337&r1=1607336&r2=1607337&view=diff
==============================================================================
---
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
(original)
+++
qpid/proton/trunk/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
Wed Jul 2 12:18:03 2014
@@ -85,7 +85,7 @@ public class JMSMappingOutboundTransform
Header header = new Header();
Properties props=new Properties();
- HashMap daMap = null;
+ HashMap<Symbol, Object> daMap = null;
HashMap<Symbol, Object> maMap = null;
HashMap apMap = null;
Section body=null;
@@ -174,11 +174,11 @@ public class JMSMappingOutboundTransform
if( apMap==null ) apMap = new HashMap();
apMap.put(key, value);
} else if( key.startsWith(prefixDeliveryAnnotationsKey) ) {
- if( daMap == null ) daMap = new HashMap();
+ if( daMap == null ) daMap = new HashMap<Symbol, Object>();
String name =
key.substring(prefixDeliveryAnnotationsKey.length());
- daMap.put(name, msg.getObjectProperty(key));
+ daMap.put(Symbol.valueOf(name), msg.getObjectProperty(key));
} else if( key.startsWith(prefixMessageAnnotationsKey) ) {
- if( maMap==null ) maMap = new HashMap();
+ if( maMap==null ) maMap = new HashMap<Symbol, Object>();
String name =
key.substring(prefixMessageAnnotationsKey.length());
maMap.put(Symbol.valueOf(name), msg.getObjectProperty(key));
} else if( key.equals(subjectKey) ) {
Modified:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java?rev=1607337&r1=1607336&r2=1607337&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java
(original)
+++
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/DeliveryAnnotations.java
Wed Jul 2 12:18:03 2014
@@ -25,17 +25,18 @@ package org.apache.qpid.proton.amqp.mess
import java.util.Map;
-public final class DeliveryAnnotations
- implements Section
+import org.apache.qpid.proton.amqp.Symbol;
+
+public final class DeliveryAnnotations implements Section
{
- private final Map _value;
+ private final Map<Symbol, Object> _value;
- public DeliveryAnnotations(Map value)
+ public DeliveryAnnotations(Map<Symbol, Object> value)
{
_value = value;
}
- public Map getValue()
+ public Map<Symbol, Object> getValue()
{
return _value;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
