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 2021/01/22 08:30:24 UTC
[camel] branch master updated (486f624 -> fdd5337)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 486f624 Sync deps
new be7e211 CAMEL-16068 - Use HeadBucketRequest to check if a bucket exists or not, thanks fyi for the suggestion
new c4a824a Fixed CS
new 1fa60a5 CAMEL-16068 - Use HeadBucketRequest to check if a bucket exists or not for consumer too, thanks fyi for the suggestion
new fdd5337 Fixed CS
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java | 7 +++----
.../java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java | 8 ++------
2 files changed, 5 insertions(+), 10 deletions(-)
[camel] 02/04: Fixed CS
Posted by ac...@apache.org.
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 c4a824ace813fdbbea4e8af59b4a1d875a5615b1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 22 09:22:51 2021 +0100
Fixed CS
---
.../main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java | 2 --
1 file changed, 2 deletions(-)
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 fe7fdba..8bf4c36 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
@@ -45,8 +45,6 @@ import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
-import software.amazon.awssdk.services.s3.model.HeadBucketResponse;
-import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
import software.amazon.awssdk.services.s3.model.PutBucketPolicyRequest;
import software.amazon.awssdk.utils.IoUtils;
[camel] 03/04: CAMEL-16068 - Use HeadBucketRequest to check if a
bucket exists or not for consumer too, thanks fyi for the suggestion
Posted by ac...@apache.org.
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 1fa60a51885826d0282bc7e179a5eadd7a5133ca
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 22 09:24:48 2021 +0100
CAMEL-16068 - Use HeadBucketRequest to check if a bucket exists or not for consumer too, thanks fyi for the suggestion
---
.../java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java | 6 ++----
1 file changed, 2 insertions(+), 4 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 40d05ec..5e6e9ba 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
@@ -46,6 +46,7 @@ import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectRequest.Builder;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
import software.amazon.awssdk.services.s3.model.S3Object;
@@ -71,10 +72,7 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
if (getConfiguration().isMoveAfterRead()) {
try {
- ListObjectsRequest.Builder builder = ListObjectsRequest.builder();
- builder.bucket(getConfiguration().getDestinationBucket());
- builder.maxKeys(maxMessagesPerPoll);
- getAmazonS3Client().listObjects(builder.build());
+ getAmazonS3Client().headBucket(HeadBucketRequest.builder().bucket(getConfiguration().getDestinationBucket()).build());
LOG.trace("Bucket [{}] already exists", getConfiguration().getDestinationBucket());
return;
} catch (AwsServiceException ase) {
[camel] 04/04: Fixed CS
Posted by ac...@apache.org.
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 fdd53373ab9833ff7e0d771a1ec8cc1749413a78
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 22 09:29:48 2021 +0100
Fixed CS
---
.../main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 5e6e9ba..6afa9a7 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
@@ -72,7 +72,8 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
if (getConfiguration().isMoveAfterRead()) {
try {
- getAmazonS3Client().headBucket(HeadBucketRequest.builder().bucket(getConfiguration().getDestinationBucket()).build());
+ getAmazonS3Client()
+ .headBucket(HeadBucketRequest.builder().bucket(getConfiguration().getDestinationBucket()).build());
LOG.trace("Bucket [{}] already exists", getConfiguration().getDestinationBucket());
return;
} catch (AwsServiceException ase) {
[camel] 01/04: CAMEL-16068 - Use HeadBucketRequest to check if a
bucket exists or not, thanks fyi for the suggestion
Posted by ac...@apache.org.
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 be7e211c772098854e5d1b34c3f474b25ca27f84
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 22 09:16:15 2021 +0100
CAMEL-16068 - Use HeadBucketRequest to check if a bucket exists or not, thanks fyi for the suggestion
---
.../java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
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 78f1523..fe7fdba 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
@@ -44,6 +44,8 @@ import software.amazon.awssdk.core.ResponseInputStream;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
+import software.amazon.awssdk.services.s3.model.HeadBucketResponse;
import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
import software.amazon.awssdk.services.s3.model.PutBucketPolicyRequest;
import software.amazon.awssdk.utils.IoUtils;
@@ -107,11 +109,7 @@ public class AWS2S3Endpoint extends ScheduledPollEndpoint {
String prefix = getConfiguration().getPrefix();
try {
- ListObjectsRequest.Builder builder = ListObjectsRequest.builder();
- builder.bucket(bucketName);
- builder.prefix(prefix);
- builder.maxKeys(maxMessagesPerPoll);
- s3Client.listObjects(builder.build());
+ s3Client.headBucket(HeadBucketRequest.builder().bucket(bucketName).build());
LOG.trace("Bucket [{}] already exists", bucketName);
return;
} catch (AwsServiceException ase) {