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 ee4cc8c8e2bfaefbfaf155fd2898ed909056a335
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jul 30 08:13:48 2020 +0200
Camel-AWS2-S3: Fixed CS
---
.../camel/component/aws2/s3/AWS2S3Consumer.java | 71 +++++++++++-----------
1 file changed, 36 insertions(+), 35 deletions(-)
diff --git
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
index 154a5d4..484fefb 100644
---
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
+++
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
@@ -63,39 +63,40 @@ public class AWS2S3Consumer extends
ScheduledBatchPollingConsumer {
public AWS2S3Consumer(AWS2S3Endpoint endpoint, Processor processor) throws
NoFactoryAvailableException {
super(endpoint, processor);
}
-
+
@Override
protected void doStart() throws Exception {
- super.doStart();
-
- if (getConfiguration().isMoveAfterRead()) {
- try {
- ListObjectsRequest.Builder builder = ListObjectsRequest.builder();
- builder.bucket(getConfiguration().getDestinationBucket());
- builder.maxKeys(maxMessagesPerPoll);
- getAmazonS3Client().listObjects(builder.build());
- LOG.trace("Bucket [{}] already exists",
getConfiguration().getDestinationBucket());
- return;
- } catch (AwsServiceException ase) {
- /* 404 means the bucket doesn't exist */
- if (ase.awsErrorDetails().errorCode().equalsIgnoreCase("404")) {
- throw ase;
- }
- }
-
- LOG.trace("Destination Bucket [{}] doesn't exist yet",
getConfiguration().getDestinationBucket());
-
- if (getConfiguration().isAutoCreateBucket()) {
- // creates the new bucket because it doesn't exist yet
- CreateBucketRequest createBucketRequest =
CreateBucketRequest.builder().bucket(getConfiguration().getDestinationBucket()).build();
-
- LOG.trace("Creating Destination bucket [{}] in region [{}] with
request [{}]...", getConfiguration().getDestinationBucket(),
getConfiguration().getRegion(), createBucketRequest);
-
- getAmazonS3Client().createBucket(createBucketRequest);
-
- LOG.trace("Destination Bucket created");
- }
- }
+ super.doStart();
+
+ if (getConfiguration().isMoveAfterRead()) {
+ try {
+ ListObjectsRequest.Builder builder =
ListObjectsRequest.builder();
+ builder.bucket(getConfiguration().getDestinationBucket());
+ builder.maxKeys(maxMessagesPerPoll);
+ getAmazonS3Client().listObjects(builder.build());
+ LOG.trace("Bucket [{}] already exists",
getConfiguration().getDestinationBucket());
+ return;
+ } catch (AwsServiceException ase) {
+ /* 404 means the bucket doesn't exist */
+ if (ase.awsErrorDetails().errorCode().equalsIgnoreCase("404"))
{
+ throw ase;
+ }
+ }
+
+ LOG.trace("Destination Bucket [{}] doesn't exist yet",
getConfiguration().getDestinationBucket());
+
+ if (getConfiguration().isAutoCreateBucket()) {
+ // creates the new bucket because it doesn't exist yet
+ CreateBucketRequest createBucketRequest =
CreateBucketRequest.builder().bucket(getConfiguration().getDestinationBucket()).build();
+
+ LOG.trace("Creating Destination bucket [{}] in region [{}]
with request [{}]...", getConfiguration().getDestinationBucket(),
getConfiguration().getRegion(),
+ createBucketRequest);
+
+ getAmazonS3Client().createBucket(createBucketRequest);
+
+ LOG.trace("Destination Bucket created");
+ }
+ }
}
@Override
@@ -177,8 +178,7 @@ public class AWS2S3Consumer extends
ScheduledBatchPollingConsumer {
getRequest.sseCustomerAlgorithm(getConfiguration().getCustomerAlgorithm());
}
}
- ResponseInputStream<GetObjectResponse> s3Object =
getAmazonS3Client()
- .getObject(getRequest.build(),
ResponseTransformer.toInputStream());
+ ResponseInputStream<GetObjectResponse> s3Object =
getAmazonS3Client().getObject(getRequest.build(),
ResponseTransformer.toInputStream());
if (includeS3Object(s3Object)) {
s3Objects.add(s3Object);
@@ -208,7 +208,7 @@ public class AWS2S3Consumer extends
ScheduledBatchPollingConsumer {
if (getConfiguration().isIncludeFolders()) {
return true;
} else {
- //Config says to ignore folders/directories
+ // Config says to ignore folders/directories
return
!"application/x-directory".equalsIgnoreCase(s3Object.response().contentType());
}
}
@@ -269,7 +269,8 @@ public class AWS2S3Consumer extends
ScheduledBatchPollingConsumer {
LOG.trace("Moving object from bucket {} with key {} to bucket
{}...", bucketName, key, getConfiguration().getDestinationBucket());
-
getAmazonS3Client().copyObject(CopyObjectRequest.builder().destinationKey(key).destinationBucket(getConfiguration().getDestinationBucket()).copySource(bucketName
+ "/" + key).build());
+
getAmazonS3Client().copyObject(CopyObjectRequest.builder().destinationKey(key).destinationBucket(getConfiguration().getDestinationBucket())
+ .copySource(bucketName + "/" + key).build());
LOG.trace("Moved object from bucket {} with key {} to bucket
{}...", bucketName, key, getConfiguration().getDestinationBucket());
}
