You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/07/20 05:34:23 UTC
[camel] branch master updated (55dc964 -> 8b2e2e8)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 55dc964 Upgrade Jooq to version 3.13.3
new 3f90de9 CAMEL-15292 - CAMEL-AWS2-S3 - Support SSE-C on the consumer's side
new 17cddff Camel-AWS2-S3: Fixed CS
new 35d73c0 CAMEL-15292 - CAMEL-AWS2-S3 - Support SSE-C on the consumer's side, updated docs
new 352755d CAMEL-15292 - Regen autogenerated docs
new 8b2e2e8 Regen docs
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/aws2/s3/aws2-s3.json | 12 +--
.../src/main/docs/aws2-s3-component.adoc | 12 +--
.../component/aws2/s3/AWS2S3Configuration.java | 6 +-
.../camel/component/aws2/s3/AWS2S3Consumer.java | 15 ++-
.../dsl/Aws2S3ComponentBuilderFactory.java | 78 ++++++++--------
.../builder/endpoint/StaticEndpointBuilders.java | 8 +-
.../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 101 ++++++++++++++++++---
.../modules/ROOT/pages/aws2-s3-component.adoc | 12 +--
8 files changed, 164 insertions(+), 80 deletions(-)
[camel] 05/05: Regen docs
Posted by ac...@apache.org.
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.git
commit 8b2e2e8aa1ede8e175c39bba39fc9dcba62eaac9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 20 07:34:02 2020 +0200
Regen docs
---
docs/components/modules/ROOT/pages/aws2-s3-component.adoc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-s3-component.adoc b/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
index 5d7d04b..a16f1cb 100644
--- a/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-s3-component.adoc
@@ -68,6 +68,9 @@ The AWS 2 S3 Storage Service component supports 39 options, which are listed bel
| *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
| *uriEndpointOverride* (common) | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | | String
| *useIAMCredentials* (common) | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | boolean
+| *customerAlgorithm* (common) | Define the customer algorithm to use in case CustomerKey is enabled | | String
+| *customerKeyId* (common) | Define the id of Customer key to use in case CustomerKey is enabled | | String
+| *customerKeyMD5* (common) | Define the MD5 of Customer key to use in case CustomerKey is enabled | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *deleteAfterRead* (consumer) | 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 the AWS2S3C [...]
| *delimiter* (consumer) | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | | String
@@ -86,9 +89,6 @@ The AWS 2 S3 Storage Service component supports 39 options, which are listed bel
| *partSize* (producer) | Setup the partSize which is used in multi part upload, the default size is 25M. | 26214400 | long
| *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. | | String
| *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled | | String
-| *customerAlgorithm* (producer) | Define the customer algorithm to use in case CustomerKey is enabled | | String
-| *customerKeyId* (producer) | Define the id of Customer key to use in case CustomerKey is enabled | | String
-| *customerKeyMD5* (producer) | Define the MD5 of Customer key to use in case CustomerKey is enabled | | String
| *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
| *useCustomerKey* (producer) | Define if Customer Key must be used or not | false | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
@@ -144,6 +144,9 @@ with the following path and query parameters:
| *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
| *uriEndpointOverride* (common) | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | | String
| *useIAMCredentials* (common) | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | boolean
+| *customerAlgorithm* (common) | Define the customer algorithm to use in case CustomerKey is enabled | | String
+| *customerKeyId* (common) | Define the id of Customer key to use in case CustomerKey is enabled | | String
+| *customerKeyMD5* (common) | Define the MD5 of Customer key to use in case CustomerKey is enabled | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *deleteAfterRead* (consumer) | 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 the AWS2S3C [...]
| *delimiter* (consumer) | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | | String
@@ -168,9 +171,6 @@ with the following path and query parameters:
| *partSize* (producer) | Setup the partSize which is used in multi part upload, the default size is 25M. | 26214400 | long
| *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. | | String
| *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled | | String
-| *customerAlgorithm* (producer) | Define the customer algorithm to use in case CustomerKey is enabled | | String
-| *customerKeyId* (producer) | Define the id of Customer key to use in case CustomerKey is enabled | | String
-| *customerKeyMD5* (producer) | Define the MD5 of Customer key to use in case CustomerKey is enabled | | String
| *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
| *useCustomerKey* (producer) | Define if Customer Key must be used or not | false | boolean
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
[camel] 02/05: Camel-AWS2-S3: Fixed CS
Posted by ac...@apache.org.
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.git
commit 17cddffa273fa8305b3fcaa5c12f0af70681f395
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 20 07:30:35 2020 +0200
Camel-AWS2-S3: Fixed CS
---
.../org/apache/camel/component/aws2/s3/AWS2S3Consumer.java | 10 +++++-----
.../apache/camel/builder/endpoint/StaticEndpointBuilders.java | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
index 445ab93..acc6eab 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
@@ -130,19 +130,19 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
Queue<Exchange> answer = new LinkedList<>();
try {
for (S3Object s3ObjectSummary : s3ObjectSummaries) {
- Builder getRequest = GetObjectRequest.builder().bucket(getConfiguration().getBucketName()).key(s3ObjectSummary.key());
+ Builder getRequest = GetObjectRequest.builder().bucket(getConfiguration().getBucketName()).key(s3ObjectSummary.key());
if (getConfiguration().isUseCustomerKey()) {
if (ObjectHelper.isNotEmpty(getConfiguration().getCustomerKeyId())) {
- getRequest.sseCustomerKey(getConfiguration().getCustomerKeyId());
+ getRequest.sseCustomerKey(getConfiguration().getCustomerKeyId());
}
if (ObjectHelper.isNotEmpty(getConfiguration().getCustomerKeyMD5())) {
- getRequest.sseCustomerKeyMD5(getConfiguration().getCustomerKeyMD5());
+ getRequest.sseCustomerKeyMD5(getConfiguration().getCustomerKeyMD5());
}
if (ObjectHelper.isNotEmpty(getConfiguration().getCustomerAlgorithm())) {
- getRequest.sseCustomerAlgorithm(getConfiguration().getCustomerAlgorithm());
+ getRequest.sseCustomerAlgorithm(getConfiguration().getCustomerAlgorithm());
}
}
- ResponseInputStream<GetObjectResponse> s3Object = getAmazonS3Client()
+ ResponseInputStream<GetObjectResponse> s3Object = getAmazonS3Client()
.getObject(getRequest.build(), ResponseTransformer.toInputStream());
if (includeS3Object(s3Object)) {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 4bc4162..5031310 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -1417,7 +1417,7 @@ public class StaticEndpointBuilders {
*
* @param path //bucketNameOrArn
*/
- public static org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory.AWS2S3EndpointBuilder aws2S3(
+ static org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory.AWS2S3EndpointBuilder aws2S3(
String path) {
return org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory.endpointBuilder("aws2-s3", path);
}
@@ -1439,7 +1439,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path //bucketNameOrArn
*/
- public static org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory.AWS2S3EndpointBuilder aws2S3(
+ static org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory.AWS2S3EndpointBuilder aws2S3(
String componentName,
String path) {
return org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory.endpointBuilder(componentName, path);
@@ -8354,7 +8354,7 @@ public class StaticEndpointBuilders {
*
* @param path entityType
*/
- static org.apache.camel.builder.endpoint.dsl.JooqEndpointBuilderFactory.JooqEndpointBuilder jooq(
+ public static org.apache.camel.builder.endpoint.dsl.JooqEndpointBuilderFactory.JooqEndpointBuilder jooq(
String path) {
return org.apache.camel.builder.endpoint.dsl.JooqEndpointBuilderFactory.endpointBuilder("jooq", path);
}
@@ -8375,7 +8375,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path entityType
*/
- static org.apache.camel.builder.endpoint.dsl.JooqEndpointBuilderFactory.JooqEndpointBuilder jooq(
+ public static org.apache.camel.builder.endpoint.dsl.JooqEndpointBuilderFactory.JooqEndpointBuilder jooq(
String componentName,
String path) {
return org.apache.camel.builder.endpoint.dsl.JooqEndpointBuilderFactory.endpointBuilder(componentName, path);
[camel] 04/05: CAMEL-15292 - Regen autogenerated docs
Posted by ac...@apache.org.
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.git
commit 352755d42d57d7f1b74dbd4a78fa462fe43e2472
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 20 07:32:00 2020 +0200
CAMEL-15292 - Regen autogenerated docs
---
.../apache/camel/component/aws2/s3/aws2-s3.json | 12 +--
.../src/main/docs/aws2-s3-component.adoc | 12 +--
.../dsl/Aws2S3ComponentBuilderFactory.java | 78 ++++++++--------
.../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 101 ++++++++++++++++++---
4 files changed, 137 insertions(+), 66 deletions(-)
diff --git a/components/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json b/components/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
index 39d4ceb..acfa6d0 100644
--- a/components/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
+++ b/components/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
@@ -34,6 +34,9 @@
"trustAllCertificates": { "kind": "property", "displayName": "Trust All Certificates", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" },
"uriEndpointOverride": { "kind": "property", "displayName": "Uri Endpoint Override", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option" },
"useIAMCredentials": { "kind": "property", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be [...]
+ "customerAlgorithm": { "kind": "property", "displayName": "Customer Algorithm", "group": "common (advanced)", "label": "common,advanced", "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 customer algorithm to use in case CustomerKey is enabled" },
+ "customerKeyId": { "kind": "property", "displayName": "Customer Key Id", "group": "common (advanced)", "label": "common,advanced", "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 id of Customer key to use in case CustomerKey is enabled" },
+ "customerKeyMD5": { "kind": "property", "displayName": "Customer Key MD5", "group": "common (advanced)", "label": "common,advanced", "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 MD5 of Customer key to use in case CustomerKey is enabled" },
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...]
"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." },
@@ -52,9 +55,6 @@
"partSize": { "kind": "property", "displayName": "Part Size", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": 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, "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." },
"awsKMSKeyId": { "kind": "property", "displayName": "Aws KMSKey Id", "group": "producer (advanced)", "label": "producer,advanced", "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 id of KMS key to use in case KMS is enabled" },
- "customerAlgorithm": { "kind": "property", "displayName": "Customer Algorithm", "group": "producer (advanced)", "label": "producer,advanced", "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 customer algorithm to use in case CustomerKey is enabled" },
- "customerKeyId": { "kind": "property", "displayName": "Customer Key Id", "group": "producer (advanced)", "label": "producer,advanced", "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 id of Customer key to use in case CustomerKey is enabled" },
- "customerKeyMD5": { "kind": "property", "displayName": "Customer Key MD5", "group": "producer (advanced)", "label": "producer,advanced", "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 MD5 of Customer key to use in case CustomerKey is enabled" },
"useAwsKMS": { "kind": "property", "displayName": "Use Aws KMS", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Define if Customer Key must be used or not" },
"basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
@@ -75,6 +75,9 @@
"trustAllCertificates": { "kind": "parameter", "displayName": "Trust All Certificates", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" },
"uriEndpointOverride": { "kind": "parameter", "displayName": "Uri Endpoint Override", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option" },
"useIAMCredentials": { "kind": "parameter", "displayName": "Use IAMCredentials", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be [...]
+ "customerAlgorithm": { "kind": "parameter", "displayName": "Customer Algorithm", "group": "common (advanced)", "label": "common,advanced", "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 customer algorithm to use in case CustomerKey is enabled" },
+ "customerKeyId": { "kind": "parameter", "displayName": "Customer Key Id", "group": "common (advanced)", "label": "common,advanced", "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 id of Customer key to use in case CustomerKey is enabled" },
+ "customerKeyMD5": { "kind": "parameter", "displayName": "Customer Key MD5", "group": "common (advanced)", "label": "common,advanced", "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 MD5 of Customer key to use in case CustomerKey is enabled" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...]
"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." },
@@ -99,9 +102,6 @@
"partSize": { "kind": "parameter", "displayName": "Part Size", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": 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, "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." },
"awsKMSKeyId": { "kind": "parameter", "displayName": "Aws KMSKey Id", "group": "producer (advanced)", "label": "producer,advanced", "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 id of KMS key to use in case KMS is enabled" },
- "customerAlgorithm": { "kind": "parameter", "displayName": "Customer Algorithm", "group": "producer (advanced)", "label": "producer,advanced", "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 customer algorithm to use in case CustomerKey is enabled" },
- "customerKeyId": { "kind": "parameter", "displayName": "Customer Key Id", "group": "producer (advanced)", "label": "producer,advanced", "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 id of Customer key to use in case CustomerKey is enabled" },
- "customerKeyMD5": { "kind": "parameter", "displayName": "Customer Key MD5", "group": "producer (advanced)", "label": "producer,advanced", "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 MD5 of Customer key to use in case CustomerKey is enabled" },
"useAwsKMS": { "kind": "parameter", "displayName": "Use Aws KMS", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField": "configuration", "description": "Define if Customer Key must be used or not" },
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
diff --git a/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc b/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
index e055890..b873ea0 100644
--- a/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
+++ b/components/camel-aws2-s3/src/main/docs/aws2-s3-component.adoc
@@ -66,6 +66,9 @@ The AWS 2 S3 Storage Service component supports 39 options, which are listed bel
| *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
| *uriEndpointOverride* (common) | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | | String
| *useIAMCredentials* (common) | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | boolean
+| *customerAlgorithm* (common) | Define the customer algorithm to use in case CustomerKey is enabled | | String
+| *customerKeyId* (common) | Define the id of Customer key to use in case CustomerKey is enabled | | String
+| *customerKeyMD5* (common) | Define the MD5 of Customer key to use in case CustomerKey is enabled | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *deleteAfterRead* (consumer) | 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 the AWS2S3C [...]
| *delimiter* (consumer) | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | | String
@@ -84,9 +87,6 @@ The AWS 2 S3 Storage Service component supports 39 options, which are listed bel
| *partSize* (producer) | Setup the partSize which is used in multi part upload, the default size is 25M. | 26214400 | long
| *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. | | String
| *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled | | String
-| *customerAlgorithm* (producer) | Define the customer algorithm to use in case CustomerKey is enabled | | String
-| *customerKeyId* (producer) | Define the id of Customer key to use in case CustomerKey is enabled | | String
-| *customerKeyMD5* (producer) | Define the MD5 of Customer key to use in case CustomerKey is enabled | | String
| *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
| *useCustomerKey* (producer) | Define if Customer Key must be used or not | false | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
@@ -142,6 +142,9 @@ with the following path and query parameters:
| *trustAllCertificates* (common) | If we want to trust all certificates in case of overriding the endpoint | false | boolean
| *uriEndpointOverride* (common) | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | | String
| *useIAMCredentials* (common) | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | boolean
+| *customerAlgorithm* (common) | Define the customer algorithm to use in case CustomerKey is enabled | | String
+| *customerKeyId* (common) | Define the id of Customer key to use in case CustomerKey is enabled | | String
+| *customerKeyMD5* (common) | Define the MD5 of Customer key to use in case CustomerKey is enabled | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *deleteAfterRead* (consumer) | 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 the AWS2S3C [...]
| *delimiter* (consumer) | The delimiter which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. | | String
@@ -166,9 +169,6 @@ with the following path and query parameters:
| *partSize* (producer) | Setup the partSize which is used in multi part upload, the default size is 25M. | 26214400 | long
| *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. | | String
| *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled | | String
-| *customerAlgorithm* (producer) | Define the customer algorithm to use in case CustomerKey is enabled | | String
-| *customerKeyId* (producer) | Define the id of Customer key to use in case CustomerKey is enabled | | String
-| *customerKeyMD5* (producer) | Define the MD5 of Customer key to use in case CustomerKey is enabled | | String
| *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
| *useCustomerKey* (producer) | Define if Customer Key must be used or not | false | boolean
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
index 1698df0..a7daa69 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
@@ -218,6 +218,42 @@ public interface Aws2S3ComponentBuilderFactory {
return this;
}
/**
+ * Define the customer algorithm to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default Aws2S3ComponentBuilder customerAlgorithm(
+ java.lang.String customerAlgorithm) {
+ doSetProperty("customerAlgorithm", customerAlgorithm);
+ return this;
+ }
+ /**
+ * Define the id of Customer key to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default Aws2S3ComponentBuilder customerKeyId(
+ java.lang.String customerKeyId) {
+ doSetProperty("customerKeyId", customerKeyId);
+ return this;
+ }
+ /**
+ * Define the MD5 of Customer key to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default Aws2S3ComponentBuilder customerKeyMD5(
+ java.lang.String customerKeyMD5) {
+ doSetProperty("customerKeyMD5", customerKeyMD5);
+ return this;
+ }
+ /**
* Allows for bridging the consumer to the Camel routing Error Handler,
* which mean any exceptions occurred while the consumer is trying to
* pickup incoming messages, or the likes, will now be processed as a
@@ -480,42 +516,6 @@ public interface Aws2S3ComponentBuilderFactory {
return this;
}
/**
- * Define the customer algorithm to use in case CustomerKey is enabled.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: producer (advanced)
- */
- default Aws2S3ComponentBuilder customerAlgorithm(
- java.lang.String customerAlgorithm) {
- doSetProperty("customerAlgorithm", customerAlgorithm);
- return this;
- }
- /**
- * Define the id of Customer key to use in case CustomerKey is enabled.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: producer (advanced)
- */
- default Aws2S3ComponentBuilder customerKeyId(
- java.lang.String customerKeyId) {
- doSetProperty("customerKeyId", customerKeyId);
- return this;
- }
- /**
- * Define the MD5 of Customer key to use in case CustomerKey is enabled.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: producer (advanced)
- */
- default Aws2S3ComponentBuilder customerKeyMD5(
- java.lang.String customerKeyMD5) {
- doSetProperty("customerKeyMD5", customerKeyMD5);
- return this;
- }
- /**
* Define if KMS must be used or not.
*
* The option is a: <code>boolean</code> type.
@@ -612,6 +612,9 @@ public interface Aws2S3ComponentBuilderFactory {
case "trustAllCertificates": getOrCreateConfiguration((AWS2S3Component) component).setTrustAllCertificates((boolean) value); return true;
case "uriEndpointOverride": getOrCreateConfiguration((AWS2S3Component) component).setUriEndpointOverride((java.lang.String) value); return true;
case "useIAMCredentials": getOrCreateConfiguration((AWS2S3Component) component).setUseIAMCredentials((boolean) value); return true;
+ case "customerAlgorithm": getOrCreateConfiguration((AWS2S3Component) component).setCustomerAlgorithm((java.lang.String) value); return true;
+ case "customerKeyId": getOrCreateConfiguration((AWS2S3Component) component).setCustomerKeyId((java.lang.String) value); return true;
+ case "customerKeyMD5": getOrCreateConfiguration((AWS2S3Component) component).setCustomerKeyMD5((java.lang.String) value); return true;
case "bridgeErrorHandler": ((AWS2S3Component) component).setBridgeErrorHandler((boolean) value); return true;
case "deleteAfterRead": getOrCreateConfiguration((AWS2S3Component) component).setDeleteAfterRead((boolean) value); return true;
case "delimiter": getOrCreateConfiguration((AWS2S3Component) component).setDelimiter((java.lang.String) value); return true;
@@ -630,9 +633,6 @@ public interface Aws2S3ComponentBuilderFactory {
case "partSize": getOrCreateConfiguration((AWS2S3Component) component).setPartSize((long) value); return true;
case "storageClass": getOrCreateConfiguration((AWS2S3Component) component).setStorageClass((java.lang.String) value); return true;
case "awsKMSKeyId": getOrCreateConfiguration((AWS2S3Component) component).setAwsKMSKeyId((java.lang.String) value); return true;
- case "customerAlgorithm": getOrCreateConfiguration((AWS2S3Component) component).setCustomerAlgorithm((java.lang.String) value); return true;
- case "customerKeyId": getOrCreateConfiguration((AWS2S3Component) component).setCustomerKeyId((java.lang.String) value); return true;
- case "customerKeyMD5": getOrCreateConfiguration((AWS2S3Component) component).setCustomerKeyMD5((java.lang.String) value); return true;
case "useAwsKMS": getOrCreateConfiguration((AWS2S3Component) component).setUseAwsKMS((boolean) value); return true;
case "useCustomerKey": getOrCreateConfiguration((AWS2S3Component) component).setUseCustomerKey((boolean) value); return true;
case "basicPropertyBinding": ((AWS2S3Component) component).setBasicPropertyBinding((boolean) value); return true;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
index 7ca9958..041f9ad 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
@@ -1027,6 +1027,42 @@ public interface AWS2S3EndpointBuilderFactory {
return (AWS2S3EndpointConsumerBuilder) this;
}
/**
+ * Define the customer algorithm to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default AdvancedAWS2S3EndpointConsumerBuilder customerAlgorithm(
+ String customerAlgorithm) {
+ doSetProperty("customerAlgorithm", customerAlgorithm);
+ return this;
+ }
+ /**
+ * Define the id of Customer key to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default AdvancedAWS2S3EndpointConsumerBuilder customerKeyId(
+ String customerKeyId) {
+ doSetProperty("customerKeyId", customerKeyId);
+ return this;
+ }
+ /**
+ * Define the MD5 of Customer key to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default AdvancedAWS2S3EndpointConsumerBuilder customerKeyMD5(
+ String customerKeyMD5) {
+ doSetProperty("customerKeyMD5", customerKeyMD5);
+ return this;
+ }
+ /**
* If this option is true and includeBody is true, then the
* S3Object.close() method will be called on exchange completion. This
* option is strongly related to includeBody option. In case of setting
@@ -1687,23 +1723,11 @@ public interface AWS2S3EndpointBuilderFactory {
return (AWS2S3EndpointProducerBuilder) this;
}
/**
- * Define the id of KMS key to use in case KMS is enabled.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: producer (advanced)
- */
- default AdvancedAWS2S3EndpointProducerBuilder awsKMSKeyId(
- String awsKMSKeyId) {
- doSetProperty("awsKMSKeyId", awsKMSKeyId);
- return this;
- }
- /**
* Define the customer algorithm to use in case CustomerKey is enabled.
*
* The option is a: <code>java.lang.String</code> type.
*
- * Group: producer (advanced)
+ * Group: common (advanced)
*/
default AdvancedAWS2S3EndpointProducerBuilder customerAlgorithm(
String customerAlgorithm) {
@@ -1715,7 +1739,7 @@ public interface AWS2S3EndpointBuilderFactory {
*
* The option is a: <code>java.lang.String</code> type.
*
- * Group: producer (advanced)
+ * Group: common (advanced)
*/
default AdvancedAWS2S3EndpointProducerBuilder customerKeyId(
String customerKeyId) {
@@ -1727,7 +1751,7 @@ public interface AWS2S3EndpointBuilderFactory {
*
* The option is a: <code>java.lang.String</code> type.
*
- * Group: producer (advanced)
+ * Group: common (advanced)
*/
default AdvancedAWS2S3EndpointProducerBuilder customerKeyMD5(
String customerKeyMD5) {
@@ -1735,6 +1759,18 @@ public interface AWS2S3EndpointBuilderFactory {
return this;
}
/**
+ * Define the id of KMS key to use in case KMS is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: producer (advanced)
+ */
+ default AdvancedAWS2S3EndpointProducerBuilder awsKMSKeyId(
+ String awsKMSKeyId) {
+ doSetProperty("awsKMSKeyId", awsKMSKeyId);
+ return this;
+ }
+ /**
* Define if KMS must be used or not.
*
* The option is a: <code>boolean</code> type.
@@ -2140,6 +2176,41 @@ public interface AWS2S3EndpointBuilderFactory {
return (AWS2S3EndpointBuilder) this;
}
/**
+ * Define the customer algorithm to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default AdvancedAWS2S3EndpointBuilder customerAlgorithm(
+ String customerAlgorithm) {
+ doSetProperty("customerAlgorithm", customerAlgorithm);
+ return this;
+ }
+ /**
+ * Define the id of Customer key to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default AdvancedAWS2S3EndpointBuilder customerKeyId(String customerKeyId) {
+ doSetProperty("customerKeyId", customerKeyId);
+ return this;
+ }
+ /**
+ * Define the MD5 of Customer key to use in case CustomerKey is enabled.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: common (advanced)
+ */
+ default AdvancedAWS2S3EndpointBuilder customerKeyMD5(
+ String customerKeyMD5) {
+ doSetProperty("customerKeyMD5", customerKeyMD5);
+ return this;
+ }
+ /**
* Whether the endpoint should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities.
*
[camel] 03/05: CAMEL-15292 - CAMEL-AWS2-S3 - Support SSE-C on the
consumer's side, updated docs
Posted by ac...@apache.org.
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.git
commit 35d73c0768b4d3adc3c5b6759dbfdc5175aa80b4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 20 07:31:38 2020 +0200
CAMEL-15292 - CAMEL-AWS2-S3 - Support SSE-C on the consumer's side, updated docs
---
.../org/apache/camel/component/aws2/s3/AWS2S3Configuration.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
index f04ed12..b16d35a 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
@@ -79,11 +79,11 @@ public class AWS2S3Configuration implements Cloneable {
private String awsKMSKeyId;
@UriParam(label = "producer,advanced", defaultValue = "false")
private boolean useCustomerKey;
- @UriParam(label = "producer,advanced")
+ @UriParam(label = "common,advanced")
private String customerKeyId;
- @UriParam(label = "producer,advanced")
+ @UriParam(label = "common,advanced")
private String customerKeyMD5;
- @UriParam(label = "producer,advanced")
+ @UriParam(label = "common,advanced")
private String customerAlgorithm;
@UriParam(defaultValue = "false")
private boolean useIAMCredentials;
[camel] 01/05: CAMEL-15292 - CAMEL-AWS2-S3 - Support SSE-C on the
consumer's side
Posted by ac...@apache.org.
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.git
commit 3f90de93b041fbe3bd1282dfd303a57b16c16123
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 20 07:26:23 2020 +0200
CAMEL-15292 - CAMEL-AWS2-S3 - Support SSE-C on the consumer's side
---
.../apache/camel/component/aws2/s3/AWS2S3Consumer.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
index b99fe70..445ab93 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
@@ -42,6 +42,7 @@ import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest.Builder;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
@@ -129,8 +130,20 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer {
Queue<Exchange> answer = new LinkedList<>();
try {
for (S3Object s3ObjectSummary : s3ObjectSummaries) {
- ResponseInputStream<GetObjectResponse> s3Object = getAmazonS3Client()
- .getObject(GetObjectRequest.builder().bucket(getConfiguration().getBucketName()).key(s3ObjectSummary.key()).build(), ResponseTransformer.toInputStream());
+ Builder getRequest = GetObjectRequest.builder().bucket(getConfiguration().getBucketName()).key(s3ObjectSummary.key());
+ if (getConfiguration().isUseCustomerKey()) {
+ if (ObjectHelper.isNotEmpty(getConfiguration().getCustomerKeyId())) {
+ getRequest.sseCustomerKey(getConfiguration().getCustomerKeyId());
+ }
+ if (ObjectHelper.isNotEmpty(getConfiguration().getCustomerKeyMD5())) {
+ getRequest.sseCustomerKeyMD5(getConfiguration().getCustomerKeyMD5());
+ }
+ if (ObjectHelper.isNotEmpty(getConfiguration().getCustomerAlgorithm())) {
+ getRequest.sseCustomerAlgorithm(getConfiguration().getCustomerAlgorithm());
+ }
+ }
+ ResponseInputStream<GetObjectResponse> s3Object = getAmazonS3Client()
+ .getObject(getRequest.build(), ResponseTransformer.toInputStream());
if (includeS3Object(s3Object)) {
s3Objects.add(s3Object);