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 2019/04/09 13:47:39 UTC
[camel] branch master updated: Camel-AWS-S3: Fixed Javadoc related
to prefix.
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
The following commit(s) were added to refs/heads/master by this push:
new 81796bb Camel-AWS-S3: Fixed Javadoc related to prefix.
81796bb is described below
commit 81796bbb631fded54fb54afe1a021908387a673e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 9 15:47:11 2019 +0200
Camel-AWS-S3: Fixed Javadoc related to prefix.
---
.../src/main/docs/aws-s3-component.adoc | 2 +-
.../camel/component/aws/s3/S3Configuration.java | 14 +++++++-------
.../s3/springboot/S3ComponentConfiguration.java | 22 +++++++++++-----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index 90aa222..98d1890 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -102,7 +102,7 @@ with the following path and query parameters:
| *includeBody* (consumer) | If it is true, the exchange body will be set to a stream to the contents of the file. If false, the headers will be set with the S3 object metadata, but the body will be null. This option is strongly related to autocloseBody option. In case of setting includeBody to true and autocloseBody to false, it will be up to the caller to close the S3Object stream. Setting autocloseBody to true, will close the S3Object stream automatically. | true | boolean
| *maxConnections* (consumer) | Set the maxConnections parameter in the S3 client configuration | 60 | int
| *maxMessagesPerPoll* (consumer) | Gets the maximum number of messages as a limit to poll at each polling. Is default unlimited, but use 0 or negative number to disable it as unlimited. | 10 | int
-| *prefix* (consumer) | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | | String
+| *prefix* (consumer) | The prefix which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | | String
| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
| *autocloseBody* (consumer) | If this option is true and includeBody is true, then the S3Object.close() method will be called on exchange completion. This option is strongly related to includeBody option. In case of setting includeBody to true and autocloseBody to false, it will be up to the caller to close the S3Object stream. Setting autocloseBody to true, will close the S3Object stream automatically. | true | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 1dbdb5f..7c71a2f 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -150,16 +150,16 @@ public class S3Configuration implements Cloneable {
public String getPrefix() {
return prefix;
}
-
+
/**
- * The delimiter which is used in the
+ * The prefix which is used in the
* com.amazonaws.services.s3.model.ListObjectsRequest to only consume
* objects we are interested in.
*/
- public void setDelimiter(String delimiter) {
- this.delimiter = delimiter;
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
}
-
+
public String getDelimiter() {
return delimiter;
}
@@ -169,8 +169,8 @@ public class S3Configuration implements Cloneable {
* com.amazonaws.services.s3.model.ListObjectsRequest to only consume
* objects we are interested in.
*/
- public void setPrefix(String prefix) {
- this.prefix = prefix;
+ public void setDelimiter(String delimiter) {
+ this.delimiter = delimiter;
}
public String getBucketName() {
diff --git a/platforms/spring-boot/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
index 1857c78..84816f2 100644
--- a/platforms/spring-boot/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
@@ -132,17 +132,17 @@ public class S3ComponentConfiguration
*/
private AmazonS3 amazonS3Client;
/**
- * The delimiter which is used in the
+ * The prefix which is used in the
* com.amazonaws.services.s3.model.ListObjectsRequest to only consume
* objects we are interested in.
*/
- private String delimiter;
+ private String prefix;
/**
* The delimiter which is used in the
* com.amazonaws.services.s3.model.ListObjectsRequest to only consume
* objects we are interested in.
*/
- private String prefix;
+ private String delimiter;
/**
* Name of the bucket. The bucket will be created if it doesn't already
* exists.
@@ -304,14 +304,6 @@ public class S3ComponentConfiguration
this.amazonS3Client = amazonS3Client;
}
- public String getDelimiter() {
- return delimiter;
- }
-
- public void setDelimiter(String delimiter) {
- this.delimiter = delimiter;
- }
-
public String getPrefix() {
return prefix;
}
@@ -320,6 +312,14 @@ public class S3ComponentConfiguration
this.prefix = prefix;
}
+ public String getDelimiter() {
+ return delimiter;
+ }
+
+ public void setDelimiter(String delimiter) {
+ this.delimiter = delimiter;
+ }
+
public String getBucketName() {
return bucketName;
}