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:53 UTC
[camel] branch master updated (a0d45f8 -> 4b632df)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a0d45f8 Remove not used classes
new 0e4c9c0 CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-sdb
new ab1ac9f CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-ses
new 35680b3 CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-sns
new f39c536 CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-sqs
new 66e08e4 CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-swf
new 4b632df CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-xray
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/component/aws/sdb/DomainMetadataCommand.java | 7 +------
.../org/apache/camel/component/aws/sdb/GetAttributesCommand.java | 7 +------
.../org/apache/camel/component/aws/sdb/ListDomainsCommand.java | 7 +------
.../main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java | 7 +------
.../java/org/apache/camel/component/aws/sdb/SelectCommand.java | 7 +------
.../main/java/org/apache/camel/component/aws/ses/SesProducer.java | 7 +------
.../apache/camel/component/aws/ses/SesComponentSpringTest.java | 4 ++--
.../java/org/apache/camel/component/aws/ses/SesComponentTest.java | 2 +-
.../main/java/org/apache/camel/component/aws/sns/SnsProducer.java | 7 +------
.../apache/camel/component/aws/sns/SnsComponentSpringTest.java | 4 ++--
.../java/org/apache/camel/component/aws/sns/SnsComponentTest.java | 2 +-
.../aws/sns/integration/SnsComponentIntegrationTest.java | 4 ++--
.../sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java | 4 ++--
.../main/java/org/apache/camel/component/aws/sqs/SqsProducer.java | 7 +------
.../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 +-
.../aws/sqs/integration/SqsComponentIntegrationTest.java | 4 ++--
.../main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java | 8 ++------
.../aws/xray/decorators/http/AbstractHttpSegmentDecorator.java | 8 +++-----
20 files changed, 31 insertions(+), 77 deletions(-)
[camel] 06/06: CAMEL-14020 - Migrate deprecate getOut to getMessage
in tests, camel-aws-xray
Posted by ac...@apache.org.
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 4b632dfb1572ad4e5c4cdfce7c646a701d5f8933
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 7 16:23:19 2020 +0100
CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-xray
---
.../aws/xray/decorators/http/AbstractHttpSegmentDecorator.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/http/AbstractHttpSegmentDecorator.java b/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/http/AbstractHttpSegmentDecorator.java
index 91c58d3..c110c90 100644
--- a/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/http/AbstractHttpSegmentDecorator.java
+++ b/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/http/AbstractHttpSegmentDecorator.java
@@ -46,11 +46,9 @@ public abstract class AbstractHttpSegmentDecorator extends AbstractSegmentDecora
public void post(Entity segment, Exchange exchange, Endpoint endpoint) {
super.post(segment, exchange, endpoint);
- if (exchange.hasOut()) {
- Object responseCode = exchange.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE);
- if (responseCode instanceof Integer) {
- segment.putMetadata("htt.response.code", responseCode);
- }
+ Object responseCode = exchange.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE);
+ if (responseCode instanceof Integer) {
+ segment.putMetadata("htt.response.code", responseCode);
}
}
[camel] 05/06: CAMEL-14020 - Migrate deprecate getOut to getMessage
in tests, camel-aws-swf
Posted by ac...@apache.org.
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 66e08e4457cfc86e3ac4db119a8f3708508e5182
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 7 16:20:28 2020 +0100
CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-swf
---
.../main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
index c53cdd1..69c266e 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
@@ -138,15 +138,11 @@ public class SWFEndpoint extends DefaultEndpoint {
}
public Object getResult(Exchange exchange) {
- return ExchangeHelper.isOutCapable(exchange) ? exchange.getOut().getBody() : exchange.getIn().getBody();
+ return exchange.getMessage();
}
public void setResult(Exchange exchange, Object result) {
- if (ExchangeHelper.isOutCapable(exchange)) {
- exchange.getOut().setBody(result);
- } else {
- exchange.getIn().setBody(result);
- }
+ exchange.getMessage().setBody(result);
}
public void setConfiguration(SWFConfiguration configuration) {
[camel] 03/06: CAMEL-14020 - Migrate deprecate getOut to getMessage
in tests, camel-aws-sns
Posted by ac...@apache.org.
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 35680b39b0ac0869e04ae0cad3f5b423fb4763d3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 7 15:40:28 2020 +0100
CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-sns
---
.../main/java/org/apache/camel/component/aws/sns/SnsProducer.java | 7 +------
.../org/apache/camel/component/aws/sns/SnsComponentSpringTest.java | 4 ++--
.../java/org/apache/camel/component/aws/sns/SnsComponentTest.java | 2 +-
.../component/aws/sns/integration/SnsComponentIntegrationTest.java | 4 ++--
.../sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java | 4 ++--
5 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
index 64b76fd..99273f1 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
@@ -142,11 +142,6 @@ public class SnsProducer 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();
}
}
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentSpringTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentSpringTest.java
index 066344b..72a6849 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentSpringTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentSpringTest.java
@@ -46,11 +46,11 @@ public class SnsComponentSpringTest extends CamelSpringTestSupport {
}
});
- assertEquals("dcc8ce7a-7f18-4385-bedd-b97984b4363c", exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));
+ assertEquals("dcc8ce7a-7f18-4385-bedd-b97984b4363c", exchange.getMessage().getHeader(SnsConstants.MESSAGE_ID));
}
@Override
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/aws/sns/SnsComponentSpringTest-context.xml");
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentTest.java
index 99aab4f..19438c0 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentTest.java
@@ -50,7 +50,7 @@ public class SnsComponentTest extends CamelTestSupport {
}
});
- assertEquals("dcc8ce7a-7f18-4385-bedd-b97984b4363c", exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));
+ assertEquals("dcc8ce7a-7f18-4385-bedd-b97984b4363c", exchange.getMessage().getHeader(SnsConstants.MESSAGE_ID));
}
@Override
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
index ea514f1..3082ea3 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
@@ -49,7 +49,7 @@ public class SnsComponentIntegrationTest extends CamelTestSupport {
}
});
- assertNotNull(exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));
+ assertNotNull(exchange.getMessage().getHeader(SnsConstants.MESSAGE_ID));
}
@Override
@@ -63,4 +63,4 @@ public class SnsComponentIntegrationTest extends CamelTestSupport {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
index dcc4abd..6fe96ae 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
@@ -49,7 +49,7 @@ public class SnsTopicWithKmsEncryptionIntegrationTest extends CamelTestSupport {
}
});
- assertNotNull(exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));
+ assertNotNull(exchange.getMessage().getHeader(SnsConstants.MESSAGE_ID));
}
@Override
@@ -62,4 +62,4 @@ public class SnsTopicWithKmsEncryptionIntegrationTest extends CamelTestSupport {
}
};
}
-}
\ No newline at end of file
+}
[camel] 04/06: CAMEL-14020 - Migrate deprecate getOut to getMessage
in tests, camel-aws-sqs
Posted by ac...@apache.org.
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
[camel] 01/06: CAMEL-14020 - Migrate deprecate getOut to getMessage
in tests, camel-aws-sdb
Posted by ac...@apache.org.
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 0e4c9c0098992359bbd7bbf282f3511a9b2329de
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 7 15:36:19 2020 +0100
CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-sdb
---
.../org/apache/camel/component/aws/sdb/DomainMetadataCommand.java | 7 +------
.../org/apache/camel/component/aws/sdb/GetAttributesCommand.java | 7 +------
.../org/apache/camel/component/aws/sdb/ListDomainsCommand.java | 7 +------
.../main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java | 7 +------
.../java/org/apache/camel/component/aws/sdb/SelectCommand.java | 7 +------
5 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
index 7aa47ca..fcaff83 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
@@ -49,11 +49,6 @@ public class DomainMetadataCommand extends AbstractSdbCommand {
}
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();
}
}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
index cd1900c..b15562d 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
@@ -53,11 +53,6 @@ public class GetAttributesCommand extends AbstractSdbCommand {
}
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();
}
}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
index df4ec64..b45839c 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
@@ -53,11 +53,6 @@ public class ListDomainsCommand extends AbstractSdbCommand {
}
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();
}
}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
index 05a0ca0..db9475f 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
@@ -132,11 +132,6 @@ public class SdbEndpoint extends ScheduledPollEndpoint {
}
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();
}
}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
index 9cce570..bb2238d 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
@@ -50,11 +50,6 @@ public class SelectCommand extends AbstractSdbCommand {
}
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();
}
}
[camel] 02/06: CAMEL-14020 - Migrate deprecate getOut to getMessage
in tests, camel-aws-ses
Posted by ac...@apache.org.
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 ab1ac9f27cbc2d69f2e4767b4931cf0f05ad3a33
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 7 15:38:07 2020 +0100
CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-ses
---
.../main/java/org/apache/camel/component/aws/ses/SesProducer.java | 7 +------
.../org/apache/camel/component/aws/ses/SesComponentSpringTest.java | 4 ++--
.../java/org/apache/camel/component/aws/ses/SesComponentTest.java | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
index d9bfe47..0ce967c 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
@@ -182,11 +182,6 @@ public class SesProducer 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();
}
}
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
index 5590537..1596b17 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
@@ -67,7 +67,7 @@ public class SesComponentSpringTest extends CamelSpringTestSupport {
}
});
- assertEquals("1", exchange.getOut().getHeader(SesConstants.MESSAGE_ID));
+ assertEquals("1", exchange.getMessage().getHeader(SesConstants.MESSAGE_ID));
}
@Test
@@ -80,7 +80,7 @@ public class SesComponentSpringTest extends CamelSpringTestSupport {
}
});
- assertEquals("1", exchange.getOut().getHeader(SesConstants.MESSAGE_ID));
+ assertEquals("1", exchange.getMessage().getHeader(SesConstants.MESSAGE_ID));
SendRawEmailRequest sendRawEmailRequest = sesClient.getSendRawEmailRequest();
assertEquals("from@example.com", sendRawEmailRequest.getSource());
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
index 2bf0e66..0fc0938 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
@@ -71,7 +71,7 @@ public class SesComponentTest extends CamelTestSupport {
}
});
- assertEquals("1", exchange.getOut().getHeader(SesConstants.MESSAGE_ID));
+ assertEquals("1", exchange.getMessage().getHeader(SesConstants.MESSAGE_ID));
}
@Test