CAMEL-11703 - Camel-AWS: Use builders instead of different constructors - AWS SQS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2bf1159c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2bf1159c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2bf1159c Branch: refs/heads/master Commit: 2bf1159c7a704f786c70084c6a2360d1663054cd Parents: 30bd175 Author: Andrea Cosentino <[email protected]> Authored: Fri Aug 25 09:29:44 2017 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Fri Aug 25 09:33:29 2017 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/aws/sqs/SqsEndpoint.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2bf1159c/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java index d1cc215..e4806eb 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java @@ -21,9 +21,12 @@ import java.util.Map.Entry; import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.AWSCredentialsProvider; +import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.services.sqs.AmazonSQS; import com.amazonaws.services.sqs.AmazonSQSClient; +import com.amazonaws.services.sqs.AmazonSQSClientBuilder; import com.amazonaws.services.sqs.model.CreateQueueRequest; import com.amazonaws.services.sqs.model.CreateQueueResult; import com.amazonaws.services.sqs.model.GetQueueUrlRequest; @@ -284,16 +287,17 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt } if (configuration.getAccessKey() != null && configuration.getSecretKey() != null) { AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey()); + AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(credentials); if (isClientConfigFound) { - client = new AmazonSQSClient(credentials, clientConfiguration); + client = AmazonSQSClientBuilder.standard().withClientConfiguration(clientConfiguration).withCredentials(credentialsProvider).build(); } else { - client = new AmazonSQSClient(credentials); + client = AmazonSQSClientBuilder.standard().withCredentials(credentialsProvider).build(); } } else { if (isClientConfigFound) { - client = new AmazonSQSClient(); + client = AmazonSQSClientBuilder.standard().build(); } else { - client = new AmazonSQSClient(clientConfiguration); + client = AmazonSQSClientBuilder.standard().withClientConfiguration(clientConfiguration).build(); } } return client;
