[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16260346#comment-16260346 ] ASF GitHub Bot commented on CAMEL-12014: oscerd commented on issue #2103: CAMEL-12014: Added support for redelivered tag for RabbitMQ URL: https://github.com/apache/camel/pull/2103#issuecomment-345934341 Thanks This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > RabbitMQ redelivered flag tag. > -- > > Key: CAMEL-12014 > URL: https://issues.apache.org/jira/browse/CAMEL-12014 > Project: Camel > Issue Type: Improvement > Components: camel-rabbitmq >Affects Versions: 2.20.1 >Reporter: Nikita Khateev >Assignee: Andrea Cosentino >Priority: Minor > Fix For: 2.21.0 > > > Add header "rabbitmq.REDELIVERY_TAG" to message if it was redelivered > (redelivery tag was set by RabbitMQ). -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16260333#comment-16260333 ] ASF GitHub Bot commented on CAMEL-12014: oscerd closed pull request #2103: CAMEL-12014: Added support for redelivered tag for RabbitMQ URL: https://github.com/apache/camel/pull/2103 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java index cc7bf324885..8f2ef4980b7 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java @@ -23,6 +23,7 @@ public static final String CONTENT_TYPE = "rabbitmq.CONTENT_TYPE"; public static final String PRIORITY = "rabbitmq.PRIORITY"; public static final String DELIVERY_TAG = "rabbitmq.DELIVERY_TAG"; +public static final String REDELIVERY_TAG = "rabbitmq.REDELIVERY_TAG"; public static final String CORRELATIONID = "rabbitmq.CORRELATIONID"; public static final String MESSAGE_ID = "rabbitmq.MESSAGE_ID"; public static final String DELIVERY_MODE = "rabbitmq.DELIVERY_MODE"; 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 55d7cc2c83d..96532cdff1f 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 @@ -247,6 +247,7 @@ private void populateRoutingInfoHeaders(final Message message, final Envelope en message.setHeader(RabbitMQConstants.ROUTING_KEY, envelope.getRoutingKey()); message.setHeader(RabbitMQConstants.EXCHANGE_NAME, envelope.getExchange()); message.setHeader(RabbitMQConstants.DELIVERY_TAG, envelope.getDeliveryTag()); +message.setHeader(RabbitMQConstants.REDELIVERY_TAG, envelope.isRedelivery()); } } diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java index 2373ae77b4b..7b9c26732c3 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java @@ -19,10 +19,7 @@ import java.io.IOException; import java.math.BigDecimal; import java.sql.Timestamp; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeoutException; @@ -76,10 +73,12 @@ public void testCreatingRabbitExchangeSetsStandardHeaders() throws Exception { String routingKey = UUID.randomUUID().toString(); String exchangeName = UUID.randomUUID().toString(); long tag = UUID.randomUUID().toString().hashCode(); +Boolean redelivery = new Random().nextBoolean(); Mockito.when(envelope.getRoutingKey()).thenReturn(routingKey); Mockito.when(envelope.getExchange()).thenReturn(exchangeName); Mockito.when(envelope.getDeliveryTag()).thenReturn(tag); +Mockito.when(envelope.isRedelivery()).thenReturn(redelivery); Mockito.when(properties.getHeaders()).thenReturn(null); byte[] body = new byte[20]; @@ -87,6 +86,7 @@ public void testCreatingRabbitExchangeSetsStandardHeaders() throws Exception { assertEquals(exchangeName, exchange.getIn().getHeader(RabbitMQConstants.EXCHANGE_NAME)); assertEquals(routingKey, exchange.getIn().getHeader(RabbitMQConstants.ROUTING_KEY)); assertEquals(tag, exchange.getIn().getHeader(RabbitMQConstants.DELIVERY_TAG)); +assertEquals(redelivery, exchange.getIn().getHeader(RabbitMQConstants.REDELIVERY_TAG)); assertEquals(body, exchange.getIn().getBody()); } This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service,
[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16260334#comment-16260334 ] ASF GitHub Bot commented on CAMEL-12014: Github user oscerd closed the pull request at: https://github.com/apache/camel/pull/2103 > RabbitMQ redelivered flag tag. > -- > > Key: CAMEL-12014 > URL: https://issues.apache.org/jira/browse/CAMEL-12014 > Project: Camel > Issue Type: Improvement > Components: camel-rabbitmq >Affects Versions: 2.20.1 >Reporter: Nikita Khateev >Assignee: Andrea Cosentino >Priority: Minor > > Add header "rabbitmq.REDELIVERY_TAG" to message if it was redelivered > (redelivery tag was set by RabbitMQ). -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16260329#comment-16260329 ] ASF GitHub Bot commented on CAMEL-12014: oscerd commented on issue #2103: CAMEL-12014: Added support for redelivered tag for RabbitMQ URL: https://github.com/apache/camel/pull/2103#issuecomment-345932105 I'm fixing this. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > RabbitMQ redelivered flag tag. > -- > > Key: CAMEL-12014 > URL: https://issues.apache.org/jira/browse/CAMEL-12014 > Project: Camel > Issue Type: Improvement > Components: camel-rabbitmq >Affects Versions: 2.20.1 >Reporter: Nikita Khateev >Assignee: Andrea Cosentino >Priority: Minor > > Add header "rabbitmq.REDELIVERY_TAG" to message if it was redelivered > (redelivery tag was set by RabbitMQ). -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16259670#comment-16259670 ] ASF GitHub Bot commented on CAMEL-12014: oscerd commented on issue #2103: CAMEL-12014: Added support for redelivered tag for RabbitMQ URL: https://github.com/apache/camel/pull/2103#issuecomment-345794074 Thanks for the PR. Maybe next time take a look if someone assigned the issue to himself, avoiding cross working on the same issue. I'll review and merge tomorrow. Thanks :-) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > RabbitMQ redelivered flag tag. > -- > > Key: CAMEL-12014 > URL: https://issues.apache.org/jira/browse/CAMEL-12014 > Project: Camel > Issue Type: Improvement > Components: camel-rabbitmq >Affects Versions: 2.20.1 >Reporter: Nikita Khateev >Assignee: Andrea Cosentino >Priority: Minor > > Add header "rabbitmq.REDELIVERY_TAG" to message if it was redelivered > (redelivery tag was set by RabbitMQ). -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16259665#comment-16259665 ] ASF GitHub Bot commented on CAMEL-12014: oscerd commented on issue #2103: CAMEL-12014: Added support for redelivered tag for RabbitMQ URL: https://github.com/apache/camel/pull/2103#issuecomment-345794074 Thanks for the PR. Maybe next time tale a look if someone assigned the issue to himself, avoiding cross working on the dame issue. I'll review and merge tomorrow. Thanks :-) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > RabbitMQ redelivered flag tag. > -- > > Key: CAMEL-12014 > URL: https://issues.apache.org/jira/browse/CAMEL-12014 > Project: Camel > Issue Type: Improvement > Components: camel-rabbitmq >Affects Versions: 2.20.1 >Reporter: Nikita Khateev >Assignee: Andrea Cosentino >Priority: Minor > > Add header "rabbitmq.REDELIVERY_TAG" to message if it was redelivered > (redelivery tag was set by RabbitMQ). -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16259669#comment-16259669 ] ASF GitHub Bot commented on CAMEL-12014: oscerd commented on issue #2103: CAMEL-12014: Added support for redelivered tag for RabbitMQ URL: https://github.com/apache/camel/pull/2103#issuecomment-345794074 Thanks for the PR. Maybe next time take a look if someone assigned the issue to himself, avoiding cross working on the dame issue. I'll review and merge tomorrow. Thanks :-) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > RabbitMQ redelivered flag tag. > -- > > Key: CAMEL-12014 > URL: https://issues.apache.org/jira/browse/CAMEL-12014 > Project: Camel > Issue Type: Improvement > Components: camel-rabbitmq >Affects Versions: 2.20.1 >Reporter: Nikita Khateev >Assignee: Andrea Cosentino >Priority: Minor > > Add header "rabbitmq.REDELIVERY_TAG" to message if it was redelivered > (redelivery tag was set by RabbitMQ). -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16259634#comment-16259634 ] ASF GitHub Bot commented on CAMEL-12014: GitHub user KitHat opened a pull request: https://github.com/apache/camel/pull/2103 CAMEL-12014: Added support for redelivered tag for RabbitMQ This fix sets REDELIVERY_TAG header on exchanges that were already delivered once by rabbitmq. https://www.rabbitmq.com/reliability.html You can merge this pull request into a Git repository by running: $ git pull https://github.com/KitHat/camel master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/camel/pull/2103.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #2103 commit 01e96a5d226e2a29bc1856f5dd9e29ef18305756 Author: Nikita KhateevDate: 2017-11-20T18:29:17Z CAMEL-12014: Added support for redelivered tag for RabbitMQ > RabbitMQ redelivered flag tag. > -- > > Key: CAMEL-12014 > URL: https://issues.apache.org/jira/browse/CAMEL-12014 > Project: Camel > Issue Type: Improvement > Components: camel-rabbitmq >Affects Versions: 2.20.1 >Reporter: Nikita Khateev >Assignee: Andrea Cosentino >Priority: Minor > > Add header "rabbitmq.REDELIVERY_TAG" to message if it was redelivered > (redelivery tag was set by RabbitMQ). -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CAMEL-12014) RabbitMQ redelivered flag tag.
[ https://issues.apache.org/jira/browse/CAMEL-12014?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16259633#comment-16259633 ] ASF GitHub Bot commented on CAMEL-12014: KitHat opened a new pull request #2103: CAMEL-12014: Added support for redelivered tag for RabbitMQ URL: https://github.com/apache/camel/pull/2103 This fix sets REDELIVERY_TAG header on exchanges that were already delivered once by rabbitmq. https://www.rabbitmq.com/reliability.html This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > RabbitMQ redelivered flag tag. > -- > > Key: CAMEL-12014 > URL: https://issues.apache.org/jira/browse/CAMEL-12014 > Project: Camel > Issue Type: Improvement > Components: camel-rabbitmq >Affects Versions: 2.20.1 >Reporter: Nikita Khateev >Assignee: Andrea Cosentino >Priority: Minor > > Add header "rabbitmq.REDELIVERY_TAG" to message if it was redelivered > (redelivery tag was set by RabbitMQ). -- This message was sent by Atlassian JIRA (v6.4.14#64029)