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 #1828

This commit is contained in:
Michael Pearce 2018-02-05 16:10:02 +00:00
parent 5ed518f412 a259b6972c
commit c3ea288c62
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/jms/ServerJMSMapMessage.java
View File

@ -29,6 +29,10 @@ import org.apache.activemq.artemis.api.core.ICoreMessage;
import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.utils.collections.TypedProperties; import org.apache.activemq.artemis.utils.collections.TypedProperties;
import org.apache.qpid.proton.amqp.UnsignedByte;
import org.apache.qpid.proton.amqp.UnsignedInteger;
import org.apache.qpid.proton.amqp.UnsignedLong;
import org.apache.qpid.proton.amqp.UnsignedShort;
import static org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap; import static org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap;
import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap; import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap;
@ -122,7 +126,18 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
@Override @Override
public void setObject(final String name, final Object value) throws JMSException { public void setObject(final String name, final Object value) throws JMSException {
try { try {
TypedProperties.setObjectProperty(new SimpleString(name), value, map); // primitives and String
Object val = value;
if (value instanceof UnsignedInteger) {
val = ((UnsignedInteger) value).intValue();
} else if (value instanceof UnsignedShort) {
val = ((UnsignedShort) value).shortValue();
} else if (value instanceof UnsignedByte) {
val = ((UnsignedByte) value).byteValue();
} else if (value instanceof UnsignedLong) {
val = ((UnsignedLong) value).longValue();
}
TypedProperties.setObjectProperty(new SimpleString(name), val, map);
} catch (ActiveMQPropertyConversionException e) { } catch (ActiveMQPropertyConversionException e) {
throw new MessageFormatException(e.getMessage()); throw new MessageFormatException(e.getMessage());
} }

36
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpManagementTest.java
View File

@ -16,19 +16,27 @@
*/ */
package org.apache.activemq.artemis.tests.integration.amqp; package org.apache.activemq.artemis.tests.integration.amqp;
import java.util.LinkedHashMap;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.api.core.management.ResourceNames;
import org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSMapMessage;
import org.apache.activemq.transport.amqp.client.AmqpClient; import org.apache.activemq.transport.amqp.client.AmqpClient;
import org.apache.activemq.transport.amqp.client.AmqpConnection; import org.apache.activemq.transport.amqp.client.AmqpConnection;
import org.apache.activemq.transport.amqp.client.AmqpMessage; import org.apache.activemq.transport.amqp.client.AmqpMessage;
import org.apache.activemq.transport.amqp.client.AmqpReceiver; import org.apache.activemq.transport.amqp.client.AmqpReceiver;
import org.apache.activemq.transport.amqp.client.AmqpSender; import org.apache.activemq.transport.amqp.client.AmqpSender;
import org.apache.activemq.transport.amqp.client.AmqpSession; import org.apache.activemq.transport.amqp.client.AmqpSession;
import org.apache.qpid.proton.amqp.UnsignedByte;
import org.apache.qpid.proton.amqp.UnsignedInteger;
import org.apache.qpid.proton.amqp.UnsignedLong;
import org.apache.qpid.proton.amqp.UnsignedShort;
import org.apache.qpid.proton.amqp.messaging.AmqpValue; import org.apache.qpid.proton.amqp.messaging.AmqpValue;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import static org.apache.activemq.artemis.protocol.amqp.converter.AMQPMessageSupport.createMapMessage;
public class AmqpManagementTest extends AmqpClientTestSupport { public class AmqpManagementTest extends AmqpClientTestSupport {
@Test(timeout = 60000) @Test(timeout = 60000)
@ -65,4 +73,32 @@ public class AmqpManagementTest extends AmqpClientTestSupport {
connection.close(); connection.close();
} }
} }
/**
* Some clients use Unsigned types from org.apache.qpid.proton.amqp
* @throws Exception
*/
@Test(timeout = 60000)
public void testUnsignedValues() throws Exception {
int sequence = 42;
LinkedHashMap<String, Object> map = new LinkedHashMap<>();
map.put("sequence", new UnsignedInteger(sequence));
ServerJMSMapMessage msg = createMapMessage(1, map, null);
assertEquals(msg.getInt("sequence"), sequence);
map.clear();
map.put("sequence", new UnsignedLong(sequence));
msg = createMapMessage(1, map, null);
assertEquals(msg.getLong("sequence"), sequence);
map.clear();
map.put("sequence", new UnsignedShort((short)sequence));
msg = createMapMessage(1, map, null);
assertEquals(msg.getShort("sequence"), sequence);
map.clear();
map.put("sequence", new UnsignedByte((byte) sequence));
msg = createMapMessage(1, map, null);
assertEquals(msg.getByte("sequence"), sequence);
}
} }