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 2020/03/20 14:00:11 UTC
[camel] 04/04: CAMEL-14658 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0ff02c5f42137af2e5dcacee4a428dc5a34ab708
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 20 14:52:51 2020 +0100
CAMEL-14658 - Fixed CS
---
.../camel/component/aws2/s3/AWS2S3Component.java | 2 +-
.../component/aws2/s3/AWS2S3Configuration.java | 39 +++++++++++-----------
.../camel/component/aws2/s3/AWS2S3Endpoint.java | 7 ++--
.../camel/component/aws2/s3/AWS2S3Producer.java | 17 +++++-----
.../client/impl/AWS2S3ClientIAMOptimizedImpl.java | 2 +-
.../s3/client/impl/AWS2S3ClientStandardImpl.java | 2 +-
.../aws2/s3/S3ComponentConfigurationTest.java | 3 +-
.../S3CopyObjectOperationIntegrationTest.java | 8 ++---
.../S3DeleteBucketOperationIntegrationTest.java | 8 ++---
.../S3ListObjectsOperationIntegrationTest.java | 22 ++++++------
.../S3MultipartUploadOperationIntegrationTest.java | 6 ++--
11 files changed, 59 insertions(+), 57 deletions(-)
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
index a6cdbac..d01e76c 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
@@ -31,7 +31,7 @@ import software.amazon.awssdk.services.s3.S3Client;
@Component("aws2-s3")
public class AWS2S3Component extends DefaultComponent {
-
+
private static final Logger LOG = LoggerFactory.getLogger(AWS2S3Component.class);
@Metadata
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
index f36aeab..6ecb0a1 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
@@ -191,10 +191,9 @@ public class AWS2S3Configuration implements Cloneable {
}
/**
- * The region in which S3 client needs to work. When using this
- * parameter, the configuration will expect the lowercase name of the
- * region (for example ap-east-1) You'll need to use the name
- * Region.EU_WEST_1.id()
+ * The region in which S3 client needs to work. When using this parameter,
+ * the configuration will expect the lowercase name of the region (for
+ * example ap-east-1) You'll need to use the name Region.EU_WEST_1.id()
*/
public void setRegion(String region) {
this.region = region;
@@ -387,34 +386,36 @@ public class AWS2S3Configuration implements Cloneable {
public void setKeyName(String keyName) {
this.keyName = keyName;
}
-
+
public boolean isOverrideEndpoint() {
- return overrideEndpoint;
- }
+ return overrideEndpoint;
+ }
/**
- * Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option
+ * Set the need for overidding the endpoint. This option needs to be used in
+ * combination with uriEndpointOverride option
*/
- public void setOverrideEndpoint(boolean overrideEndpoint) {
- this.overrideEndpoint = overrideEndpoint;
- }
+ public void setOverrideEndpoint(boolean overrideEndpoint) {
+ this.overrideEndpoint = overrideEndpoint;
+ }
- public String getUriEndpointOverride() {
- return uriEndpointOverride;
- }
+ public String getUriEndpointOverride() {
+ return uriEndpointOverride;
+ }
/**
- * Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option
+ * Set the overriding uri endpoint. This option needs to be used in
+ * combination with overrideEndpoint option
*/
- public void setUriEndpointOverride(String uriEndpointOverride) {
- this.uriEndpointOverride = uriEndpointOverride;
- }
+ public void setUriEndpointOverride(String uriEndpointOverride) {
+ this.uriEndpointOverride = uriEndpointOverride;
+ }
// *************************************************
//
// *************************************************
- public AWS2S3Configuration copy() {
+ public AWS2S3Configuration copy() {
try {
return (AWS2S3Configuration)super.clone();
} catch (CloneNotSupportedException e) {
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
index ec5a17b..b3ee73c 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
@@ -51,8 +51,8 @@ import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
import software.amazon.awssdk.services.s3.model.PutBucketPolicyRequest;
/**
- * The aws2-s3 component is used for storing and retrieving object from Amazon S3
- * Storage Service.
+ * The aws2-s3 component is used for storing and retrieving object from Amazon
+ * S3 Storage Service.
*/
@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-s3", title = "AWS2 S3 Storage Service", syntax = "aws2-s3://bucketNameOrArn", label = "cloud,file")
public class AWS2S3Endpoint extends ScheduledPollEndpoint {
@@ -93,8 +93,7 @@ public class AWS2S3Endpoint extends ScheduledPollEndpoint {
public void doStart() throws Exception {
super.doStart();
- s3Client = configuration.getAmazonS3Client() != null
- ? configuration.getAmazonS3Client() : AWS2S3ClientFactory.getAWSS3Client(configuration).getS3Client();
+ s3Client = configuration.getAmazonS3Client() != null ? configuration.getAmazonS3Client() : AWS2S3ClientFactory.getAWSS3Client(configuration).getS3Client();
String fileName = getConfiguration().getFileName();
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
index 3f05e19..de0e7d2 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
@@ -117,7 +117,7 @@ public class AWS2S3Producer extends DefaultProducer {
}
}
}
-
+
public void processMultiPart(final Exchange exchange) throws Exception {
File filePayload = null;
Object obj = exchange.getIn().getMandatoryBody();
@@ -141,8 +141,7 @@ public class AWS2S3Producer extends DefaultProducer {
}
final String keyName = determineKey(exchange);
- CreateMultipartUploadRequest.Builder createMultipartUploadRequest = CreateMultipartUploadRequest.builder()
- .bucket(getConfiguration().getBucketName()).key(keyName);
+ CreateMultipartUploadRequest.Builder createMultipartUploadRequest = CreateMultipartUploadRequest.builder().bucket(getConfiguration().getBucketName()).key(keyName);
String storageClass = determineStorageClass(exchange);
if (storageClass != null) {
@@ -182,8 +181,8 @@ public class AWS2S3Producer extends DefaultProducer {
for (int part = 1; filePosition < contentLength; part++) {
partSize = Math.min(partSize, contentLength - filePosition);
- UploadPartRequest uploadRequest = UploadPartRequest.builder().bucket(getConfiguration().getBucketName()).key(keyName)
- .uploadId(initResponse.uploadId()).partNumber(part).build();
+ UploadPartRequest uploadRequest = UploadPartRequest.builder().bucket(getConfiguration().getBucketName()).key(keyName).uploadId(initResponse.uploadId())
+ .partNumber(part).build();
LOG.trace("Uploading part [{}] for {}", part, keyName);
String etag = getEndpoint().getS3Client().uploadPart(uploadRequest, RequestBody.fromFile(filePayload)).eTag();
@@ -193,12 +192,14 @@ public class AWS2S3Producer extends DefaultProducer {
filePosition += partSize;
}
CompletedMultipartUpload completeMultipartUpload = CompletedMultipartUpload.builder().parts(completedParts).build();
- CompleteMultipartUploadRequest compRequest = CompleteMultipartUploadRequest.builder().multipartUpload(completeMultipartUpload).bucket(getConfiguration().getBucketName()).key(keyName).uploadId(initResponse.uploadId()).build();
+ CompleteMultipartUploadRequest compRequest = CompleteMultipartUploadRequest.builder().multipartUpload(completeMultipartUpload)
+ .bucket(getConfiguration().getBucketName()).key(keyName).uploadId(initResponse.uploadId()).build();
uploadResult = getEndpoint().getS3Client().completeMultipartUpload(compRequest);
} catch (Exception e) {
- getEndpoint().getS3Client().abortMultipartUpload(AbortMultipartUploadRequest.builder().bucket(getConfiguration().getBucketName()).key(keyName).uploadId(initResponse.uploadId()).build());
+ getEndpoint().getS3Client()
+ .abortMultipartUpload(AbortMultipartUploadRequest.builder().bucket(getConfiguration().getBucketName()).key(keyName).uploadId(initResponse.uploadId()).build());
throw e;
}
@@ -345,7 +346,7 @@ public class AWS2S3Producer extends DefaultProducer {
DeleteBucketRequest.Builder deleteBucketRequest = DeleteBucketRequest.builder().bucket(bucketName);
DeleteBucketResponse resp = s3Client.deleteBucket(deleteBucketRequest.build());
-
+
Message message = getMessageForResponse(exchange);
message.setBody(resp);
}
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
index ab7c308..0139d9b 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
@@ -82,7 +82,7 @@ public class AWS2S3ClientIAMOptimizedImpl implements AWS2CamelS3InternalClient {
clientBuilder = clientBuilder.region(Region.of(configuration.getRegion()));
}
if (configuration.isOverrideEndpoint()) {
- clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
+ clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
client = clientBuilder.build();
return client;
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
index 433009e..2652311 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
@@ -82,7 +82,7 @@ public class AWS2S3ClientStandardImpl implements AWS2CamelS3InternalClient {
clientBuilder = clientBuilder.region(Region.of(configuration.getRegion()));
}
if (configuration.isOverrideEndpoint()) {
- clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
+ clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
client = clientBuilder.build();
return client;
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
index a75a925..1016153 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
@@ -27,7 +27,8 @@ public class S3ComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithMinimalConfiguration() throws Exception {
AWS2S3Component component = context.getComponent("aws2-s3", AWS2S3Component.class);
- AWS2S3Endpoint endpoint = (AWS2S3Endpoint)component.createEndpoint("aws2-s3://TestDomain?accessKey=xxx&secretKey=yyy®ion=us-west-1&overrideEndpoint=true&uriEndpointOverride=http://localhost:4572");
+ AWS2S3Endpoint endpoint = (AWS2S3Endpoint)component
+ .createEndpoint("aws2-s3://TestDomain?accessKey=xxx&secretKey=yyy®ion=us-west-1&overrideEndpoint=true&uriEndpointOverride=http://localhost:4572");
assertTrue(endpoint.getConfiguration().isOverrideEndpoint());
assertEquals(endpoint.getConfiguration().getUriEndpointOverride(), "http://localhost:4572");
}
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationIntegrationTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationIntegrationTest.java
index a2a35ec..b02c867 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationIntegrationTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CopyObjectOperationIntegrationTest.java
@@ -38,7 +38,7 @@ public class S3CopyObjectOperationIntegrationTest extends CamelTestSupport {
@BindToRegistry("amazonS3Client")
S3Client client = S3Client.builder().credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("xxx", "yyy"))).region(Region.EU_WEST_1).build();
-
+
@EndpointInject
private ProducerTemplate template;
@@ -68,7 +68,7 @@ public class S3CopyObjectOperationIntegrationTest extends CamelTestSupport {
exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.copyObject);
}
});
-
+
assertMockEndpointsSatisfied();
}
@@ -78,9 +78,9 @@ public class S3CopyObjectOperationIntegrationTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
String awsEndpoint = "aws2-s3://mycamel?autoCreateBucket=false";
-
+
from("direct:putObject").to(awsEndpoint);
-
+
from("direct:copyObject").to(awsEndpoint).to("mock:result");
}
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3DeleteBucketOperationIntegrationTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3DeleteBucketOperationIntegrationTest.java
index 21cf940..c13be62 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3DeleteBucketOperationIntegrationTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3DeleteBucketOperationIntegrationTest.java
@@ -38,7 +38,7 @@ public class S3DeleteBucketOperationIntegrationTest extends CamelTestSupport {
@BindToRegistry("amazonS3Client")
S3Client client = S3Client.builder().credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("xxx", "yyy"))).region(Region.EU_WEST_1).build();
-
+
@EndpointInject
private ProducerTemplate template;
@@ -65,7 +65,7 @@ public class S3DeleteBucketOperationIntegrationTest extends CamelTestSupport {
exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.deleteBucket);
}
});
-
+
assertMockEndpointsSatisfied();
}
@@ -75,9 +75,9 @@ public class S3DeleteBucketOperationIntegrationTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
String awsEndpoint = "aws2-s3://mycamel2?autoCreateBucket=true";
-
+
from("direct:listBucket").to(awsEndpoint);
-
+
from("direct:deleteBucket").to(awsEndpoint).to("mock:result");
}
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ListObjectsOperationIntegrationTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ListObjectsOperationIntegrationTest.java
index 63824ba..1864486 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ListObjectsOperationIntegrationTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ListObjectsOperationIntegrationTest.java
@@ -44,7 +44,7 @@ public class S3ListObjectsOperationIntegrationTest extends CamelTestSupport {
@BindToRegistry("amazonS3Client")
S3Client client = S3Client.builder().credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("xxx", "yyy"))).region(Region.EU_WEST_1).build();
-
+
@EndpointInject
private ProducerTemplate template;
@@ -63,7 +63,7 @@ public class S3ListObjectsOperationIntegrationTest extends CamelTestSupport {
exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listBuckets);
}
});
-
+
template.send("direct:addObject", ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(AWS2S3Constants.KEY, "CamelUnitTest2");
@@ -71,7 +71,7 @@ public class S3ListObjectsOperationIntegrationTest extends CamelTestSupport {
exchange.getIn().removeHeader(AWS2S3Constants.S3_OPERATION);
}
});
-
+
Exchange ex = template.request("direct:listObjects", new Processor() {
@Override
@@ -80,11 +80,11 @@ public class S3ListObjectsOperationIntegrationTest extends CamelTestSupport {
exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listObjects);
}
});
-
+
List<S3Object> resp = ex.getMessage().getBody(List.class);
assertEquals(1, resp.size());
assertEquals("CamelUnitTest2", resp.get(0).key());
-
+
template.send("direct:deleteObject", ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(AWS2S3Constants.KEY, "CamelUnitTest2");
@@ -101,7 +101,7 @@ public class S3ListObjectsOperationIntegrationTest extends CamelTestSupport {
exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.deleteBucket);
}
});
-
+
assertMockEndpointsSatisfied();
}
@@ -111,15 +111,15 @@ public class S3ListObjectsOperationIntegrationTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
String awsEndpoint = "aws2-s3://mycamel2?autoCreateBucket=true";
-
+
from("direct:listBucket").to(awsEndpoint);
-
+
from("direct:addObject").to(awsEndpoint);
-
+
from("direct:deleteObject").to(awsEndpoint);
-
+
from("direct:listObjects").to(awsEndpoint);
-
+
from("direct:deleteBucket").to(awsEndpoint).to("mock:result");
}
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3MultipartUploadOperationIntegrationTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3MultipartUploadOperationIntegrationTest.java
index 87aa7fe..a2c9676 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3MultipartUploadOperationIntegrationTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3MultipartUploadOperationIntegrationTest.java
@@ -39,7 +39,7 @@ public class S3MultipartUploadOperationIntegrationTest extends CamelTestSupport
@BindToRegistry("amazonS3Client")
S3Client client = S3Client.builder().credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("xxx", "yyy"))).region(Region.EU_WEST_1).build();
-
+
@EndpointInject
private ProducerTemplate template;
@@ -58,7 +58,7 @@ public class S3MultipartUploadOperationIntegrationTest extends CamelTestSupport
exchange.getIn().setBody(new File("src/test/resources/empty.txt"));
}
});
-
+
assertMockEndpointsSatisfied();
}
@@ -68,7 +68,7 @@ public class S3MultipartUploadOperationIntegrationTest extends CamelTestSupport
@Override
public void configure() throws Exception {
String awsEndpoint = "aws2-s3://mycamel?multiPartUpload=true&autoCreateBucket=false&partSize=1048576";
-
+
from("direct:putObject").to(awsEndpoint).to("mock:result");
}