You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2020/09/03 01:21:42 UTC
[camel-kafka-connector] 05/08: [create-pull-request] automated
change
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 31e0c82580fb89aa0dfc51309e59713d914c08ae
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Thu Aug 27 03:48:53 2020 +0000
[create-pull-request] automated change
---
.../main/docs/camel-aws2-s3-kafka-source-connector.adoc | 6 +++++-
.../aws2s3/CamelAws2s3SourceConnectorConfig.java | 16 ++++++++++++++++
.../connectors/camel-aws2-s3-kafka-source-connector.adoc | 6 +++++-
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
index 6c30d7d..d063814 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SourceConnecto
----
-The camel-aws2-s3 source connector supports 81 options, which are listed below.
+The camel-aws2-s3 source connector supports 85 options, which are listed below.
@@ -50,6 +50,8 @@ The camel-aws2-s3 source connector supports 81 options, which are listed below.
| *camel.source.endpoint.deleteAfterRead* | Delete objects from S3 after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls. Therefore you need to use the Idempotent Consumer EIP in the route to filter out duplicates. You can filter using the AWS2S3Constants#BUCKET_NAME and AWS2S3Constants#KEY headers, or only [...]
| *camel.source.endpoint.delimiter* | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | null | MEDIUM
| *camel.source.endpoint.destinationBucket* | Define the destination bucket where an object must be moved when moveAfterRead is set to true. | null | MEDIUM
+| *camel.source.endpoint.destinationBucketPrefix* | Define the destination bucket prefix to use when an object must be moved and moveAfterRead is set to true. | null | MEDIUM
+| *camel.source.endpoint.destinationBucketSuffix* | Define the destination bucket suffix to use when an object must be moved and moveAfterRead is set to true. | null | MEDIUM
| *camel.source.endpoint.fileName* | To get the object from the bucket with the given file name | null | MEDIUM
| *camel.source.endpoint.includeBody* | 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 | MEDIUM
| *camel.source.endpoint.includeFolders* | If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those | true | MEDIUM
@@ -101,6 +103,8 @@ The camel-aws2-s3 source connector supports 81 options, which are listed below.
| *camel.component.aws2-s3.deleteAfterRead* | Delete objects from S3 after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls. Therefore you need to use the Idempotent Consumer EIP in the route to filter out duplicates. You can filter using the AWS2S3Constants#BUCKET_NAME and AWS2S3Constants#KEY headers, or onl [...]
| *camel.component.aws2-s3.delimiter* | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | null | MEDIUM
| *camel.component.aws2-s3.destinationBucket* | Define the destination bucket where an object must be moved when moveAfterRead is set to true. | null | MEDIUM
+| *camel.component.aws2-s3.destinationBucketPrefix* | Define the destination bucket prefix to use when an object must be moved and moveAfterRead is set to true. | null | MEDIUM
+| *camel.component.aws2-s3.destinationBucketSuffix* | Define the destination bucket suffix to use when an object must be moved and moveAfterRead is set to true. | null | MEDIUM
| *camel.component.aws2-s3.fileName* | To get the object from the bucket with the given file name | null | MEDIUM
| *camel.component.aws2-s3.includeBody* | 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 | MEDIUM
| *camel.component.aws2-s3.includeFolders* | If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those | true | MEDIUM
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
index f2f9492..a1c9898 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
@@ -89,6 +89,12 @@ public class CamelAws2s3SourceConnectorConfig
public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_CONF = "camel.source.endpoint.destinationBucket";
public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_DOC = "Define the destination bucket where an object must be moved when moveAfterRead is set to true.";
public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_DEFAULT = null;
+ public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_PREFIX_CONF = "camel.source.endpoint.destinationBucketPrefix";
+ public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_PREFIX_DOC = "Define the destination bucket prefix to use when an object must be moved and moveAfterRead is set to true.";
+ public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_PREFIX_DEFAULT = null;
+ public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_SUFFIX_CONF = "camel.source.endpoint.destinationBucketSuffix";
+ public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_SUFFIX_DOC = "Define the destination bucket suffix to use when an object must be moved and moveAfterRead is set to true.";
+ public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_SUFFIX_DEFAULT = null;
public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_FILE_NAME_CONF = "camel.source.endpoint.fileName";
public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_FILE_NAME_DOC = "To get the object from the bucket with the given file name";
public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_FILE_NAME_DEFAULT = null;
@@ -242,6 +248,12 @@ public class CamelAws2s3SourceConnectorConfig
public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_CONF = "camel.component.aws2-s3.destinationBucket";
public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_DOC = "Define the destination bucket where an object must be moved when moveAfterRead is set to true.";
public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_DEFAULT = null;
+ public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_PREFIX_CONF = "camel.component.aws2-s3.destinationBucketPrefix";
+ public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_PREFIX_DOC = "Define the destination bucket prefix to use when an object must be moved and moveAfterRead is set to true.";
+ public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_PREFIX_DEFAULT = null;
+ public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_SUFFIX_CONF = "camel.component.aws2-s3.destinationBucketSuffix";
+ public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_SUFFIX_DOC = "Define the destination bucket suffix to use when an object must be moved and moveAfterRead is set to true.";
+ public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_SUFFIX_DEFAULT = null;
public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_FILE_NAME_CONF = "camel.component.aws2-s3.fileName";
public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_FILE_NAME_DOC = "To get the object from the bucket with the given file name";
public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_FILE_NAME_DEFAULT = null;
@@ -303,6 +315,8 @@ public class CamelAws2s3SourceConnectorConfig
conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_DELETE_AFTER_READ_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_DELIMITER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_DELIMITER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_DELIMITER_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_DOC);
+ conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_PREFIX_DOC);
+ conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_SUFFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_SUFFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_DESTINATION_BUCKET_SUFFIX_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_FILE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_FILE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_FILE_NAME_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_INCLUDE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_INCLUDE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_INCLUDE_BODY_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_INCLUDE_FOLDERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_INCLUDE_FOLDERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_INCLUDE_FOLDERS_DOC);
@@ -354,6 +368,8 @@ public class CamelAws2s3SourceConnectorConfig
conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_DELETE_AFTER_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_COMPONENT_DELETE_AFTER_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_DELETE_AFTER_READ_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_DELIMITER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_DELIMITER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_DELIMITER_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_DOC);
+ conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_PREFIX_DOC);
+ conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_SUFFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_SUFFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_DESTINATION_BUCKET_SUFFIX_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_FILE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_FILE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_FILE_NAME_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_INCLUDE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_COMPONENT_INCLUDE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_INCLUDE_BODY_DOC);
conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_INCLUDE_FOLDERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_COMPONENT_INCLUDE_FOLDERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_INCLUDE_FOLDERS_DOC);
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
index 6c30d7d..d063814 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SourceConnecto
----
-The camel-aws2-s3 source connector supports 81 options, which are listed below.
+The camel-aws2-s3 source connector supports 85 options, which are listed below.
@@ -50,6 +50,8 @@ The camel-aws2-s3 source connector supports 81 options, which are listed below.
| *camel.source.endpoint.deleteAfterRead* | Delete objects from S3 after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls. Therefore you need to use the Idempotent Consumer EIP in the route to filter out duplicates. You can filter using the AWS2S3Constants#BUCKET_NAME and AWS2S3Constants#KEY headers, or only [...]
| *camel.source.endpoint.delimiter* | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | null | MEDIUM
| *camel.source.endpoint.destinationBucket* | Define the destination bucket where an object must be moved when moveAfterRead is set to true. | null | MEDIUM
+| *camel.source.endpoint.destinationBucketPrefix* | Define the destination bucket prefix to use when an object must be moved and moveAfterRead is set to true. | null | MEDIUM
+| *camel.source.endpoint.destinationBucketSuffix* | Define the destination bucket suffix to use when an object must be moved and moveAfterRead is set to true. | null | MEDIUM
| *camel.source.endpoint.fileName* | To get the object from the bucket with the given file name | null | MEDIUM
| *camel.source.endpoint.includeBody* | 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 | MEDIUM
| *camel.source.endpoint.includeFolders* | If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those | true | MEDIUM
@@ -101,6 +103,8 @@ The camel-aws2-s3 source connector supports 81 options, which are listed below.
| *camel.component.aws2-s3.deleteAfterRead* | Delete objects from S3 after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs, the object is not deleted. If this option is false, then the same objects will be retrieve over and over again on the polls. Therefore you need to use the Idempotent Consumer EIP in the route to filter out duplicates. You can filter using the AWS2S3Constants#BUCKET_NAME and AWS2S3Constants#KEY headers, or onl [...]
| *camel.component.aws2-s3.delimiter* | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | null | MEDIUM
| *camel.component.aws2-s3.destinationBucket* | Define the destination bucket where an object must be moved when moveAfterRead is set to true. | null | MEDIUM
+| *camel.component.aws2-s3.destinationBucketPrefix* | Define the destination bucket prefix to use when an object must be moved and moveAfterRead is set to true. | null | MEDIUM
+| *camel.component.aws2-s3.destinationBucketSuffix* | Define the destination bucket suffix to use when an object must be moved and moveAfterRead is set to true. | null | MEDIUM
| *camel.component.aws2-s3.fileName* | To get the object from the bucket with the given file name | null | MEDIUM
| *camel.component.aws2-s3.includeBody* | 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 | MEDIUM
| *camel.component.aws2-s3.includeFolders* | If it is true, the folders/directories will be consumed. If it is false, they will be ignored, and Exchanges will not be created for those | true | MEDIUM