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:55 UTC

[camel] 02/06: CAMEL-14020 - Migrate deprecate getOut to getMessage in tests, camel-aws-ses

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