Added option for path-style access to S3; fixed CheckStyle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/763e448a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/763e448a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/763e448a Branch: refs/heads/camel-2.17.x Commit: 763e448a58f48471b731329caa8d03b98c1e0b31 Parents: f040ca5 Author: MiloÅ¡ MilivojeviÄ <fingolfin...@gmail.com> Authored: Tue Jun 14 13:10:44 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Jun 14 14:33:02 2016 +0200 ---------------------------------------------------------------------- .../apache/camel/component/aws/s3/S3Endpoint.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/763e448a/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 880f77f..642def2 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 @@ -29,7 +29,14 @@ import com.amazonaws.services.s3.model.CreateBucketRequest; import com.amazonaws.services.s3.model.ListObjectsRequest; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.S3Object; -import org.apache.camel.*; +import org.apache.camel.CamelContext; +import org.apache.camel.Component; +import org.apache.camel.Consumer; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; +import org.apache.camel.Message; +import org.apache.camel.Processor; +import org.apache.camel.Producer; import org.apache.camel.impl.ScheduledPollEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; @@ -203,12 +210,8 @@ public class S3Endpoint extends ScheduledPollEndpoint { */ AmazonS3 createS3Client() { AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey()); - AmazonS3Client client= configuration.hasProxyConfiguration() ? createClientWithProxy(credentials) : new AmazonS3Client(credentials); - - S3ClientOptions clientOptions = S3ClientOptions.builder() - .setPathStyleAccess(configuration.isPathStyleAccess()) - .build(); - client.setS3ClientOptions(clientOptions); + AmazonS3Client client = configuration.hasProxyConfiguration() ? createClientWithProxy(credentials) : new AmazonS3Client(credentials); + client.setS3ClientOptions(new S3ClientOptions().withPathStyleAccess(configuration.isPathStyleAccess())); return client; }