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:24 UTC
[6/8] camel git commit: CAMEL-11703 - Camel-AWS: Use builders instead
of different constructors - AWS SimpleDB
CAMEL-11703 - Camel-AWS: Use builders instead of different constructors - AWS SimpleDB
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5d8d6ee5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5d8d6ee5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5d8d6ee5
Branch: refs/heads/master
Commit: 5d8d6ee5921f9538f6fbbfb6261c8c0b8f44f5f5
Parents: c61244e
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Aug 25 09:04:01 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Aug 25 09:33:29 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/aws/sdb/SdbEndpoint.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5d8d6ee5/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
index 6f9b1c7..812cf0c 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
@@ -18,9 +18,12 @@ package org.apache.camel.component.aws.sdb;
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.simpledb.AmazonSimpleDB;
import com.amazonaws.services.simpledb.AmazonSimpleDBClient;
+import com.amazonaws.services.simpledb.AmazonSimpleDBClientBuilder;
import com.amazonaws.services.simpledb.model.CreateDomainRequest;
import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
import com.amazonaws.services.simpledb.model.NoSuchDomainException;
@@ -117,16 +120,17 @@ public class SdbEndpoint extends ScheduledPollEndpoint {
}
if (configuration.getAccessKey() != null && configuration.getSecretKey() != null) {
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
+ AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(credentials);
if (isClientConfigFound) {
- client = new AmazonSimpleDBClient(credentials, clientConfiguration);
+ client = AmazonSimpleDBClientBuilder.standard().withClientConfiguration(clientConfiguration).withCredentials(credentialsProvider).build();
} else {
- client = new AmazonSimpleDBClient(credentials);
+ client = AmazonSimpleDBClientBuilder.standard().withCredentials(credentialsProvider).build();
}
} else {
if (isClientConfigFound) {
- client = new AmazonSimpleDBClient();
+ client = AmazonSimpleDBClientBuilder.standard().build();
} else {
- client = new AmazonSimpleDBClient(clientConfiguration);
+ client = AmazonSimpleDBClientBuilder.standard().withClientConfiguration(clientConfiguration).build();
}
}
return client;