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/24 12:55:38 UTC
camel git commit: CAMEL-11701 - Camel-AWS S3: Use
AmazonS3ClientBuilder instead of different constructors
Repository: camel
Updated Branches:
refs/heads/master 5481b9cf8 -> 60d0ed8b4
CAMEL-11701 - Camel-AWS S3: Use AmazonS3ClientBuilder instead of different constructors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/60d0ed8b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60d0ed8b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60d0ed8b
Branch: refs/heads/master
Commit: 60d0ed8b43c0860ab42abb436df05f5c7a5a9e25
Parents: 5481b9c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Aug 24 14:52:42 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Aug 24 14:52:42 2017 +0200
----------------------------------------------------------------------
.../apache/camel/component/aws/s3/S3Endpoint.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/60d0ed8b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index 87fb1d5..6f06177 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -21,9 +21,11 @@ import java.io.IOException;
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.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.S3ClientOptions;
import com.amazonaws.services.s3.model.CreateBucketRequest;
import com.amazonaws.services.s3.model.ListObjectsRequest;
@@ -235,7 +237,7 @@ public class S3Endpoint extends ScheduledPollEndpoint {
*/
AmazonS3 createS3Client() {
- AmazonS3Client client = null;
+ AmazonS3 client = null;
ClientConfiguration clientConfiguration = null;
boolean isClientConfigFound = false;
if (configuration.hasProxyConfiguration()) {
@@ -251,16 +253,17 @@ public class S3Endpoint 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 AmazonS3Client(credentials, clientConfiguration);
+ client = AmazonS3ClientBuilder.standard().withClientConfiguration(clientConfiguration).withCredentials(credentialsProvider).build();
} else {
- client = new AmazonS3Client(credentials);
+ client = AmazonS3ClientBuilder.standard().withCredentials(credentialsProvider).build();
}
} else {
if (isClientConfigFound) {
- client = new AmazonS3Client();
+ client = AmazonS3ClientBuilder.standard().build();
} else {
- client = new AmazonS3Client(clientConfiguration);
+ client = AmazonS3ClientBuilder.standard().withClientConfiguration(clientConfiguration).build();
}
}