You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/03/07 12:55:00 UTC
[camel] 15/23: CAMEL-15520: fixed deprecations in camel-rabbitmq
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ca08fa4b045c866b856757d4ae9f6a9672f25493
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:13:33 2022 +0100
CAMEL-15520: fixed deprecations in camel-rabbitmq
---
.../org/apache/camel/component/rabbitmq/RabbitConsumer.java | 11 +++--------
.../camel/component/rabbitmq/reply/ReplyManagerSupport.java | 9 ++-------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
index 91f12f3..797c93f 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
@@ -116,12 +116,7 @@ class RabbitConsumer extends ServiceSupport implements com.rabbitmq.client.Consu
}
// obtain the message after processing
- Message msg;
- if (exchange.hasOut()) {
- msg = exchange.getOut();
- } else {
- msg = exchange.getIn();
- }
+ Message msg = exchange.getMessage();
if (exchange.getException() != null) {
consumer.getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
@@ -167,8 +162,8 @@ class RabbitConsumer extends ServiceSupport implements com.rabbitmq.client.Consu
// the inOut exchange failed so put the exception in the body
// and send back
msg.setBody(exchange.getException());
- exchange.setOut(msg);
- exchange.getOut().setHeader(RabbitMQConstants.CORRELATIONID,
+ exchange.setMessage(msg);
+ exchange.getMessage().setHeader(RabbitMQConstants.CORRELATIONID,
exchange.getIn().getHeader(RabbitMQConstants.CORRELATIONID));
try {
consumer.getEndpoint().publishExchangeToChannel(exchange, channel, properties.getReplyTo());
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
index e8f7972..4005b45 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
@@ -180,13 +180,8 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
// restore correlation id in case the remote server messed
// with it
if (holder.getOriginalCorrelationId() != null) {
- if (exchange.hasOut()) {
- exchange.getOut().setHeader(RabbitMQConstants.CORRELATIONID,
- holder.getOriginalCorrelationId());
- } else {
- exchange.getIn().setHeader(RabbitMQConstants.CORRELATIONID,
- holder.getOriginalCorrelationId());
- }
+ exchange.getMessage().setHeader(RabbitMQConstants.CORRELATIONID,
+ holder.getOriginalCorrelationId());
}
}
} finally {