You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/01/07 15:23:57 UTC
[camel] 04/06: CAMEL-14020 - Migrate deprecate getOut to getMessage
in tests, camel-aws-sqs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f39c53628d47a9b0562ac239ba77cdb93668f5a8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 7 16:17:28 2020 +0100
CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-sqs
---
.../main/java/org/apache/camel/component/aws/sqs/SqsProducer.java | 7 +------
.../org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java | 4 ++--
.../java/org/apache/camel/component/aws/sqs/SqsComponentTest.java | 6 +++---
.../java/org/apache/camel/component/aws/sqs/SqsProducerTest.java | 2 +-
.../component/aws/sqs/integration/SqsComponentIntegrationTest.java | 4 ++--
5 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index b260177..71c09b8 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -290,12 +290,7 @@ public class SqsProducer extends DefaultProducer {
}
public static Message getMessageForResponse(final Exchange exchange) {
- if (exchange.getPattern().isOutCapable()) {
- Message out = exchange.getOut();
- out.copyFrom(exchange.getIn());
- return out;
- }
- return exchange.getIn();
+ return exchange.getMessage();
}
private SqsOperations determineOperation(Exchange exchange) {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
index 3b64810..1af66e8 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
@@ -83,8 +83,8 @@ public class SqsComponentSpringTest extends CamelSpringTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
- assertNotNull(exchange.getOut().getHeader(SqsConstants.MESSAGE_ID));
- assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getOut().getHeader(SqsConstants.MD5_OF_BODY));
+ assertNotNull(exchange.getMessage().getHeader(SqsConstants.MESSAGE_ID));
+ assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getMessage().getHeader(SqsConstants.MD5_OF_BODY));
}
@Test
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
index 0d5f120..b5a6a27 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
@@ -83,9 +83,9 @@ public class SqsComponentTest extends CamelTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
- assertEquals("This is my message text.", exchange.getOut().getBody());
- assertNotNull(exchange.getOut().getHeader(SqsConstants.MESSAGE_ID));
- assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getOut().getHeader(SqsConstants.MD5_OF_BODY));
+ assertEquals("This is my message text.", exchange.getMessage().getBody());
+ assertNotNull(exchange.getMessage().getHeader(SqsConstants.MESSAGE_ID));
+ assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getMessage().getHeader(SqsConstants.MD5_OF_BODY));
}
@Override
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
index 2f830a9..60bf115 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
@@ -85,8 +85,8 @@ public class SqsProducerTest {
when(sqsEndpoint.getConfiguration()).thenReturn(sqsConfiguration);
when(sqsEndpoint.getQueueUrl()).thenReturn(QUEUE_URL);
when(sqsEndpoint.getHeaderFilterStrategy()).thenReturn(new SqsHeaderFilterStrategy());
+ when(exchange.getMessage()).thenReturn(inMessage);
when(exchange.getIn()).thenReturn(inMessage);
- when(exchange.getPattern()).thenReturn(ExchangePattern.InOnly);
when(exchange.getExchangeId()).thenReturn(SAMPLE_EXCHANGE_ID);
when(inMessage.getBody(String.class)).thenReturn(SAMPLE_MESSAGE_BODY);
underTest = new SqsProducer(sqsEndpoint);
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
index 9b24678..0067596 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
@@ -84,8 +84,8 @@ public class SqsComponentIntegrationTest extends CamelTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
- assertNotNull(exchange.getOut().getHeader(SqsConstants.MESSAGE_ID));
- assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getOut().getHeader(SqsConstants.MD5_OF_BODY));
+ assertNotNull(exchange.getMessage().getHeader(SqsConstants.MESSAGE_ID));
+ assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getMessage().getHeader(SqsConstants.MD5_OF_BODY));
}
@Override