[camel] branch master updated: CAMEL-12455 - add DELIVERY_MODE to headers

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new fab7a58  CAMEL-12455 - add DELIVERY_MODE to headers
fab7a58 is described below

commit fab7a58e56e128286f327aba16c09553b26cb846
Author: Sezgin <on...@nokia.com>
AuthorDate: Thu Apr 26 20:23:03 2018 +0300

    CAMEL-12455 - add DELIVERY_MODE to headers
    
    add unit test for setting DELIVERY_MODE header
---
 .../component/rabbitmq/RabbitMQMessageConverter.java      |  3 +++
 .../camel/component/rabbitmq/RabbitMQConsumerIntTest.java | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
index f595848..6cb535e 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
@@ -78,6 +78,9 @@ public class RabbitMQMessageConverter {
         if (properties.getUserId() != null) {
             exchange.getIn().setHeader(RabbitMQConstants.USERID, properties.getUserId());
         }
+        if (properties.getDeliveryMode() != null) {
+            exchange.getIn().setHeader(RabbitMQConstants.DELIVERY_MODE, properties.getDeliveryMode());
+        }
     }
 
     public AMQP.BasicProperties.Builder buildProperties(Exchange exchange) {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
index 8ea7ac0..1b3826b 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
@@ -91,6 +91,21 @@ public class RabbitMQConsumerIntTest extends AbstractRabbitMQIntTest {
     }
 
     @Test
+    public void sentMessageIsDeliveryModeSet() throws InterruptedException, IOException, TimeoutException {
+
+        to.expectedMessageCount(1);
+        to.expectedHeaderReceived(RabbitMQConstants.DELIVERY_MODE, 1);
+
+        AMQP.BasicProperties.Builder properties = new AMQP.BasicProperties.Builder();
+        properties.deliveryMode(1);
+
+        Channel channel = connection().createChannel();
+        channel.basicPublish(EXCHANGE, "", properties.build(), MSG.getBytes());
+
+        to.assertIsSatisfied();
+    }
+
+    @Test
     public void sentMessageWithTimestampIsReceived() throws InterruptedException, IOException, TimeoutException {
         Date timestamp = currentTimestampWithoutMillis();
 

-- 
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.