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/29 12:06:13 UTC
[camel] 02/02: [CAMEL-14871] code review, method renames,
formatting.
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 a7071b3093e7593aad8e59006b9933cee13cebff
Author: Vilmos Nagy <vi...@outlook.com>
AuthorDate: Thu Jan 28 13:49:34 2021 +0100
[CAMEL-14871] code review, method renames, formatting.
---
.../apache/camel/component/aws/s3/S3Consumer.java | 24 +++++++++++--------
.../camel/component/aws2/s3/AWS2S3Consumer.java | 28 ++++++++++++----------
2 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
index 41a2f15..fbbefd5 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
@@ -70,7 +70,7 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
String doneFileName = getConfiguration().getDoneFileName();
Queue<Exchange> exchanges;
- if (shouldSkipCauseDoneFileIsConfiguredButMissing(bucketName, doneFileName)) {
+ if (!doneFileCheckPasses(bucketName, doneFileName)) {
exchanges = new LinkedList<>();
} else if (fileName != null) {
LOG.trace("Getting object in bucket [{}] with file name [{}]...", bucketName, fileName);
@@ -112,19 +112,23 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
return processBatch(CastUtils.cast(exchanges));
}
- private boolean shouldSkipCauseDoneFileIsConfiguredButMissing(String bucketName, String doneFileName) {
+ private boolean doneFileCheckPasses(String bucketName, String doneFileName) {
if (doneFileName == null) {
- return false;
+ return true;
} else {
- try {
- getAmazonS3Client().getObjectMetadata(bucketName, doneFileName);
+ return checkFileExists(bucketName, doneFileName);
+ }
+ }
+
+ private boolean checkFileExists(String bucketName, String doneFileName) {
+ try {
+ getAmazonS3Client().getObjectMetadata(bucketName, doneFileName);
+ return true;
+ } catch (AmazonS3Exception e) {
+ if (e.getStatusCode() == 404) {
return false;
- } catch(AmazonS3Exception e) {
- if (e.getStatusCode() == 404) {
- return true;
- }
- throw e;
}
+ throw e;
}
}
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 f59a81d..2776fd0 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
@@ -114,7 +114,7 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
String doneFileName = getConfiguration().getDoneFileName();
Queue<Exchange> exchanges;
- if (shouldSkipCauseDoneFileIsConfiguredButMissing(bucketName, doneFileName)) {
+ if (!doneFileCheckPasses(bucketName, doneFileName)) {
exchanges = new LinkedList<>();
} else if (fileName != null) {
LOG.trace("Getting object in bucket [{}] with file name [{}]...", bucketName, fileName);
@@ -158,19 +158,23 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
return processBatch(CastUtils.cast(exchanges));
}
- private boolean shouldSkipCauseDoneFileIsConfiguredButMissing(String bucketName, String doneFileName) {
+ private boolean doneFileCheckPasses(String bucketName, String doneFileName) {
if (doneFileName == null) {
- return false;
+ return true;
} else {
- HeadObjectRequest.Builder headObjectsRequest = HeadObjectRequest.builder();
- headObjectsRequest.bucket(bucketName);
- headObjectsRequest.key(doneFileName);
- try {
- getAmazonS3Client().headObject(headObjectsRequest.build());
- return false;
- } catch(NoSuchKeyException e) {
- return true;
- }
+ return checkFileExists(bucketName, doneFileName);
+ }
+ }
+
+ private boolean checkFileExists(String bucketName, String doneFileName) {
+ HeadObjectRequest.Builder headObjectsRequest = HeadObjectRequest.builder();
+ headObjectsRequest.bucket(bucketName);
+ headObjectsRequest.key(doneFileName);
+ try {
+ getAmazonS3Client().headObject(headObjectsRequest.build());
+ return true;
+ } catch (NoSuchKeyException e) {
+ return false;
}
}