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 2022/01/07 09:51:02 UTC
[camel] branch camel-3.14.x updated: Fixed deadletter test in sqs and revert of previous fix of CAMEL-17437
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new f911df4 Fixed deadletter test in sqs and revert of previous fix of CAMEL-17437
f911df4 is described below
commit f911df45b5dc711b4491ead040ee6972bedd83f0
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Fri Jan 7 10:02:14 2022 +0100
Fixed deadletter test in sqs and revert of previous fix of CAMEL-17437
---
.../java/org/apache/camel/component/aws2/sqs/Sqs2Component.java | 6 ++++++
.../java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java | 7 -------
.../camel/component/aws2/sqs/SqsComponentClientRegistryTest.java | 1 -
.../camel/component/aws2/sqs/SqsComponentConfigurationTest.java | 4 ++--
.../camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java | 4 ++++
.../integration/SqsDeadletterWithClientRegistryLocalstackIT.java | 9 +++------
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
index 2fc27e7..c55c45f 100644
--- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
+++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
@@ -69,6 +69,12 @@ public class Sqs2Component extends DefaultComponent {
Sqs2Endpoint sqsEndpoint = new Sqs2Endpoint(uri, this, configuration);
setProperties(sqsEndpoint, parameters);
+ //validation of client has to be done after endpoint initialization (in case that sqs client is autowired)
+ // - covered by SqsDeadletterWithClientRegistryLocalstackIT
+ if (!configuration.isUseDefaultCredentialsProvider() && configuration.getAmazonSQSClient() == null
+ && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
+ throw new IllegalArgumentException("AmazonSQSClient or accessKey and secretKey must be specified.");
+ }
// Verify that visibilityTimeout is set if extendMessageVisibility is
// set to true.
if (configuration.isExtendMessageVisibility() && configuration.getVisibilityTimeout() == null) {
diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
index 0c5cc2e..eca041b 100644
--- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
+++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
@@ -148,13 +148,6 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS
protected void doInit() throws Exception {
super.doInit();
- //validation of client has to be done after endpoint initialization (in case that sqs client is autowired)
- // - covered by SqsDeadletterWithClientRegistryLocalstackIT
- if (!configuration.isUseDefaultCredentialsProvider() && configuration.getAmazonSQSClient() == null
- && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
- throw new IllegalArgumentException("AmazonSQSClient or accessKey and secretKey must be specified.");
- }
-
client = configuration.getAmazonSQSClient() != null
? configuration.getAmazonSQSClient() : Sqs2ClientFactory.getSqsClient(configuration).getSQSClient();
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
index 7ee2697..8f606b6 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
@@ -42,7 +42,6 @@ public class SqsComponentClientRegistryTest extends CamelTestSupport {
Sqs2Component component = context.getComponent("aws2-sqs", Sqs2Component.class);
assertThrows(IllegalArgumentException.class, () -> {
Sqs2Endpoint endpoint = (Sqs2Endpoint) component.createEndpoint("aws2-sqs://MyQueue");
- endpoint.start();
});
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
index d63734a..f7b7c6c 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
@@ -213,7 +213,7 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
Sqs2Component component = context.getComponent("aws2-sqs", Sqs2Component.class);
assertThrows(IllegalArgumentException.class, () -> {
- component.createEndpoint("aws2-sqs://MyQueue?secretKey=yyy").start();
+ component.createEndpoint("aws2-sqs://MyQueue?secretKey=yyy");
});
}
@@ -221,7 +221,7 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
Sqs2Component component = context.getComponent("aws2-sqs", Sqs2Component.class);
assertThrows(IllegalArgumentException.class, () -> {
- component.createEndpoint("aws2-sqs://MyQueue?accessKey=xxx").start();
+ component.createEndpoint("aws2-sqs://MyQueue?accessKey=xxx");
});
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
index a585563..e617110 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/Aws2SQSBaseTest.java
@@ -43,4 +43,8 @@ public abstract class Aws2SQSBaseTest extends CamelTestSupport {
sqs.getConfiguration().setAmazonSQSClient(AWSSDKClientUtils.newSQSClient());
return context;
}
+
+ protected CamelContext createCamelContextWithoutClient() throws Exception {
+ return super.createCamelContext();
+ }
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java
index 0f33c62..a399f5d 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java
@@ -23,8 +23,8 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws2.sqs.Sqs2Component;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.junit.jupiter.api.Test;
public class SqsDeadletterWithClientRegistryLocalstackIT extends Aws2SQSBaseTest {
@@ -37,12 +37,9 @@ public class SqsDeadletterWithClientRegistryLocalstackIT extends Aws2SQSBaseTest
@Override
protected CamelContext createCamelContext() throws Exception {
- CamelContext ctx = super.createCamelContext();
+ CamelContext ctx = super.createCamelContextWithoutClient();
- Sqs2Component sqs = ctx.getComponent("aws2-sqs", Sqs2Component.class);
-
- ctx.getRegistry().bind("awsSQSClient", sqs.getConfiguration().getAmazonSQSClient());
- sqs.getConfiguration().setAmazonSQSClient(null);
+ ctx.getRegistry().bind("awsSQSClient", AWSSDKClientUtils.newSQSClient());
return ctx;
}