You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/10/09 11:20:23 UTC
[camel-kafka-connector] branch master updated: Do not use the
wrapper test client on the AWS v2 service classes
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-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 5adaf06 Do not use the wrapper test client on the AWS v2 service classes
5adaf06 is described below
commit 5adaf067c88537ed616b9f8bf571821b85ad710b
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Fri Oct 9 11:59:10 2020 +0200
Do not use the wrapper test client on the AWS v2 service classes
---
.../camel/kafkaconnector/aws/v2/clients/AWSSDKClientUtils.java | 4 ++--
.../aws/v2/services/AWSSQSLocalContainerService.java | 9 +++------
.../camel/kafkaconnector/aws/v2/services/AWSServiceFactory.java | 4 ++--
.../kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java | 5 +++--
.../aws/v2/sqs/source/CamelSourceAWSSQSITCase.java | 5 +++--
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSDKClientUtils.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSDKClientUtils.java
index 7e44b9a..60e9e1e 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSDKClientUtils.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSDKClientUtils.java
@@ -87,7 +87,7 @@ public final class AWSSDKClientUtils {
return clientBuilder.build();
}
- public static AWSSQSClient newSQSClient() {
+ public static SqsClient newSQSClient() {
LOG.debug("Creating a new AWS v2 SQS client");
String awsInstanceType = System.getProperty("aws-service.instance.type");
@@ -109,7 +109,7 @@ public final class AWSSDKClientUtils {
clientBuilder.credentialsProvider(TestAWSCredentialsProvider.SYSTEM_PROPERTY_PROVIDER);
}
- return new AWSSQSClient(clientBuilder.build());
+ return clientBuilder.build();
}
public static S3Client newS3Client() {
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/services/AWSSQSLocalContainerService.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/services/AWSSQSLocalContainerService.java
index 46a8f95..9c76a9a 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/services/AWSSQSLocalContainerService.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/services/AWSSQSLocalContainerService.java
@@ -17,14 +17,13 @@
package org.apache.camel.kafkaconnector.aws.v2.services;
-import org.apache.camel.kafkaconnector.aws.v2.clients.AWSSQSClient;
import org.apache.camel.kafkaconnector.aws.v2.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<AWSSQSClient> {
+public class AWSSQSLocalContainerService extends AWSLocalContainerService<SqsClient> {
private static final Logger LOG = LoggerFactory.getLogger(AWSSQSLocalContainerService.class);
public AWSSQSLocalContainerService() {
@@ -37,15 +36,13 @@ public class AWSSQSLocalContainerService extends AWSLocalContainerService<AWSSQS
}
@Override
- public AWSSQSClient getClient() {
+ public SqsClient getClient() {
Region region = Region.US_EAST_1;
- SqsClient client = SqsClient.builder()
+ return SqsClient.builder()
.region(region)
.credentialsProvider(TestAWSCredentialsProvider.CONTAINER_LOCAL_DEFAULT_PROVIDER)
.endpointOverride(getServiceEndpoint())
.build();
-
- return new AWSSQSClient(client);
}
}
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/services/AWSServiceFactory.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/services/AWSServiceFactory.java
index 67c56e4..7429b21 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/services/AWSServiceFactory.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/services/AWSServiceFactory.java
@@ -19,12 +19,12 @@ package org.apache.camel.kafkaconnector.aws.v2.services;
import org.apache.camel.kafkaconnector.aws.common.services.AWSService;
import org.apache.camel.kafkaconnector.aws.v2.clients.AWSSDKClientUtils;
-import org.apache.camel.kafkaconnector.aws.v2.clients.AWSSQSClient;
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);
@@ -58,7 +58,7 @@ public final class AWSServiceFactory {
throw new UnsupportedOperationException("Invalid AWS instance type");
}
- public static AWSService<AWSSQSClient> createSQSService() {
+ public static AWSService<SqsClient> createSQSService() {
String awsInstanceType = System.getProperty("aws-service.instance.type");
LOG.info("Creating a {} AWS SQS instance", getInstanceTypeName(awsInstanceType));
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
index dcb6c7a..d913696 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
@@ -45,6 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.junit.jupiter.Testcontainers;
import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.sqs.SqsClient;
import software.amazon.awssdk.services.sqs.model.Message;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -54,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@Testcontainers
public class CamelSinkAWSSQSITCase extends AbstractKafkaTest {
@RegisterExtension
- public static AWSService<AWSSQSClient> awsService = AWSServiceFactory.createSQSService();
+ public static AWSService<SqsClient> awsService = AWSServiceFactory.createSQSService();
private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAWSSQSITCase.class);
@@ -72,7 +73,7 @@ public class CamelSinkAWSSQSITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
- awssqsClient = awsService.getClient();
+ awssqsClient = new AWSSQSClient(awsService.getClient());
queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" + TestUtils.randomWithRange(0, 1000);
String queueUrl = awssqsClient.getOrCreateQueue(queueName);
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
index 0a7eb0d..dcb1b88 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.junit.jupiter.Testcontainers;
import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.sqs.SqsClient;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@@ -49,7 +50,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@Testcontainers
public class CamelSourceAWSSQSITCase extends AbstractKafkaTest {
@RegisterExtension
- public static AWSService<AWSSQSClient> service = AWSServiceFactory.createSQSService();
+ public static AWSService<SqsClient> service = AWSServiceFactory.createSQSService();
private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSSQSITCase.class);
@@ -66,7 +67,7 @@ public class CamelSourceAWSSQSITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
- awssqsClient = service.getClient();
+ awssqsClient = new AWSSQSClient(service.getClient());
queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" + TestUtils.randomWithRange(0, 1000);
received = 0;
}