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/03/10 08:39:41 UTC
[camel] branch master updated: Camel-AWS2-SQS: Use the correct
region string in integration tests
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
The following commit(s) were added to refs/heads/master by this push:
new 22a658f Camel-AWS2-SQS: Use the correct region string in integration tests
22a658f is described below
commit 22a658f8ff42314fd213161bb916aa0de86e63dd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 10 09:37:44 2020 +0100
Camel-AWS2-SQS: Use the correct region string in integration tests
---
.../aws2/sqs/integration/SqsConsumerMessageIntegrationTest.java | 4 ++--
.../sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java | 4 ++--
.../aws2/sqs/integration/SqsProducerBatchSendIntegrationTest.java | 4 ++--
.../sqs/integration/SqsProducerDeleteMessageIntegrationTest.java | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsConsumerMessageIntegrationTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsConsumerMessageIntegrationTest.java
index 1155fc5..94cc265 100644
--- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsConsumerMessageIntegrationTest.java
+++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsConsumerMessageIntegrationTest.java
@@ -57,14 +57,14 @@ public class SqsConsumerMessageIntegrationTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
- final String sqsEndpointUri = String.format("aws2-sqs://camel-1?accessKey=RAW(xxxx)&secretKey=RAW(xxxx)®ion=EU_WEST_1");
+ final String sqsEndpointUri = String.format("aws2-sqs://camel-1?accessKey=RAW(xxxx)&secretKey=RAW(xxxx)®ion=eu-west-1");
return new RouteBuilder() {
@Override
public void configure() throws Exception {
from("direct:start").startupOrder(2).to(sqsEndpointUri);
- from("aws2-sqs://camel-1?accessKey=RAW(xxxx)&secretKey=RAW(xxxx)®ion=EU_WEST_1&deleteAfterRead=false&deleteIfFiltered=true").startupOrder(1)
+ from("aws2-sqs://camel-1?accessKey=RAW(xxxx)&secretKey=RAW(xxxx)®ion=eu-west-1&deleteAfterRead=false&deleteIfFiltered=true").startupOrder(1)
.filter(simple("${body} != 'ignore'")).log("${body}").log("${header.CamelAwsSqsReceiptHandle}").to("mock:result");
}
};
diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
index 1645d24..bfee1e8 100644
--- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
+++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
@@ -61,7 +61,7 @@ public class SqsProducerBatchSendFifoIntegrationTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
- final String sqsEndpointUri = String.format("aws2-sqs://camel-1.fifo?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1&messageGroupIdStrategy=useExchangeId"
+ final String sqsEndpointUri = String.format("aws2-sqs://camel-1.fifo?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=eu-west-1&messageGroupIdStrategy=useExchangeId"
+ "&messageDeduplicationIdStrategy=useContentBasedDeduplication");
return new RouteBuilder() {
@@ -69,7 +69,7 @@ public class SqsProducerBatchSendFifoIntegrationTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:start").startupOrder(2).setHeader(Sqs2Constants.SQS_OPERATION, constant("sendBatchMessage")).to(sqsEndpointUri);
- from("aws2-sqs://camel-1.fifo?accessKey=RAW(xxx)&secretKey=RAW(xxxx)®ion=EU_WEST_1&deleteAfterRead=false").startupOrder(1).log("${body}").to("mock:result");
+ from("aws2-sqs://camel-1.fifo?accessKey=RAW(xxx)&secretKey=RAW(xxxx)®ion=eu-west-1&deleteAfterRead=false").startupOrder(1).log("${body}").to("mock:result");
}
};
}
diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendIntegrationTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendIntegrationTest.java
index ca615c6..2ceaab3 100644
--- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendIntegrationTest.java
+++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerBatchSendIntegrationTest.java
@@ -61,14 +61,14 @@ public class SqsProducerBatchSendIntegrationTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
- final String sqsEndpointUri = String.format("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1");
+ final String sqsEndpointUri = String.format("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=eu-west-1");
return new RouteBuilder() {
@Override
public void configure() throws Exception {
from("direct:start").startupOrder(2).setHeader(Sqs2Constants.SQS_OPERATION, constant("sendBatchMessage")).to(sqsEndpointUri);
- from("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1&deleteAfterRead=true").startupOrder(1).log("${body}").to("mock:result");
+ from("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=eu-west-1&deleteAfterRead=true").startupOrder(1).log("${body}").to("mock:result");
}
};
}
diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
index 2ed8f12..6ccb1a1 100644
--- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
+++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
@@ -51,15 +51,15 @@ public class SqsProducerDeleteMessageIntegrationTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
- final String sqsEndpointUri = String.format("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1");
+ final String sqsEndpointUri = String.format("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=eu-west-1");
return new RouteBuilder() {
@Override
public void configure() throws Exception {
from("direct:start").startupOrder(2).to(sqsEndpointUri);
- from("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1&deleteAfterRead=false").startupOrder(1).log("${body}")
- .to("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1&operation=deleteMessage").log("${body}")
+ from("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=eu-west-1&deleteAfterRead=false").startupOrder(1).log("${body}")
+ .to("aws2-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=eu-west-1&operation=deleteMessage").log("${body}")
.log("${header.CamelAwsSqsReceiptHandle}").to("mock:result");
}
};