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 d77244e [create-pull-request] automated change
d77244e is described below
commit d77244e6a8092da9ac420d595311dd3919d7abee
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Apr 7 00:56:47 2021 +0000
[create-pull-request] automated change
---
.../springboot/catalog/components/aws2-s3.json | 6 ++++--
.../src/main/docs/aws2-s3-starter.adoc | 5 +++--
.../springboot/AWS2S3ComponentConfiguration.java | 23 +++++++++++++++++-----
docs/modules/ROOT/pages/aws2-s3-starter.adoc | 5 +++--
4 files changed, 28 insertions(+), 11 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 421b164..6649822 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
@@ -62,7 +62,8 @@
"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":
[...]
"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." },
"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." },
- "streamMode": { "kind": "property", "displayName": "Stream Mode", "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": "When stream mode is true the upload to bucket
will be done in streaming" },
+ "streamingUploadMode": { "kind": "property", "displayName": "Streaming
Upload Mode", "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": "When stream mode is true the upload to bucket
will be done in streaming" },
+ "streamingUploadTimeout": { "kind": "property", "displayName": "Streaming
Upload Timeout", "group": "producer", "label": "producer", "required": false,
"type": "integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "While streaming upload mode is true, this
option set the timeout to complete upload" },
"awsKMSKeyId": { "kind": "property", "displayName": "Aws KMSKey Id",
"group": "producer (advanced)", "label": "producer,advanced", "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 id of KMS key to use in case KMS is
enabled" },
"useAwsKMS": { "kind": "property", "displayName": "Use Aws KMS", "group":
"producer (advanced)", "label": "producer,advanced", "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": "Define if KMS must be used or not" },
"useCustomerKey": { "kind": "property", "displayName": "Use Customer Key",
"group": "producer (advanced)", "label": "producer,advanced", "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": "Define if Customer Key
must be used or not" },
@@ -117,7 +118,8 @@
"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":
[...]
"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." },
"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." },
- "streamMode": { "kind": "parameter", "displayName": "Stream Mode",
"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": "When stream mode is true the upload to bucket
will be done in streaming" },
+ "streamingUploadMode": { "kind": "parameter", "displayName": "Streaming
Upload Mode", "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": "When stream mode is true the upload to bucket
will be done in streaming" },
+ "streamingUploadTimeout": { "kind": "parameter", "displayName": "Streaming
Upload Timeout", "group": "producer", "label": "producer", "required": false,
"type": "integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "While streaming upload mode is true, this
option set the timeout to complete upload" },
"awsKMSKeyId": { "kind": "parameter", "displayName": "Aws KMSKey Id",
"group": "producer (advanced)", "label": "producer,advanced", "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 id of KMS key to use in case KMS is
enabled" },
"useAwsKMS": { "kind": "parameter", "displayName": "Use Aws KMS", "group":
"producer (advanced)", "label": "producer,advanced", "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": "Define if KMS must be used or not" },
"useCustomerKey": { "kind": "parameter", "displayName": "Use Customer
Key", "group": "producer (advanced)", "label": "producer,advanced", "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": "Define if Customer Key
must be used or not" },
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 d6baed5..005b018 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 48 options, which are listed below.
+The component supports 49 options, which are listed below.
@@ -66,7 +66,8 @@ The component supports 48 options, which are listed below.
| *camel.component.aws2-s3.region* | The region in which S3 client needs to
work. When using this parameter, the configuration will expect the lowercase
name of the region (for example ap-east-1) You'll need to use the name
Region.EU_WEST_1.id() | | String
| *camel.component.aws2-s3.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-s3.storage-class* | The storage class to set in the
com.amazonaws.services.s3.model.PutObjectRequest request. | | String
-| *camel.component.aws2-s3.stream-mode* | When stream mode is true the upload
to bucket will be done in streaming | false | Boolean
+| *camel.component.aws2-s3.streaming-upload-mode* | When stream mode is true
the upload to bucket will be done in streaming | false | Boolean
+| *camel.component.aws2-s3.streaming-upload-timeout* | While streaming upload
mode is true, this option set the timeout to complete upload | | Long
| *camel.component.aws2-s3.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
| *camel.component.aws2-s3.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
| *camel.component.aws2-s3.use-aws-k-m-s* | Define if KMS must be used or not
| 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 0767d65..05dd43d 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
@@ -266,7 +266,12 @@ public class AWS2S3ComponentConfiguration
/**
* When stream mode is true the upload to bucket will be done in streaming
*/
- private Boolean streamMode = false;
+ private Boolean streamingUploadMode = false;
+ /**
+ * While streaming upload mode is true, this option set the timeout to
+ * complete upload
+ */
+ private Long streamingUploadTimeout;
/**
* Define the id of KMS key to use in case KMS is enabled
*/
@@ -618,12 +623,20 @@ public class AWS2S3ComponentConfiguration
this.storageClass = storageClass;
}
- public Boolean getStreamMode() {
- return streamMode;
+ public Boolean getStreamingUploadMode() {
+ return streamingUploadMode;
+ }
+
+ public void setStreamingUploadMode(Boolean streamingUploadMode) {
+ this.streamingUploadMode = streamingUploadMode;
+ }
+
+ public Long getStreamingUploadTimeout() {
+ return streamingUploadTimeout;
}
- public void setStreamMode(Boolean streamMode) {
- this.streamMode = streamMode;
+ public void setStreamingUploadTimeout(Long streamingUploadTimeout) {
+ this.streamingUploadTimeout = streamingUploadTimeout;
}
public String getAwsKMSKeyId() {
diff --git a/docs/modules/ROOT/pages/aws2-s3-starter.adoc
b/docs/modules/ROOT/pages/aws2-s3-starter.adoc
index d6baed5..005b018 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 48 options, which are listed below.
+The component supports 49 options, which are listed below.
@@ -66,7 +66,8 @@ The component supports 48 options, which are listed below.
| *camel.component.aws2-s3.region* | The region in which S3 client needs to
work. When using this parameter, the configuration will expect the lowercase
name of the region (for example ap-east-1) You'll need to use the name
Region.EU_WEST_1.id() | | String
| *camel.component.aws2-s3.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-s3.storage-class* | The storage class to set in the
com.amazonaws.services.s3.model.PutObjectRequest request. | | String
-| *camel.component.aws2-s3.stream-mode* | When stream mode is true the upload
to bucket will be done in streaming | false | Boolean
+| *camel.component.aws2-s3.streaming-upload-mode* | When stream mode is true
the upload to bucket will be done in streaming | false | Boolean
+| *camel.component.aws2-s3.streaming-upload-timeout* | While streaming upload
mode is true, this option set the timeout to complete upload | | Long
| *camel.component.aws2-s3.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
| *camel.component.aws2-s3.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
| *camel.component.aws2-s3.use-aws-k-m-s* | Define if KMS must be used or not
| false | Boolean
