This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a114512 Regen
a114512 is described below
commit a114512ede2919ef4a62e3ec241e128ecc8e3951
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Jun 16 06:50:21 2021 +0200
Regen
---
.../springboot/catalog/components/aws2-s3.json | 10 ++++++----
.../src/main/docs/aws2-s3-starter.adoc | 5 +++--
.../springboot/AWS2S3ComponentConfiguration.java | 22 ++++++++++++++++++----
docs/modules/ROOT/pages/aws2-s3-starter.adoc | 5 +++--
4 files changed, 30 insertions(+), 12 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 878ad60..736e377 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
@@ -47,7 +47,8 @@
"destinationBucketSuffix": { "kind": "property", "displayName":
"Destination Bucket Suffix", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 [...]
"doneFileName": { "kind": "property", "displayName": "Done File Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If provided, Camel will only consume files if
a done file exists." },
"fileName": { "kind": "property", "displayName": "File Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, the S3Object exchange will be
consumed and put into the body and closed. If false the S [...]
+ "ignoreBody": { "kind": "property", "displayName": "Ignore Body", "group":
"consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, the S3 Object Body will be
ignored completely, if it is set to false the S3 Object will [...]
+ "includeBody": { "kind": "property", "displayName": "Include Body",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, the S3Object exchange will be
consumed and put into the body and closed. If false the S [...]
"includeFolders": { "kind": "property", "displayName": "Include Folders",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": 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, [...]
"moveAfterRead": { "kind": "property", "displayName": "Move After Read",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Move objects from S3 bucket to a different
bucket after they have been retrieved. To accomplish [...]
"prefix": { "kind": "property", "displayName": "Prefix", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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." },
@@ -59,7 +60,7 @@
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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 star [...]
"multiPartUpload": { "kind": "property", "displayName": "Multi Part
Upload", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, camel will upload the file with
multi part format, the part size is decided b [...]
"namingStrategy": { "kind": "property", "displayName": "Naming Strategy",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.s3.stream.AWSS3NamingStrategyEnum", "enum": [
"progressive", "random" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "progressive", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "descript [...]
- "operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.s3.AWS2S3Operations", "enum": [
"copyObject", "listObjects", "deleteObject", "deleteBucket", "listBuckets",
"getObject", "getObjectRange" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
[...]
+ "operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.s3.AWS2S3Operations", "enum": [
"copyObject", "listObjects", "deleteObject", "deleteBucket", "listBuckets",
"getObject", "getObjectRange", "createDownloadLink" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", [...]
"partSize": { "kind": "property", "displayName": "Part Size", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 26214400, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Setup the partSize which is used in multi part
upload, the default size is 25M." },
"restartingPolicy": { "kind": "property", "displayName": "Restarting
Policy", "group": "producer", "label": "producer", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.s3.stream.AWSS3RestartingPolicyEnum", "enum":
[ "override", "lastPart" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "override", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "descri [...]
"storageClass": { "kind": "property", "displayName": "Storage Class",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "The storage class to set in the
com.amazonaws.services.s3.model.PutObjectRequest request." },
@@ -98,7 +99,8 @@
"destinationBucketSuffix": { "kind": "parameter", "displayName":
"Destination Bucket Suffix", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 [...]
"doneFileName": { "kind": "parameter", "displayName": "Done File Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If provided, Camel will only consume files if
a done file exists." },
"fileName": { "kind": "parameter", "displayName": "File Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, the S3Object exchange will be
consumed and put into the body and closed. If false the [...]
+ "ignoreBody": { "kind": "parameter", "displayName": "Ignore Body",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, the S3 Object Body will be
ignored completely, if it is set to false the S3 Object will [...]
+ "includeBody": { "kind": "parameter", "displayName": "Include Body",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, the S3Object exchange will be
consumed and put into the body and closed. If false the [...]
"includeFolders": { "kind": "parameter", "displayName": "Include Folders",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": 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, [...]
"maxConnections": { "kind": "parameter", "displayName": "Max Connections",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": 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, "autowired": 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 u [...]
@@ -116,7 +118,7 @@
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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 sta [...]
"multiPartUpload": { "kind": "parameter", "displayName": "Multi Part
Upload", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If it is true, camel will upload the file with
multi part format, the part size is decided [...]
"namingStrategy": { "kind": "parameter", "displayName": "Naming Strategy",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.s3.stream.AWSS3NamingStrategyEnum", "enum": [
"progressive", "random" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "progressive", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "descrip [...]
- "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.s3.AWS2S3Operations", "enum": [
"copyObject", "listObjects", "deleteObject", "deleteBucket", "listBuckets",
"getObject", "getObjectRange" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
[...]
+ "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.s3.AWS2S3Operations", "enum": [
"copyObject", "listObjects", "deleteObject", "deleteBucket", "listBuckets",
"getObject", "getObjectRange", "createDownloadLink" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", [...]
"partSize": { "kind": "parameter", "displayName": "Part Size", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 26214400, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Setup the partSize which is used in multi part
upload, the default size is 25M." },
"restartingPolicy": { "kind": "parameter", "displayName": "Restarting
Policy", "group": "producer", "label": "producer", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.s3.stream.AWSS3RestartingPolicyEnum", "enum":
[ "override", "lastPart" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "override", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "descr [...]
"storageClass": { "kind": "parameter", "displayName": "Storage Class",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "The storage class to set in the
com.amazonaws.services.s3.model.PutObjectRequest request." },
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 af0cf4e..a52b993 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 50 options, which are listed below.
+The component supports 51 options, which are listed below.
@@ -47,7 +47,8 @@ The component supports 50 options, which are listed below.
| *camel.component.aws2-s3.done-file-name* | If provided, Camel will only
consume files if a done file exists. | | 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 S3Object
exchange will be consumed and put into the body and closed. If false the
S3Object stream will be put raw into the body and the headers will be set with
the S3 object metadata. This option is strongly related to autocloseBody
option. In case of setting includeBody to true because the S3Object stream will
be consumed then it will also be closed in case of includeBody false then it
will be up to the caller to close the S [...]
+| *camel.component.aws2-s3.ignore-body* | If it is true, the S3 Object Body
will be ignored completely, if it is set to false the S3 Object will be put in
the body. Setting this to true, will override any behavior defined by
includeBody option. | false | Boolean
+| *camel.component.aws2-s3.include-body* | If it is true, the S3Object
exchange will be consumed and put into the body and closed. If false the
S3Object stream will be put raw into the body and the headers will be set with
the S3 object metadata. This option is strongly related to autocloseBody
option. In case of setting includeBody to true because the S3Object stream will
be consumed then it will also be closed, while in case of includeBody false
then it will be up to the caller to clos [...]
| *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 [...]
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 ae9df87..64ef378 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
@@ -175,15 +175,21 @@ public class AWS2S3ComponentConfiguration
*/
private String fileName;
/**
+ * If it is true, the S3 Object Body will be ignored completely, if it is
+ * set to false the S3 Object will be put in the body. Setting this to
true,
+ * will override any behavior defined by includeBody option.
+ */
+ private Boolean ignoreBody = false;
+ /**
* If it is true, the S3Object exchange will be consumed and put into the
* body and closed. If false the S3Object stream will be put raw into the
* body and the headers will be set with the S3 object metadata. This
option
* is strongly related to autocloseBody option. In case of setting
* includeBody to true because the S3Object stream will be consumed then it
- * will also be closed in case of includeBody false then it will be up to
- * the caller to close the S3Object stream. However setting autocloseBody
to
- * true when includeBody is false it will schedule to close the S3Object
- * stream automatically on exchange completion.
+ * will also be closed, while in case of includeBody false then it will be
+ * up to the caller to close the S3Object stream. However setting
+ * autocloseBody to true when includeBody is false it will schedule to
close
+ * the S3Object stream automatically on exchange completion.
*/
private Boolean includeBody = true;
/**
@@ -508,6 +514,14 @@ public class AWS2S3ComponentConfiguration
this.fileName = fileName;
}
+ public Boolean getIgnoreBody() {
+ return ignoreBody;
+ }
+
+ public void setIgnoreBody(Boolean ignoreBody) {
+ this.ignoreBody = ignoreBody;
+ }
+
public Boolean getIncludeBody() {
return includeBody;
}
diff --git a/docs/modules/ROOT/pages/aws2-s3-starter.adoc
b/docs/modules/ROOT/pages/aws2-s3-starter.adoc
index af0cf4e..a52b993 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 50 options, which are listed below.
+The component supports 51 options, which are listed below.
@@ -47,7 +47,8 @@ The component supports 50 options, which are listed below.
| *camel.component.aws2-s3.done-file-name* | If provided, Camel will only
consume files if a done file exists. | | 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 S3Object
exchange will be consumed and put into the body and closed. If false the
S3Object stream will be put raw into the body and the headers will be set with
the S3 object metadata. This option is strongly related to autocloseBody
option. In case of setting includeBody to true because the S3Object stream will
be consumed then it will also be closed in case of includeBody false then it
will be up to the caller to close the S [...]
+| *camel.component.aws2-s3.ignore-body* | If it is true, the S3 Object Body
will be ignored completely, if it is set to false the S3 Object will be put in
the body. Setting this to true, will override any behavior defined by
includeBody option. | false | Boolean
+| *camel.component.aws2-s3.include-body* | If it is true, the S3Object
exchange will be consumed and put into the body and closed. If false the
S3Object stream will be put raw into the body and the headers will be set with
the S3 object metadata. This option is strongly related to autocloseBody
option. In case of setting includeBody to true because the S3Object stream will
be consumed then it will also be closed, while in case of includeBody false
then it will be up to the caller to clos [...]
| *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 [...]
