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 3810b23f0c543462e32cf6b68b4d6c44a737a80c Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Mon Mar 8 07:04:28 2021 +0100 CAMEL-16293 - Camel-AWS2-Components: Autocreation of entities should be false by default - camel-aws2-sqs --- .../sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java | 4 ++-- .../sqs/integration/SqsProducerBatchSendIntegrationTest.java | 4 ++-- .../sqs/integration/SqsProducerDeleteMessageIntegrationTest.java | 6 +++--- .../aws2/sqs/localstack/SqsConsumerMessageLocalstackTest.java | 9 +++++---- 4 files changed, 12 insertions(+), 11 deletions(-) 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 6d4e12e..3454006 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 @@ -79,7 +79,7 @@ public class SqsProducerBatchSendFifoIntegrationTest extends CamelTestSupport { final String sqsEndpointUri = String.format( "aws2-sqs://%s.fifo?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&messageGroupIdStrategy=useExchangeId" + "&messageDeduplicationIdStrategy=useContentBasedDeduplication" - + "&configuration=%s", + + "&configuration=%s&autoCreateQueue=true", sharedNameGenerator.getName(), credentials.accessKeyId(), credentials.secretAccessKey(), @@ -91,7 +91,7 @@ public class SqsProducerBatchSendFifoIntegrationTest extends CamelTestSupport { from("direct:start").startupOrder(2).setHeader(Sqs2Constants.SQS_OPERATION, constant("sendBatchMessage")) .to(sqsEndpointUri); - fromF("aws2-sqs://%s.fifo?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&deleteAfterRead=false&configuration=%s", + fromF("aws2-sqs://%s.fifo?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&deleteAfterRead=false&configuration=%s&autoCreateQueue=true", sharedNameGenerator.getName(), credentials.accessKeyId(), credentials.secretAccessKey(), 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 c30b8a3..273f7ed 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 @@ -77,7 +77,7 @@ public class SqsProducerBatchSendIntegrationTest extends CamelTestSupport { AwsCredentials credentials = credentialsProvider.resolveCredentials(); final String sqsEndpointUri - = String.format("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&configuration=%s", + = String.format("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&configuration=%s&autoCreateQueue=true", sharedNameGenerator.getName(), credentials.accessKeyId(), credentials.secretAccessKey(), @@ -89,7 +89,7 @@ public class SqsProducerBatchSendIntegrationTest extends CamelTestSupport { from("direct:start").startupOrder(2).setHeader(Sqs2Constants.SQS_OPERATION, constant("sendBatchMessage")) .to(sqsEndpointUri); - fromF("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&deleteAfterRead=true&configuration=%s", + fromF("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&deleteAfterRead=true&configuration=%s&autoCreateQueue=true", sharedNameGenerator.getName(), credentials.accessKeyId(), credentials.secretAccessKey(), 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 d34e2a2..4d14acc 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 @@ -67,7 +67,7 @@ public class SqsProducerDeleteMessageIntegrationTest extends CamelTestSupport { AwsCredentials credentials = credentialsProvider.resolveCredentials(); final String sqsEndpointUri - = String.format("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&configuration=%s", + = String.format("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&configuration=%s&autoCreateQueue=true", sharedNameGenerator.getName(), credentials.accessKeyId(), credentials.secretAccessKey(), @@ -78,14 +78,14 @@ public class SqsProducerDeleteMessageIntegrationTest extends CamelTestSupport { public void configure() throws Exception { from("direct:start").startupOrder(2).to(sqsEndpointUri); - fromF("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&deleteAfterRead=false&configuration=%s", + fromF("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&deleteAfterRead=false&configuration=%s&autoCreateQueue=true", sharedNameGenerator.getName(), credentials.accessKeyId(), credentials.secretAccessKey(), "#class:" + TestSqsConfiguration.class.getName()) .startupOrder(1) .log("${body}") - .toF("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&operation=deleteMessage&configuration=%s", + .toF("aws2-sqs://%s?accessKey=RAW(%s)&secretKey=RAW(%s)®ion=eu-west-1&operation=deleteMessage&configuration=%s&autoCreateQueue=true", sharedNameGenerator.getName(), credentials.accessKeyId(), credentials.secretAccessKey(), diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsConsumerMessageLocalstackTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsConsumerMessageLocalstackTest.java index 7fd843d..ffbc126 100644 --- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsConsumerMessageLocalstackTest.java +++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsConsumerMessageLocalstackTest.java @@ -60,10 +60,11 @@ public class SqsConsumerMessageLocalstackTest extends Aws2SQSBaseTest { public void configure() throws Exception { from("direct:start").startupOrder(2).toF("aws2-sqs://%s?autoCreateQueue=true", sharedNameGenerator.getName()); - fromF("aws2-sqs://%s?deleteAfterRead=false&deleteIfFiltered=true&autoCreateQueue=true", sharedNameGenerator.getName()) - .startupOrder(1) - .filter(simple("${body} != 'ignore'")).log("${body}").log("${header.CamelAwsSqsReceiptHandle}") - .to("mock:result"); + fromF("aws2-sqs://%s?deleteAfterRead=false&deleteIfFiltered=true&autoCreateQueue=true", + sharedNameGenerator.getName()) + .startupOrder(1) + .filter(simple("${body} != 'ignore'")).log("${body}").log("${header.CamelAwsSqsReceiptHandle}") + .to("mock:result"); } }; }