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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new afc4e54 Regen
afc4e54 is described below
commit afc4e541d3c9b6a30517122f2b561ab4e9ee0b21
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Aug 26 09:34:14 2020 +0200
Regen
---
.../springboot/catalog/components/aws2-s3.json | 4 ++++
.../src/main/docs/aws2-s3-starter.adoc | 4 +++-
.../springboot/AWS2S3ComponentConfiguration.java | 26 ++++++++++++++++++++++
components-starter/camel-corda-starter/pom.xml | 8 +++++++
components-starter/camel-iota-starter/pom.xml | 12 ++++++++++
docs/modules/ROOT/pages/aws2-s3-starter.adoc | 4 +++-
6 files changed, 56 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
index aa81f64..245c424 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
@@ -42,6 +42,8 @@
"deleteAfterRead": { "kind": "property", "displayName": "Delete After
Read", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Delete objects from S3 after they have been
retrieved. The delete is only performed if the Exchange is committe [...]
"delimiter": { "kind": "property", "displayName": "Delimiter", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "The delimiter which is
used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume
objects we are interested in." },
"destinationBucket": { "kind": "property", "displayName": "Destination
Bucket", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Define the destination
bucket where an object must be moved when moveAfterRead is set to true." },
+ "destinationBucketPrefix": { "kind": "property", "displayName":
"Destination Bucket Prefix", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the destination bucket prefix to use
when an object must be moved and moveAfterRead is set to true." },
+ "destinationBucketSuffix": { "kind": "property", "displayName":
"Destination Bucket Suffix", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the destination bucket suffix to use
when an object must be moved and moveAfterRead is set to true." },
"fileName": { "kind": "property", "displayName": "File Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "To get the object from
the bucket with the given file name" },
"includeBody": { "kind": "property", "displayName": "Include Body",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "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
[...]
"includeFolders": { "kind": "property", "displayName": "Include Folders",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, the folders\/directories will
be consumed. If it is false, they will be ignored, and Exchanges will [...]
@@ -84,6 +86,8 @@
"deleteAfterRead": { "kind": "parameter", "displayName": "Delete After
Read", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Delete objects from S3 after they have been
retrieved. The delete is only performed if the Exchange is committ [...]
"delimiter": { "kind": "parameter", "displayName": "Delimiter", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "The delimiter which is
used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume
objects we are interested in." },
"destinationBucket": { "kind": "parameter", "displayName": "Destination
Bucket", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Define the destination
bucket where an object must be moved when moveAfterRead is set to true." },
+ "destinationBucketPrefix": { "kind": "parameter", "displayName":
"Destination Bucket Prefix", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the destination bucket prefix to use
when an object must be moved and moveAfterRead is set to true." },
+ "destinationBucketSuffix": { "kind": "parameter", "displayName":
"Destination Bucket Suffix", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Define the destination bucket suffix to use
when an object must be moved and moveAfterRead is set to true." },
"fileName": { "kind": "parameter", "displayName": "File Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "To get the object from
the bucket with the given file name" },
"includeBody": { "kind": "parameter", "displayName": "Include Body",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "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 [...]
"includeFolders": { "kind": "parameter", "displayName": "Include Folders",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, the folders\/directories will
be consumed. If it is false, they will be ignored, and Exchanges wil [...]
diff --git
a/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc
b/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc
index 56f4e65..ee6571b 100644
---
a/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc
+++
b/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-s3 with Spring Boot make sure to use the
following Maven depende
----
-The component supports 41 options, which are listed below.
+The component supports 43 options, which are listed below.
@@ -40,6 +40,8 @@ The component supports 41 options, which are listed below.
| *camel.component.aws2-s3.delete-after-write* | Delete file object after the
S3 file has been uploaded | false | Boolean
| *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. | | String
| *camel.component.aws2-s3.destination-bucket* | Define the destination bucket
where an object must be moved when moveAfterRead is set to true. | | String
+| *camel.component.aws2-s3.destination-bucket-prefix* | Define the destination
bucket prefix to use when an object must be moved and moveAfterRead is set to
true. | | String
+| *camel.component.aws2-s3.destination-bucket-suffix* | Define the destination
bucket suffix to use when an object must be moved and moveAfterRead is set to
true. | | String
| *camel.component.aws2-s3.enabled* | Whether to enable auto configuration of
the aws2-s3 component. This is enabled by default. | | Boolean
| *camel.component.aws2-s3.file-name* | To get the object from the bucket with
the given file name | | String
| *camel.component.aws2-s3.include-body* | 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
diff --git
a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
index 86685fa..ca300ff 100644
---
a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
+++
b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
@@ -151,6 +151,16 @@ public class AWS2S3ComponentConfiguration
*/
private String destinationBucket;
/**
+ * Define the destination bucket prefix to use when an object must be moved
+ * and moveAfterRead is set to true.
+ */
+ private String destinationBucketPrefix;
+ /**
+ * Define the destination bucket suffix to use when an object must be moved
+ * and moveAfterRead is set to true.
+ */
+ private String destinationBucketSuffix;
+ /**
* To get the object from the bucket with the given file name
*/
private String fileName;
@@ -424,6 +434,22 @@ public class AWS2S3ComponentConfiguration
this.destinationBucket = destinationBucket;
}
+ public String getDestinationBucketPrefix() {
+ return destinationBucketPrefix;
+ }
+
+ public void setDestinationBucketPrefix(String destinationBucketPrefix) {
+ this.destinationBucketPrefix = destinationBucketPrefix;
+ }
+
+ public String getDestinationBucketSuffix() {
+ return destinationBucketSuffix;
+ }
+
+ public void setDestinationBucketSuffix(String destinationBucketSuffix) {
+ this.destinationBucketSuffix = destinationBucketSuffix;
+ }
+
public String getFileName() {
return fileName;
}
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index a35b130..570ae59 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,6 +41,14 @@
<!--START OF GENERATED CODE-->
<exclusions>
<exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index 9427c49..1cb0cae 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/docs/modules/ROOT/pages/aws2-s3-starter.adoc
b/docs/modules/ROOT/pages/aws2-s3-starter.adoc
index 56f4e65..ee6571b 100644
--- a/docs/modules/ROOT/pages/aws2-s3-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-s3-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-s3 with Spring Boot make sure to use the
following Maven depende
----
-The component supports 41 options, which are listed below.
+The component supports 43 options, which are listed below.
@@ -40,6 +40,8 @@ The component supports 41 options, which are listed below.
| *camel.component.aws2-s3.delete-after-write* | Delete file object after the
S3 file has been uploaded | false | Boolean
| *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. | | String
| *camel.component.aws2-s3.destination-bucket* | Define the destination bucket
where an object must be moved when moveAfterRead is set to true. | | String
+| *camel.component.aws2-s3.destination-bucket-prefix* | Define the destination
bucket prefix to use when an object must be moved and moveAfterRead is set to
true. | | String
+| *camel.component.aws2-s3.destination-bucket-suffix* | Define the destination
bucket suffix to use when an object must be moved and moveAfterRead is set to
true. | | String
| *camel.component.aws2-s3.enabled* | Whether to enable auto configuration of
the aws2-s3 component. This is enabled by default. | | Boolean
| *camel.component.aws2-s3.file-name* | To get the object from the bucket with
the given file name | | String
| *camel.component.aws2-s3.include-body* | 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
