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
commit a7fcfeb906848868f2e82c45fa1402c55b91bfc3
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Apr 6 10:43:22 2020 +0200
Regen
---
.../camel/springboot/catalog/components/aws2-s3.json | 2 ++
.../src/main/docs/aws2-s3-starter.adoc | 3 ++-
.../s3/springboot/AWS2S3ComponentConfiguration.java | 13 +++++++++++++
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
components-starter/camel-spring-boot-starter/pom.xml | 16 ++++++++++++++++
.../camel-spring-cloud-consul-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-netflix-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-zookeeper-starter/pom.xml | 20 ++++++++++++++++++++
docs/modules/ROOT/pages/aws2-s3-starter.adoc | 3 ++-
10 files changed, 127 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 1be9f4d..30437d6 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
@@ -36,6 +36,7 @@
"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." },
"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 [...]
"prefix": { "kind": "property", "displayName": "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": "The prefix which is used
in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume
objects we are interested in." },
"autocloseBody": { "kind": "property", "displayName": "Autoclose Body",
"group": "consumer (advanced)", "label": "consumer,advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret":
false, "defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If this option is true and includeBody is
true, then the S3Object.close() method will be called [...]
"deleteAfterWrite": { "kind": "property", "displayName": "Delete After
Write", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Delete file object after the S3 file has been
uploaded" },
@@ -68,6 +69,7 @@
"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." },
"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 [...]
"maxConnections": { "kind": "parameter", "displayName": "Max Connections",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "defaultValue": "60",
"description": "Set the maxConnections parameter in the S3 client
configuration" },
"maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages
Per Poll", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "10", "description": "Gets the maximum number of messages as a
limit to poll at each polling. Gets the maximum number of messages as a limit
to poll at each polling. The default value is 10. Use 0 or a negative number to
set it as unlimited." },
"prefix": { "kind": "parameter", "displayName": "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": "The prefix which is used
in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume
objects we are interested in." },
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 29287ec..c7cc11a 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 31 options, which are listed below.
+The component supports 32 options, which are listed below.
@@ -38,6 +38,7 @@ The component supports 31 options, which are listed below.
| *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
+| *camel.component.aws2-s3.include-folders* | 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 | Boolean
| *camel.component.aws2-s3.key-name* | Setting the key name for an element in
the bucket through endpoint parameter | | String
| *camel.component.aws2-s3.lazy-start-producer* | Whether the producer should
be started lazy (on the first message). By starting lazy you can use this to
allow CamelContext and routes to startup in situations where a producer may
otherwise fail during starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed th [...]
| *camel.component.aws2-s3.multi-part-upload* | If it is true, camel will
upload the file with multi part format, the part size is decided by the option
of partSize | false | 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 2b16e92..50abe64 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
@@ -132,6 +132,11 @@ public class AWS2S3ComponentConfiguration
*/
private Boolean includeBody = true;
/**
+ * 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
+ */
+ private Boolean includeFolders = true;
+ /**
* The prefix which is used in the
* com.amazonaws.services.s3.model.ListObjectsRequest to only consume
* objects we are interested in.
@@ -335,6 +340,14 @@ public class AWS2S3ComponentConfiguration
this.includeBody = includeBody;
}
+ public Boolean getIncludeFolders() {
+ return includeFolders;
+ }
+
+ public void setIncludeFolders(Boolean includeFolders) {
+ this.includeFolders = includeFolders;
+ }
+
public String getPrefix() {
return prefix;
}
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 0391c60..f29dca1 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</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/components-starter/camel-spring-boot-starter/pom.xml
b/components-starter/camel-spring-boot-starter/pom.xml
index ef4dde9..a044dd9 100644
--- a/components-starter/camel-spring-boot-starter/pom.xml
+++ b/components-starter/camel-spring-boot-starter/pom.xml
@@ -48,6 +48,22 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
</dependency>
diff --git a/components-starter/camel-spring-cloud-consul-starter/pom.xml
b/components-starter/camel-spring-cloud-consul-starter/pom.xml
index 5df3ca4..6e257e9 100644
--- a/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-consul</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index fbba09a..beacbb0 100644
--- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-netflix</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-starter/pom.xml
b/components-starter/camel-spring-cloud-starter/pom.xml
index 0f4ff7d..35eb6a5 100644
--- a/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index 168d968..b29563b 100644
--- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-zookeeper</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</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 29287ec..c7cc11a 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 31 options, which are listed below.
+The component supports 32 options, which are listed below.
@@ -38,6 +38,7 @@ The component supports 31 options, which are listed below.
| *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
+| *camel.component.aws2-s3.include-folders* | 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 | Boolean
| *camel.component.aws2-s3.key-name* | Setting the key name for an element in
the bucket through endpoint parameter | | String
| *camel.component.aws2-s3.lazy-start-producer* | Whether the producer should
be started lazy (on the first message). By starting lazy you can use this to
allow CamelContext and routes to startup in situations where a producer may
otherwise fail during starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed th [...]
| *camel.component.aws2-s3.multi-part-upload* | If it is true, camel will
upload the file with multi part format, the part size is decided by the option
of partSize | false | Boolean
