This is an automated email from the ASF dual-hosted git repository.
orpiske 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 675eaa8 Decouple AWS2 clients from the test-infra services (#4625)
675eaa8 is described below
commit 675eaa82a2ee975696704ab9c9d3b381e2b7d3a3
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Wed Nov 18 19:08:23 2020 +0100
Decouple AWS2 clients from the test-infra services (#4625)
---
.../sqs/integration/SqsComponentIntegrationTest.java | 3 +--
.../SqsConsumerMessageIntegrationTest.java | 3 +--
.../SqsProducerBatchSendFifoIntegrationTest.java | 3 +--
.../SqsProducerBatchSendIntegrationTest.java | 3 +--
.../SqsProducerDeleteMessageIntegrationTest.java | 3 +--
.../aws2/sns/localstack/Aws2SNSBaseTest.java | 3 +--
.../sqs/integration/SqsComponentIntegrationTest.java | 3 +--
.../SqsConsumerMessageIntegrationTest.java | 3 +--
.../SqsProducerBatchSendFifoIntegrationTest.java | 3 +--
.../SqsProducerBatchSendIntegrationTest.java | 3 +--
.../SqsProducerDeleteMessageIntegrationTest.java | 3 +--
.../aws2/sqs/localstack/Aws2SQSBaseTest.java | 3 +--
.../test/infra/aws/common/services/AWSService.java | 4 +---
.../services/AWSKinesisLocalContainerService.java | 19 +------------------
.../infra/aws/services/AWSLocalContainerService.java | 2 +-
.../test/infra/aws/services/AWSRemoteService.java | 13 +------------
.../aws/services/AWSS3LocalContainerService.java | 19 +------------------
.../aws/services/AWSSNSLocalContainerService.java | 14 +-------------
.../aws/services/AWSSQSLocalContainerService.java | 14 +-------------
.../test/infra/aws/services/AWSServiceFactory.java | 20 ++++++++------------
.../services/AWSKinesisLocalContainerService.java | 20 +-------------------
.../aws2/services/AWSLocalContainerService.java | 2 +-
.../test/infra/aws2/services/AWSRemoteService.java | 13 +------------
.../aws2/services/AWSS3LocalContainerService.java | 19 +------------------
.../aws2/services/AWSSNSLocalContainerService.java | 17 +++--------------
.../aws2/services/AWSSQSLocalContainerService.java | 20 +-------------------
.../test/infra/aws2/services/AWSServiceFactory.java | 20 ++++++++------------
27 files changed, 43 insertions(+), 209 deletions(-)
diff --git
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
index 5652762..a825e18 100644
---
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
+++
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.aws.sqs.integration;
import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.services.sqs.AmazonSQS;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -43,7 +42,7 @@ public class SqsComponentIntegrationTest extends
CamelTestSupport {
@SuppressWarnings("unused")
@RegisterExtension
- public static AWSService<AmazonSQS> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
diff --git
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
index d0c0c4c..b74b740 100644
---
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
+++
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.aws.sqs.integration;
-import com.amazonaws.services.sqs.AmazonSQS;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -38,7 +37,7 @@ public class SqsConsumerMessageIntegrationTest extends
CamelTestSupport {
@SuppressWarnings("unused")
@RegisterExtension
- public static AWSService<AmazonSQS> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
diff --git
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
index 684d7a6..e2dfa7c 100644
---
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
+++
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.sqs.integration;
import java.util.ArrayList;
import java.util.Collection;
-import com.amazonaws.services.sqs.AmazonSQS;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -42,7 +41,7 @@ public class SqsProducerBatchSendFifoIntegrationTest extends
CamelTestSupport {
@SuppressWarnings("unused")
@RegisterExtension
- public static AWSService<AmazonSQS> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
diff --git
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
index 4a2f735..89f0c64 100644
---
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
+++
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.sqs.integration;
import java.util.ArrayList;
import java.util.Collection;
-import com.amazonaws.services.sqs.AmazonSQS;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -42,7 +41,7 @@ public class SqsProducerBatchSendIntegrationTest extends
CamelTestSupport {
@SuppressWarnings("unused")
@RegisterExtension
- public static AWSService<AmazonSQS> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
diff --git
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
index 6f1af71..37532c8 100644
---
a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
+++
b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.aws.sqs.integration;
-import com.amazonaws.services.sqs.AmazonSQS;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -38,7 +37,7 @@ public class SqsProducerDeleteMessageIntegrationTest extends
CamelTestSupport {
@SuppressWarnings("unused")
@RegisterExtension
- public static AWSService<AmazonSQS> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
diff --git
a/components/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/localstack/Aws2SNSBaseTest.java
b/components/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/localstack/Aws2SNSBaseTest.java
index e8a5327..a9692ca 100644
---
a/components/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/localstack/Aws2SNSBaseTest.java
+++
b/components/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/localstack/Aws2SNSBaseTest.java
@@ -24,13 +24,12 @@ import
org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
-import software.amazon.awssdk.services.sqs.SqsClient;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class Aws2SNSBaseTest extends CamelTestSupport {
@RegisterExtension
- public static AWSService<SqsClient> service =
AWSServiceFactory.createSNSService();
+ public static AWSService service = AWSServiceFactory.createSNSService();
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java
index 64f969c..6ca4578 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java
@@ -34,7 +34,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
-import software.amazon.awssdk.services.sqs.SqsClient;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -42,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public class SqsComponentIntegrationTest extends CamelTestSupport {
@RegisterExtension
- public static AWSService<SqsClient> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
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 d552842..6bd8cce 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
@@ -33,12 +33,11 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
-import software.amazon.awssdk.services.sqs.SqsClient;
public class SqsConsumerMessageIntegrationTest extends CamelTestSupport {
@RegisterExtension
- public static AWSService<SqsClient> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
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 be06431..6d4e12e 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
@@ -37,12 +37,11 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
-import software.amazon.awssdk.services.sqs.SqsClient;
public class SqsProducerBatchSendFifoIntegrationTest extends CamelTestSupport {
@RegisterExtension
- public static AWSService<SqsClient> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
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 02c12cd..c30b8a3 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
@@ -37,12 +37,11 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
-import software.amazon.awssdk.services.sqs.SqsClient;
public class SqsProducerBatchSendIntegrationTest extends CamelTestSupport {
@RegisterExtension
- public static AWSService<SqsClient> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
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 1851c53..d34e2a2 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
@@ -33,12 +33,11 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
-import software.amazon.awssdk.services.sqs.SqsClient;
public class SqsProducerDeleteMessageIntegrationTest extends CamelTestSupport {
@RegisterExtension
- public static AWSService<SqsClient> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
diff --git
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/Aws2SQSBaseTest.java
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/Aws2SQSBaseTest.java
index b92f504..1ecae8a 100644
---
a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/Aws2SQSBaseTest.java
+++
b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/Aws2SQSBaseTest.java
@@ -26,13 +26,12 @@ import
org.apache.camel.test.infra.common.TestEntityNameGenerator;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
-import software.amazon.awssdk.services.sqs.SqsClient;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class Aws2SQSBaseTest extends CamelTestSupport {
@RegisterExtension
- public static AWSService<SqsClient> service =
AWSServiceFactory.createSQSService();
+ public static AWSService service = AWSServiceFactory.createSQSService();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
diff --git
a/test-infra/camel-test-infra-aws-common/src/test/java/org/apache/camel/test/infra/aws/common/services/AWSService.java
b/test-infra/camel-test-infra-aws-common/src/test/java/org/apache/camel/test/infra/aws/common/services/AWSService.java
index 02aba8b..4ea2d9b 100644
---
a/test-infra/camel-test-infra-aws-common/src/test/java/org/apache/camel/test/infra/aws/common/services/AWSService.java
+++
b/test-infra/camel-test-infra-aws-common/src/test/java/org/apache/camel/test/infra/aws/common/services/AWSService.java
@@ -24,9 +24,7 @@ import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
-public interface AWSService<T> extends BeforeAllCallback, AfterAllCallback,
TestService {
-
- T getClient();
+public interface AWSService extends BeforeAllCallback, AfterAllCallback,
TestService {
Properties getConnectionProperties();
diff --git
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSKinesisLocalContainerService.java
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSKinesisLocalContainerService.java
index ee55c47..2862054 100644
---
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSKinesisLocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSKinesisLocalContainerService.java
@@ -17,13 +17,9 @@
package org.apache.camel.test.infra.aws.services;
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.Protocol;
-import com.amazonaws.services.kinesis.AmazonKinesis;
-import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
import org.testcontainers.containers.localstack.LocalStackContainer;
-public class AWSKinesisLocalContainerService extends
AWSLocalContainerService<AmazonKinesis> {
+public class AWSKinesisLocalContainerService extends AWSLocalContainerService {
public AWSKinesisLocalContainerService() {
super(LocalStackContainer.Service.KINESIS);
@@ -40,17 +36,4 @@ public class AWSKinesisLocalContainerService extends
AWSLocalContainerService<Am
return getContainer().getContainerIpAddress() + ":" +
getContainer().getMappedPort(kinesisPort);
}
-
- @Override
- public AmazonKinesis getClient() {
- ClientConfiguration clientConfiguration = new ClientConfiguration();
- clientConfiguration.setProtocol(Protocol.HTTP);
-
- return AmazonKinesisClientBuilder
- .standard()
-
.withEndpointConfiguration(getContainer().getEndpointConfiguration(LocalStackContainer.Service.KINESIS))
-
.withCredentials(getContainer().getDefaultCredentialsProvider())
- .withClientConfiguration(clientConfiguration)
- .build();
- }
}
diff --git
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSLocalContainerService.java
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSLocalContainerService.java
index e38cc04..6219e3c 100644
---
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSLocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSLocalContainerService.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.localstack.LocalStackContainer;
-abstract class AWSLocalContainerService<T> implements AWSService<T>,
ContainerService<LocalStackContainer> {
+abstract class AWSLocalContainerService implements AWSService,
ContainerService<LocalStackContainer> {
private static final Logger LOG =
LoggerFactory.getLogger(AWSLocalContainerService.class);
private final LocalStackContainer container;
diff --git
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSRemoteService.java
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSRemoteService.java
index 5675af8..02f21b4 100644
---
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSRemoteService.java
+++
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSRemoteService.java
@@ -18,7 +18,6 @@
package org.apache.camel.test.infra.aws.services;
import java.util.Properties;
-import java.util.function.Supplier;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
@@ -27,24 +26,14 @@ import org.apache.camel.test.infra.aws.common.AWSConfigs;
import
org.apache.camel.test.infra.aws.common.SystemPropertiesAWSCredentialsProvider;
import org.apache.camel.test.infra.aws.common.services.AWSService;
-public class AWSRemoteService<T> implements AWSService<T> {
+public class AWSRemoteService implements AWSService {
private static final AWSCredentialsProvider CREDENTIALS_PROVIDER = new
SystemPropertiesAWSCredentialsProvider();
- private Supplier<T> remoteClientSupplier;
-
- public AWSRemoteService(Supplier<T> remoteClientSupplier) {
- this.remoteClientSupplier = remoteClientSupplier;
- }
@Override
public void registerProperties() {
// NO-OP
}
- @Override
- public T getClient() {
- return remoteClientSupplier.get();
- }
-
private AWSCredentials getCredentials() {
return CREDENTIALS_PROVIDER.getCredentials();
}
diff --git
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSS3LocalContainerService.java
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSS3LocalContainerService.java
index f58def9..8176948 100644
---
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSS3LocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSS3LocalContainerService.java
@@ -17,13 +17,9 @@
package org.apache.camel.test.infra.aws.services;
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.Protocol;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import org.testcontainers.containers.localstack.LocalStackContainer;
-public class AWSS3LocalContainerService extends
AWSLocalContainerService<AmazonS3> {
+public class AWSS3LocalContainerService extends AWSLocalContainerService {
public AWSS3LocalContainerService() {
super(LocalStackContainer.Service.S3);
@@ -40,17 +36,4 @@ public class AWSS3LocalContainerService extends
AWSLocalContainerService<AmazonS
return getContainer().getContainerIpAddress() + ":" +
getContainer().getMappedPort(s3Port);
}
-
- @Override
- public AmazonS3 getClient() {
- ClientConfiguration clientConfiguration = new ClientConfiguration();
- clientConfiguration.setProtocol(Protocol.HTTP);
-
- return AmazonS3ClientBuilder
- .standard()
-
.withEndpointConfiguration(getContainer().getEndpointConfiguration(LocalStackContainer.Service.S3))
-
.withCredentials(getContainer().getDefaultCredentialsProvider())
- .withClientConfiguration(clientConfiguration)
- .build();
- }
}
diff --git
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSSNSLocalContainerService.java
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSSNSLocalContainerService.java
index d0764dd..0c22c89 100644
---
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSSNSLocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSSNSLocalContainerService.java
@@ -17,11 +17,9 @@
package org.apache.camel.test.infra.aws.services;
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
import org.testcontainers.containers.localstack.LocalStackContainer;
-public class AWSSNSLocalContainerService extends
AWSLocalContainerService<AmazonSQS> {
+public class AWSSNSLocalContainerService extends AWSLocalContainerService {
public AWSSNSLocalContainerService() {
super(LocalStackContainer.Service.SQS,
@@ -39,14 +37,4 @@ public class AWSSNSLocalContainerService extends
AWSLocalContainerService<Amazon
return super.getAmazonHost(snsPort);
}
-
- @Override
- public AmazonSQS getClient() {
- return AmazonSQSClientBuilder
- .standard()
- .withEndpointConfiguration(getContainer()
-
.getEndpointConfiguration(LocalStackContainer.Service.SQS))
-
.withCredentials(getContainer().getDefaultCredentialsProvider())
- .build();
- }
}
diff --git
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSSQSLocalContainerService.java
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSSQSLocalContainerService.java
index b506d09..51ea3ca 100644
---
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSSQSLocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSSQSLocalContainerService.java
@@ -17,11 +17,9 @@
package org.apache.camel.test.infra.aws.services;
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
import org.testcontainers.containers.localstack.LocalStackContainer;
-public class AWSSQSLocalContainerService extends
AWSLocalContainerService<AmazonSQS> {
+public class AWSSQSLocalContainerService extends AWSLocalContainerService {
public AWSSQSLocalContainerService() {
super(LocalStackContainer.Service.SQS);
@@ -38,14 +36,4 @@ public class AWSSQSLocalContainerService extends
AWSLocalContainerService<Amazon
return super.getAmazonHost(sqsPort);
}
-
- @Override
- public AmazonSQS getClient() {
- return AmazonSQSClientBuilder
- .standard()
- .withEndpointConfiguration(getContainer()
-
.getEndpointConfiguration(LocalStackContainer.Service.SQS))
-
.withCredentials(getContainer().getDefaultCredentialsProvider())
- .build();
- }
}
diff --git
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSServiceFactory.java
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSServiceFactory.java
index 050a658..22ed21e 100644
---
a/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSServiceFactory.java
+++
b/test-infra/camel-test-infra-aws-v1/src/test/java/org/apache/camel/test/infra/aws/services/AWSServiceFactory.java
@@ -17,10 +17,6 @@
package org.apache.camel.test.infra.aws.services;
-import com.amazonaws.services.kinesis.AmazonKinesis;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.sqs.AmazonSQS;
-import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +31,7 @@ public final class AWSServiceFactory {
return awsInstanceType == null ? "default" : awsInstanceType;
}
- public static AWSService<AmazonSQS> createSQSService() {
+ public static AWSService createSQSService() {
String awsInstanceType =
System.getProperty("aws-service.instance.type");
LOG.info("Creating a {} AWS SQS instance",
getInstanceTypeName(awsInstanceType));
@@ -44,7 +40,7 @@ public final class AWSServiceFactory {
}
if (awsInstanceType.equals("remote")) {
- return new AWSRemoteService<>(AWSClientUtils::newSQSClient);
+ return new AWSRemoteService();
}
LOG.error("Invalid AWS instance type: {}. Must be either 'remote' or
'local-aws-container'",
@@ -52,7 +48,7 @@ public final class AWSServiceFactory {
throw new UnsupportedOperationException("Invalid AWS instance type");
}
- public static AWSService<AmazonSQS> createSNSService() {
+ public static AWSService createSNSService() {
String awsInstanceType =
System.getProperty("aws-service.instance.type");
LOG.info("Creating a {} AWS SNS instance",
getInstanceTypeName(awsInstanceType));
@@ -61,7 +57,7 @@ public final class AWSServiceFactory {
}
if (awsInstanceType.equals("remote")) {
- return new AWSRemoteService<>(AWSClientUtils::newSQSClient);
+ return new AWSRemoteService();
}
LOG.error("Invalid AWS instance type: {}. Must be either 'remote' or
'local-aws-container'",
@@ -70,7 +66,7 @@ public final class AWSServiceFactory {
}
- public static AWSService<AmazonKinesis> createKinesisService() {
+ public static AWSService createKinesisService() {
String awsInstanceType =
System.getProperty("aws-service.kinesis.instance.type");
LOG.info("Creating a {} AWS kinesis instance",
getInstanceTypeName(awsInstanceType));
@@ -79,7 +75,7 @@ public final class AWSServiceFactory {
}
if (awsInstanceType.equals("remote")) {
- return new AWSRemoteService<>(AWSClientUtils::newKinesisClient);
+ return new AWSRemoteService();
}
LOG.error("Invalid AWS instance type: {}. Must be either 'remote' or
'local-aws-container'",
@@ -87,7 +83,7 @@ public final class AWSServiceFactory {
throw new UnsupportedOperationException("Invalid AWS instance type");
}
- public static AWSService<AmazonS3> createS3Service() {
+ public static AWSService createS3Service() {
String awsInstanceType =
System.getProperty("aws-service.instance.type");
LOG.info("Creating a {} AWS S3 instance", awsInstanceType);
@@ -96,7 +92,7 @@ public final class AWSServiceFactory {
}
if (awsInstanceType.equals("remote")) {
- return new AWSRemoteService<>(AWSClientUtils::newS3Client);
+ return new AWSRemoteService();
}
LOG.error("Invalid AWS instance type: {}. Must be either 'remote' or
'local-aws-container'",
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerService.java
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerService.java
index 58b5290..6dfac7c 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSKinesisLocalContainerService.java
@@ -17,31 +17,13 @@
package org.apache.camel.test.infra.aws2.services;
-import org.apache.camel.test.infra.aws2.common.TestAWSCredentialsProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.kinesis.KinesisClient;
-public class AWSKinesisLocalContainerService extends
AWSLocalContainerService<KinesisClient> {
+public class AWSKinesisLocalContainerService extends AWSLocalContainerService {
private static final Logger LOG =
LoggerFactory.getLogger(AWSKinesisLocalContainerService.class);
public AWSKinesisLocalContainerService() {
super(Service.KINESIS);
-
- LOG.info("Initializing the local AWS services");
- getContainer().start();
- }
-
- @Override
- public KinesisClient getClient() {
- Region region = Region.US_EAST_1;
- KinesisClient client = KinesisClient.builder()
- .region(region)
-
.credentialsProvider(TestAWSCredentialsProvider.CONTAINER_LOCAL_DEFAULT_PROVIDER)
- .endpointOverride(getServiceEndpoint())
- .build();
-
- return client;
}
}
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerService.java
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerService.java
index afac8d7..cc655cc 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerService.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.regions.Region;
-public abstract class AWSLocalContainerService<T> implements AWSService<T>,
ContainerService<AWSContainer> {
+public abstract class AWSLocalContainerService implements AWSService,
ContainerService<AWSContainer> {
private static final Logger LOG =
LoggerFactory.getLogger(AWSLocalContainerService.class);
private AWSContainer container;
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSRemoteService.java
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSRemoteService.java
index 10d3abc..f27054a 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSRemoteService.java
+++
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSRemoteService.java
@@ -18,7 +18,6 @@
package org.apache.camel.test.infra.aws2.services;
import java.util.Properties;
-import java.util.function.Supplier;
import org.apache.camel.test.infra.aws.common.AWSConfigs;
import org.apache.camel.test.infra.aws.common.services.AWSService;
@@ -26,17 +25,7 @@ import
org.apache.camel.test.infra.aws2.common.SystemPropertiesAWSCredentialsPro
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.regions.Region;
-public class AWSRemoteService<T> implements AWSService<T> {
- private Supplier<T> remoteClientSupplier;
-
- public AWSRemoteService(Supplier<T> remoteClientSupplier) {
- this.remoteClientSupplier = remoteClientSupplier;
- }
-
- @Override
- public T getClient() {
- return remoteClientSupplier.get();
- }
+public class AWSRemoteService implements AWSService {
@Override
public Properties getConnectionProperties() {
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerService.java
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerService.java
index 873ad15..7aa1c55 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSS3LocalContainerService.java
@@ -17,30 +17,13 @@
package org.apache.camel.test.infra.aws2.services;
-import org.apache.camel.test.infra.aws2.common.TestAWSCredentialsProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
-public class AWSS3LocalContainerService extends
AWSLocalContainerService<S3Client> {
+public class AWSS3LocalContainerService extends AWSLocalContainerService {
private static final Logger LOG =
LoggerFactory.getLogger(AWSS3LocalContainerService.class);
public AWSS3LocalContainerService() {
super(Service.S3);
-
- LOG.info("Initializing the local AWS services");
- getContainer().start();
- }
-
- @Override
- public S3Client getClient() {
- Region region = Region.US_EAST_1;
-
- return S3Client.builder()
- .region(region)
-
.credentialsProvider(TestAWSCredentialsProvider.CONTAINER_LOCAL_DEFAULT_PROVIDER)
- .endpointOverride(getServiceEndpoint())
- .build();
}
}
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerService.java
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerService.java
index 3f34b53..f1f939e 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSNSLocalContainerService.java
@@ -17,20 +17,9 @@
package org.apache.camel.test.infra.aws2.services;
-import org.apache.camel.test.infra.aws2.common.TestAWSCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.sqs.SqsClient;
+public class AWSSNSLocalContainerService extends AWSLocalContainerService {
-public class AWSSNSLocalContainerService extends
AWSLocalContainerService<SqsClient> {
-
- @Override
- public SqsClient getClient() {
- Region region = Region.US_EAST_1;
-
- return SqsClient.builder()
- .region(region)
-
.credentialsProvider(TestAWSCredentialsProvider.CONTAINER_LOCAL_DEFAULT_PROVIDER)
- .endpointOverride(getServiceEndpoint())
- .build();
+ public AWSSNSLocalContainerService() {
+ super(Service.SNS);
}
}
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java
index d1aafa0..ba06475 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java
+++
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java
@@ -17,27 +17,9 @@
package org.apache.camel.test.infra.aws2.services;
-import org.apache.camel.test.infra.aws2.common.TestAWSCredentialsProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.sqs.SqsClient;
-
-public class AWSSQSLocalContainerService extends
AWSLocalContainerService<SqsClient> {
- private static final Logger LOG =
LoggerFactory.getLogger(AWSSQSLocalContainerService.class);
+public class AWSSQSLocalContainerService extends AWSLocalContainerService {
public AWSSQSLocalContainerService() {
super("localstack/localstack:0.12.2", Service.SQS);
}
-
- @Override
- public SqsClient getClient() {
- Region region = Region.US_EAST_1;
-
- return SqsClient.builder()
- .region(region)
-
.credentialsProvider(TestAWSCredentialsProvider.CONTAINER_LOCAL_DEFAULT_PROVIDER)
- .endpointOverride(getServiceEndpoint())
- .build();
- }
}
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java
index a08f188..b757c91 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java
+++
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSServiceFactory.java
@@ -18,13 +18,9 @@
package org.apache.camel.test.infra.aws2.services;
import org.apache.camel.test.infra.aws.common.services.AWSService;
-import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.core.SdkSystemSetting;
-import software.amazon.awssdk.services.kinesis.KinesisClient;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.sqs.SqsClient;
public final class AWSServiceFactory {
private static final Logger LOG =
LoggerFactory.getLogger(AWSServiceFactory.class);
@@ -37,7 +33,7 @@ public final class AWSServiceFactory {
return awsInstanceType == null ? "default" : awsInstanceType;
}
- public static AWSService<KinesisClient> createKinesisService() {
+ public static AWSService createKinesisService() {
String awsInstanceType =
System.getProperty("aws-service.kinesis.instance.type");
LOG.info("Creating a {} AWS kinesis instance",
getInstanceTypeName(awsInstanceType));
@@ -49,7 +45,7 @@ public final class AWSServiceFactory {
}
if (awsInstanceType.equals("remote")) {
- return new AWSRemoteService<>(AWSSDKClientUtils::newKinesisClient);
+ return new AWSRemoteService();
}
LOG.error("Invalid AWS instance type: {}. Must be either 'remote' or
'local-aws-container'",
@@ -57,7 +53,7 @@ public final class AWSServiceFactory {
throw new UnsupportedOperationException("Invalid AWS instance type");
}
- public static AWSService<SqsClient> createSQSService() {
+ public static AWSService createSQSService() {
String awsInstanceType =
System.getProperty("aws-service.instance.type");
LOG.info("Creating a {} AWS SQS instance",
getInstanceTypeName(awsInstanceType));
@@ -66,7 +62,7 @@ public final class AWSServiceFactory {
}
if (awsInstanceType.equals("remote")) {
- return new AWSRemoteService<>(AWSSDKClientUtils::newSQSClient);
+ return new AWSRemoteService();
}
LOG.error("Invalid AWS instance type: {}. Must be either 'remote' or
'local-aws-container'",
@@ -74,7 +70,7 @@ public final class AWSServiceFactory {
throw new UnsupportedOperationException("Invalid AWS instance type");
}
- public static AWSService<S3Client> createS3Service() {
+ public static AWSService createS3Service() {
String awsInstanceType =
System.getProperty("aws-service.instance.type");
LOG.info("Creating a {} AWS S3 instance", awsInstanceType);
@@ -83,7 +79,7 @@ public final class AWSServiceFactory {
}
if (awsInstanceType.equals("remote")) {
- return new AWSRemoteService<>(AWSSDKClientUtils::newS3Client);
+ return new AWSRemoteService();
}
LOG.error("Invalid AWS instance type: {}. Must be either 'remote' or
'local-aws-container'",
@@ -91,7 +87,7 @@ public final class AWSServiceFactory {
throw new UnsupportedOperationException("Invalid AWS instance type");
}
- public static AWSService<SqsClient> createSNSService() {
+ public static AWSService createSNSService() {
String awsInstanceType =
System.getProperty("aws-service.instance.type");
LOG.info("Creating a {} AWS SNS instance", awsInstanceType);
@@ -100,7 +96,7 @@ public final class AWSServiceFactory {
}
if (awsInstanceType.equals("remote")) {
- return new AWSRemoteService<>(AWSSDKClientUtils::newSQSClient);
+ return new AWSRemoteService();
}
LOG.error("Invalid AWS instance type: {}. Must be either 'remote' or
'local-aws-container'",
