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 2017/08/25 07:34:20 UTC
[2/8] camel git commit: CAMEL-11703 - Camel-AWS: Use builders instead
of different constructors - AWS SNS
CAMEL-11703 - Camel-AWS: Use builders instead of different constructors - AWS SNS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/30bd175c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/30bd175c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/30bd175c
Branch: refs/heads/master
Commit: 30bd175cb2c62abea3db52353ea462c25b1c03fa
Parents: 6b2262a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Aug 25 09:26:22 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Aug 25 09:33:29 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/aws/sns/SnsEndpoint.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/30bd175c/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
index 469ee4a..39f39c8 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
@@ -19,9 +19,12 @@ package org.apache.camel.component.aws.sns;
import com.amazonaws.AmazonServiceException;
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.sns.AmazonSNS;
import com.amazonaws.services.sns.AmazonSNSClient;
+import com.amazonaws.services.sns.AmazonSNSClientBuilder;
import com.amazonaws.services.sns.model.CreateTopicRequest;
import com.amazonaws.services.sns.model.CreateTopicResult;
import com.amazonaws.services.sns.model.ListTopicsResult;
@@ -189,16 +192,17 @@ public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
}
if (configuration.getAccessKey() != null && configuration.getSecretKey() != null) {
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
+ AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(credentials);
if (isClientConfigFound) {
- client = new AmazonSNSClient(credentials, clientConfiguration);
+ client = AmazonSNSClientBuilder.standard().withClientConfiguration(clientConfiguration).withCredentials(credentialsProvider).build();
} else {
- client = new AmazonSNSClient(credentials);
+ client = AmazonSNSClientBuilder.standard().withCredentials(credentialsProvider).build();
}
} else {
if (isClientConfigFound) {
- client = new AmazonSNSClient();
+ client = AmazonSNSClientBuilder.standard().build();
} else {
- client = new AmazonSNSClient(clientConfiguration);
+ client = AmazonSNSClientBuilder.standard().withClientConfiguration(clientConfiguration).build();
}
}
return client;