Repository: qpid-jms Updated Branches: refs/heads/master 32fc7d20c -> ae66f1038
QPIDJMS-207 Ensure delivery time is copied from foreign messages Ensure that the message transformer copies the delivery time from the foreign message being copied. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/ae66f103 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/ae66f103 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/ae66f103 Branch: refs/heads/master Commit: ae66f10380b0f99d2933a136b8daf2540386ae34 Parents: 32fc7d2 Author: Timothy Bish <[email protected]> Authored: Thu Nov 3 13:01:09 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Thu Nov 3 13:01:09 2016 -0400 ---------------------------------------------------------------------- .../jms/message/JmsMessageTransformation.java | 1 + .../message/JmsMessageTransformationTest.java | 36 ++++++++++++++++++++ 2 files changed, 37 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ae66f103/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java index b2cb519..9ab4af6 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java @@ -194,6 +194,7 @@ public final class JmsMessageTransformation { target.setJMSReplyTo(transformDestination(connection, source.getJMSReplyTo())); target.setJMSDestination(transformDestination(connection, source.getJMSDestination())); target.setJMSDeliveryMode(source.getJMSDeliveryMode()); + target.setJMSDeliveryTime(source.getJMSDeliveryTime()); target.setJMSRedelivered(source.getJMSRedelivered()); target.setJMSType(source.getJMSType()); target.setJMSExpiration(source.getJMSExpiration()); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ae66f103/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java index 69e1c63..6cd60c8 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import javax.jms.DeliveryMode; import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.MessageEOFException; @@ -272,6 +273,41 @@ public class JmsMessageTransformationTest { //---------- Test Generic Property Copy ----------------------------------// @Test + public void testJMSMessageHeadersAreCopied() throws JMSException { + JmsMessage source = new JmsMessage(new JmsTestMessageFacade()); + JmsMessage target = new JmsMessage(new JmsTestMessageFacade()); + + JmsTopic destination = new JmsTopic(DESTINATION_NAME); + JmsTopic replyTo = new JmsTopic("ReplyTp:" + DESTINATION_NAME); + + source.setJMSMessageID("ID:TEST"); + source.setJMSCorrelationID("ID:CORRELATION"); + source.setJMSReplyTo(replyTo); + source.setJMSDestination(destination); + source.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT); + source.setJMSDeliveryTime(10000); + source.setJMSRedelivered(true); + source.setJMSType("test-type"); + source.setJMSExpiration(15000); + source.setJMSPriority(7); + source.setJMSTimestamp(5000); + + JmsMessageTransformation.copyProperties(createMockJmsConnection(), source, target); + + assertEquals("ID:TEST" , target.getJMSMessageID()); + assertEquals("ID:CORRELATION", target.getJMSCorrelationID()); + assertEquals(replyTo, target.getJMSReplyTo()); + assertEquals(destination, target.getJMSDestination()); + assertEquals(DeliveryMode.NON_PERSISTENT, target.getJMSDeliveryMode()); + assertEquals(10000, target.getJMSDeliveryTime()); + assertEquals(true, target.getJMSRedelivered()); + assertEquals("test-type", target.getJMSType()); + assertEquals(15000, target.getJMSExpiration()); + assertEquals(7, target.getJMSPriority()); + assertEquals(5000, target.getJMSTimestamp()); + } + + @Test public void testJMSMessagePropertiesAreCopied() throws JMSException { JmsMessage source = new JmsMessage(new JmsTestMessageFacade()); JmsMessage target = new JmsMessage(new JmsTestMessageFacade()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
