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:56 UTC
[camel] 03/06: CAMEL-14020 - Migrate deprecate getOut to getMessage
in tests, camel-aws-sns
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
+}