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

This closes #2273

This commit is contained in:
Clebert Suconic 2018-09-04 13:17:22 -04:00
parent 2f63260680 fab96c4b1c
commit 455b8892b2
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
View File

@ -199,7 +199,7 @@ public class AmqpCoreConverter {
if (str.equals(AMQPMessage.ADDRESS_PROPERTY)) { if (str.equals(AMQPMessage.ADDRESS_PROPERTY)) {
continue; continue;
} }
result.getInnerMessage().putBytesProperty(str, properties.getBytesProperty(str)); result.getInnerMessage().putObjectProperty(str, properties.getProperty(str));
} }
} }

34
artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/TestConversions.java
View File

@ -22,12 +22,14 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.activemq.artemis.api.core.ICoreMessage; import org.apache.activemq.artemis.api.core.ICoreMessage;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.protocol.amqp.broker.AMQPMessage; import org.apache.activemq.artemis.protocol.amqp.broker.AMQPMessage;
import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSBytesMessage; import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSBytesMessage;
import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSMapMessage; import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSMapMessage;
import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSMessage; import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSMessage;
import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSStreamMessage; import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSStreamMessage;
import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSTextMessage; import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSTextMessage;
import org.apache.activemq.artemis.utils.collections.TypedProperties;
import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.messaging.AmqpSequence; import org.apache.qpid.proton.amqp.messaging.AmqpSequence;
import org.apache.qpid.proton.amqp.messaging.AmqpValue; import org.apache.qpid.proton.amqp.messaging.AmqpValue;
@ -112,6 +114,14 @@ public class TestConversions extends Assert {
return mapprop; return mapprop;
} }
private TypedProperties createTypedPropertiesMap() {
TypedProperties typedProperties = new TypedProperties();
typedProperties.putBooleanProperty(new SimpleString("true"), Boolean.TRUE);
typedProperties.putBooleanProperty(new SimpleString("false"), Boolean.FALSE);
typedProperties.putSimpleStringProperty(new SimpleString("foo"), new SimpleString("bar"));
return typedProperties;
}
@Test @Test
public void testSimpleConversionMap() throws Exception { public void testSimpleConversionMap() throws Exception {
Map<String, Object> mapprop = createPropertiesMap(); Map<String, Object> mapprop = createPropertiesMap();
@ -192,4 +202,28 @@ public class TestConversions extends Assert {
} }
@Test
public void testSimpleConversionWithExtraProperties() throws Exception {
MessageImpl message = (MessageImpl) Message.Factory.create();
String text = "someText";
message.setBody(new AmqpValue(text));
AMQPMessage encodedMessage = new AMQPMessage(message);
TypedProperties extraProperties = createTypedPropertiesMap();
extraProperties.putBytesProperty(new SimpleString("bytesProp"), "value".getBytes());
encodedMessage.setExtraProperties(extraProperties);
ICoreMessage serverMessage = encodedMessage.toCore();
ServerJMSTextMessage textMessage = (ServerJMSTextMessage) ServerJMSMessage.wrapCoreMessage(serverMessage);
textMessage.decode();
verifyProperties(textMessage);
assertEquals("value", new String(((byte[]) textMessage.getObjectProperty("bytesProp"))));
Assert.assertEquals(text, textMessage.getText());
}
} }