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 d579e70 [create-pull-request] automated change
d579e70 is described below
commit d579e705f43093be292582c2e6a5355b75843eba
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Apr 18 00:34:30 2020 +0000
[create-pull-request] automated change
---
.../springboot/catalog/components/aws2-s3.json | 8 ++++
.../springboot/catalog/components/azure-blob.json | 2 +
.../springboot/catalog/components/azure-queue.json | 2 +
.../src/main/docs/aws2-s3-starter.adoc | 6 ++-
.../springboot/AWS2S3ComponentConfiguration.java | 48 ++++++++++++++++++++++
.../src/main/docs/azure-starter.adoc | 4 +-
.../BlobServiceComponentConfiguration.java | 12 ++++++
.../QueueServiceComponentConfiguration.java | 12 ++++++
components-starter/camel-corda-starter/pom.xml | 12 ------
.../camel-spring-boot-starter/pom.xml | 16 --------
.../camel-spring-cloud-consul-starter/pom.xml | 20 ---------
.../camel-spring-cloud-netflix-starter/pom.xml | 20 ---------
.../camel-spring-cloud-starter/pom.xml | 20 ---------
.../camel-spring-cloud-zookeeper-starter/pom.xml | 20 ---------
docs/modules/ROOT/pages/aws2-s3-starter.adoc | 6 ++-
docs/modules/ROOT/pages/azure-starter.adoc | 4 +-
16 files changed, 100 insertions(+), 112 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 afdeef9..9e32b7c 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
@@ -51,7 +51,11 @@
"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" },
"accessKey": { "kind": "property", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "property", "displayName": "Secret Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" }
@@ -93,7 +97,11 @@
"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" },
"synchronous": { "kind": "parameter", "displayName": "Synchronous",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"false", "description": "Sets whether synchronous processing should be strictly
used, or Camel is allowed to use asynchronous processing (if supported)." },
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff
Error Threshold", "group": "scheduler", "label": "consumer,scheduler",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"secret": false, "description": "The number of subsequent error polls (failed
due some error) that should happen before the backoffMultipler should kick-in."
},
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-blob.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-blob.json
index 0ba497f..2982532 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-blob.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-blob.json
@@ -30,6 +30,7 @@
"fileDir": { "kind": "property", "displayName": "File Dir", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Set the file directory
where the downloaded blobs will be saved to" },
"publicForRead": { "kind": "property", "displayName": "Public For Read",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Storage resources can be
public for reading their content, if this property is enabled then the
credentials do not hav [...]
"streamReadSize": { "kind": "property", "displayName": "Stream Read Size",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Set the minimum read
size in bytes when reading the blob content" },
+ "validateClientURI": { "kind": "property", "displayName": "Validate Client
URI", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Whether to validate the
Azure client URI" },
"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 [...]
"blobMetadata": { "kind": "property", "displayName": "Blob Metadata",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Set the blob meta-data"
},
"blobPrefix": { "kind": "property", "displayName": "Blob Prefix", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Set a prefix which can
be used for listing the blobs" },
@@ -54,6 +55,7 @@
"fileDir": { "kind": "parameter", "displayName": "File Dir", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Set the file directory
where the downloaded blobs will be saved to" },
"publicForRead": { "kind": "parameter", "displayName": "Public For Read",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Storage resources can be
public for reading their content, if this property is enabled then the
credentials do not ha [...]
"streamReadSize": { "kind": "parameter", "displayName": "Stream Read
Size", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Set the minimum read
size in bytes when reading the blob content" },
+ "validateClientURI": { "kind": "parameter", "displayName": "Validate
Client URI", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.azure.blob.BlobServiceConfiguration",
"configurationField": "configuration", "description": "Whether to validate the
Azure client URI" },
"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 [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "To let the consumer use a
custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled
then this option is not in use. By default the consumer will deal with [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-queue.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-queue.json
index 1877dfa..ae9bd60 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-queue.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-queue.json
@@ -23,6 +23,7 @@
"componentProperties": {
"azureQueueClient": { "kind": "property", "displayName": "Azure Queue
Client", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.microsoft.azure.storage.queue.CloudQueue", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.queue.QueueServiceConfiguration",
"configurationField": "configuration", "description": "The queue service
client" },
"credentials": { "kind": "property", "displayName": "Credentials",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.microsoft.azure.storage.StorageCredentials", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.queue.QueueServiceConfiguration",
"configurationField": "configuration", "description": "Set the storage
credentials, required in most cases" },
+ "validateClientURI": { "kind": "property", "displayName": "Validate Client
URI", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.azure.queue.QueueServiceConfiguration",
"configurationField": "configuration", "description": "Whether to validate the
Azure client URI" },
"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 [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
"messageTimeToLive": { "kind": "property", "displayName": "Message Time To
Live", "group": "producer", "label": "producer", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.azure.queue.QueueServiceConfiguration",
"configurationField": "configuration", "description": "Message Time To Live in
seconds" },
@@ -38,6 +39,7 @@
"containerAndQueueUri": { "kind": "path", "displayName": "Container And
Queue Uri", "group": "common", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"secret": false, "description": "Container Queue compact Uri" },
"azureQueueClient": { "kind": "parameter", "displayName": "Azure Queue
Client", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.microsoft.azure.storage.queue.CloudQueue", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.queue.QueueServiceConfiguration",
"configurationField": "configuration", "description": "The queue service
client" },
"credentials": { "kind": "parameter", "displayName": "Credentials",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.microsoft.azure.storage.StorageCredentials", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.queue.QueueServiceConfiguration",
"configurationField": "configuration", "description": "Set the storage
credentials, required in most cases" },
+ "validateClientURI": { "kind": "parameter", "displayName": "Validate
Client URI", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.azure.queue.QueueServiceConfiguration",
"configurationField": "configuration", "description": "Whether to validate the
Azure client URI" },
"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 [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "To let the consumer use a
custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled
then this option is not in use. By default the consumer will deal with [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
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 9e8aef8..6e61af1 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 35 options, which are listed below.
+The component supports 39 options, which are listed below.
@@ -32,6 +32,9 @@ The component supports 35 options, which are listed below.
| *camel.component.aws2-s3.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.aws2-s3.bridge-error-handler* | 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
| *camel.component.aws2-s3.configuration* | The component configuration. The
option is a org.apache.camel.component.aws2.s3.AWS2S3Configuration type. | |
String
+| *camel.component.aws2-s3.customer-algorithm* | Define the customer algorithm
to use in case CustomerKey is enabled | | String
+| *camel.component.aws2-s3.customer-key-id* | Define the id of Customer key to
use in case CustomerKey is enabled | | String
+| *camel.component.aws2-s3.customer-key-m-d5* | Define the MD5 of Customer key
to use in case CustomerKey is enabled | | String
| *camel.component.aws2-s3.delete-after-read* | 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 o [...]
| *camel.component.aws2-s3.delete-after-write* | Delete file object after the
S3 file has been uploaded | false | Boolean
| *camel.component.aws2-s3.delimiter* | The delimiter which is used in the
com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we
are interested in. | | String
@@ -58,6 +61,7 @@ The component supports 35 options, which are listed below.
| *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.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
+| *camel.component.aws2-s3.use-customer-key* | Define if Customer Key must be
used or not | false | Boolean
| *camel.component.aws2-s3.use-i-a-m-credentials* | 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
|===
// spring-boot-auto-configure options: END
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 5275788..01d089a 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
@@ -211,10 +211,26 @@ public class AWS2S3ComponentConfiguration
*/
private String awsKMSKeyId;
/**
+ * Define the customer algorithm to use in case CustomerKey is enabled
+ */
+ private String customerAlgorithm;
+ /**
+ * Define the id of Customer key to use in case CustomerKey is enabled
+ */
+ private String customerKeyId;
+ /**
+ * Define the MD5 of Customer key to use in case CustomerKey is enabled
+ */
+ private String customerKeyMD5;
+ /**
* Define if KMS must be used or not
*/
private Boolean useAwsKMS = false;
/**
+ * Define if Customer Key must be used or not
+ */
+ private Boolean useCustomerKey = false;
+ /**
* Whether the component should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities
*/
@@ -468,6 +484,30 @@ public class AWS2S3ComponentConfiguration
this.awsKMSKeyId = awsKMSKeyId;
}
+ public String getCustomerAlgorithm() {
+ return customerAlgorithm;
+ }
+
+ public void setCustomerAlgorithm(String customerAlgorithm) {
+ this.customerAlgorithm = customerAlgorithm;
+ }
+
+ public String getCustomerKeyId() {
+ return customerKeyId;
+ }
+
+ public void setCustomerKeyId(String customerKeyId) {
+ this.customerKeyId = customerKeyId;
+ }
+
+ public String getCustomerKeyMD5() {
+ return customerKeyMD5;
+ }
+
+ public void setCustomerKeyMD5(String customerKeyMD5) {
+ this.customerKeyMD5 = customerKeyMD5;
+ }
+
public Boolean getUseAwsKMS() {
return useAwsKMS;
}
@@ -476,6 +516,14 @@ public class AWS2S3ComponentConfiguration
this.useAwsKMS = useAwsKMS;
}
+ public Boolean getUseCustomerKey() {
+ return useCustomerKey;
+ }
+
+ public void setUseCustomerKey(Boolean useCustomerKey) {
+ this.useCustomerKey = useCustomerKey;
+ }
+
public Boolean getBasicPropertyBinding() {
return basicPropertyBinding;
}
diff --git
a/components-starter/camel-azure-starter/src/main/docs/azure-starter.adoc
b/components-starter/camel-azure-starter/src/main/docs/azure-starter.adoc
index 5c9933f..74be695 100644
--- a/components-starter/camel-azure-starter/src/main/docs/azure-starter.adoc
+++ b/components-starter/camel-azure-starter/src/main/docs/azure-starter.adoc
@@ -17,7 +17,7 @@ When using azure with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 35 options, which are listed below.
+The component supports 37 options, which are listed below.
@@ -46,6 +46,7 @@ The component supports 35 options, which are listed below.
| *camel.component.azure-blob.stream-read-size* | Set the minimum read size in
bytes when reading the blob content | | Integer
| *camel.component.azure-blob.stream-write-size* | Set the size of the buffer
for writing block and page blocks | | Integer
| *camel.component.azure-blob.use-flat-listing* | Specify if the flat or
hierarchical blob listing should be used | true | Boolean
+| *camel.component.azure-blob.validate-client-u-r-i* | Whether to validate the
Azure client URI | true | Boolean
| *camel.component.azure-queue.azure-queue-client* | The queue service client.
The option is a com.microsoft.azure.storage.queue.CloudQueue type. | | String
| *camel.component.azure-queue.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.azure-queue.bridge-error-handler* | 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
@@ -59,5 +60,6 @@ The component supports 35 options, which are listed below.
| *camel.component.azure-queue.message-visibility-delay* | Message Visibility
Delay in seconds | | Integer
| *camel.component.azure-queue.operation* | Queue service operation hint to
the producer | | QueueServiceOperations
| *camel.component.azure-queue.queue-prefix* | Set a prefix which can be used
for listing the queues | | String
+| *camel.component.azure-queue.validate-client-u-r-i* | Whether to validate
the Azure client URI | true | Boolean
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentConfiguration.java
b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentConfiguration.java
index 33a4335..f68542c 100644
---
a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentConfiguration.java
+++
b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentConfiguration.java
@@ -81,6 +81,10 @@ public class BlobServiceComponentConfiguration
*/
private Integer streamReadSize;
/**
+ * Whether to validate the Azure client URI
+ */
+ private Boolean validateClientURI = true;
+ /**
* 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
@@ -215,6 +219,14 @@ public class BlobServiceComponentConfiguration
this.streamReadSize = streamReadSize;
}
+ public Boolean getValidateClientURI() {
+ return validateClientURI;
+ }
+
+ public void setValidateClientURI(Boolean validateClientURI) {
+ this.validateClientURI = validateClientURI;
+ }
+
public Boolean getBridgeErrorHandler() {
return bridgeErrorHandler;
}
diff --git
a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentConfiguration.java
b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentConfiguration.java
index 6a7c9d0..61f0268 100644
---
a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentConfiguration.java
+++
b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentConfiguration.java
@@ -50,6 +50,10 @@ public class QueueServiceComponentConfiguration
*/
private String credentials;
/**
+ * Whether to validate the Azure client URI
+ */
+ private Boolean validateClientURI = true;
+ /**
* 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
@@ -120,6 +124,14 @@ public class QueueServiceComponentConfiguration
this.credentials = credentials;
}
+ public Boolean getValidateClientURI() {
+ return validateClientURI;
+ }
+
+ public void setValidateClientURI(Boolean validateClientURI) {
+ this.validateClientURI = validateClientURI;
+ }
+
public Boolean getBridgeErrorHandler() {
return bridgeErrorHandler;
}
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index f29dca1..0391c60 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,18 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-boot-starter/pom.xml
b/components-starter/camel-spring-boot-starter/pom.xml
index a044dd9..ef4dde9 100644
--- a/components-starter/camel-spring-boot-starter/pom.xml
+++ b/components-starter/camel-spring-boot-starter/pom.xml
@@ -48,22 +48,6 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
</dependency>
diff --git a/components-starter/camel-spring-cloud-consul-starter/pom.xml
b/components-starter/camel-spring-cloud-consul-starter/pom.xml
index 6e257e9..5df3ca4 100644
--- a/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -38,26 +38,6 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-consul</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index beacbb0..fbba09a 100644
--- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -38,26 +38,6 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-netflix</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-starter/pom.xml
b/components-starter/camel-spring-cloud-starter/pom.xml
index 35eb6a5..0f4ff7d 100644
--- a/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-starter/pom.xml
@@ -38,26 +38,6 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index b29563b..168d968 100644
--- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -38,26 +38,6 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-zookeeper</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/docs/modules/ROOT/pages/aws2-s3-starter.adoc
b/docs/modules/ROOT/pages/aws2-s3-starter.adoc
index 9e8aef8..6e61af1 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 35 options, which are listed below.
+The component supports 39 options, which are listed below.
@@ -32,6 +32,9 @@ The component supports 35 options, which are listed below.
| *camel.component.aws2-s3.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.aws2-s3.bridge-error-handler* | 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
| *camel.component.aws2-s3.configuration* | The component configuration. The
option is a org.apache.camel.component.aws2.s3.AWS2S3Configuration type. | |
String
+| *camel.component.aws2-s3.customer-algorithm* | Define the customer algorithm
to use in case CustomerKey is enabled | | String
+| *camel.component.aws2-s3.customer-key-id* | Define the id of Customer key to
use in case CustomerKey is enabled | | String
+| *camel.component.aws2-s3.customer-key-m-d5* | Define the MD5 of Customer key
to use in case CustomerKey is enabled | | String
| *camel.component.aws2-s3.delete-after-read* | 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 o [...]
| *camel.component.aws2-s3.delete-after-write* | Delete file object after the
S3 file has been uploaded | false | Boolean
| *camel.component.aws2-s3.delimiter* | The delimiter which is used in the
com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we
are interested in. | | String
@@ -58,6 +61,7 @@ The component supports 35 options, which are listed below.
| *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.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
+| *camel.component.aws2-s3.use-customer-key* | Define if Customer Key must be
used or not | false | Boolean
| *camel.component.aws2-s3.use-i-a-m-credentials* | 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
|===
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/azure-starter.adoc
b/docs/modules/ROOT/pages/azure-starter.adoc
index 5c9933f..74be695 100644
--- a/docs/modules/ROOT/pages/azure-starter.adoc
+++ b/docs/modules/ROOT/pages/azure-starter.adoc
@@ -17,7 +17,7 @@ When using azure with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 35 options, which are listed below.
+The component supports 37 options, which are listed below.
@@ -46,6 +46,7 @@ The component supports 35 options, which are listed below.
| *camel.component.azure-blob.stream-read-size* | Set the minimum read size in
bytes when reading the blob content | | Integer
| *camel.component.azure-blob.stream-write-size* | Set the size of the buffer
for writing block and page blocks | | Integer
| *camel.component.azure-blob.use-flat-listing* | Specify if the flat or
hierarchical blob listing should be used | true | Boolean
+| *camel.component.azure-blob.validate-client-u-r-i* | Whether to validate the
Azure client URI | true | Boolean
| *camel.component.azure-queue.azure-queue-client* | The queue service client.
The option is a com.microsoft.azure.storage.queue.CloudQueue type. | | String
| *camel.component.azure-queue.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.azure-queue.bridge-error-handler* | 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
@@ -59,5 +60,6 @@ The component supports 35 options, which are listed below.
| *camel.component.azure-queue.message-visibility-delay* | Message Visibility
Delay in seconds | | Integer
| *camel.component.azure-queue.operation* | Queue service operation hint to
the producer | | QueueServiceOperations
| *camel.component.azure-queue.queue-prefix* | Set a prefix which can be used
for listing the queues | | String
+| *camel.component.azure-queue.validate-client-u-r-i* | Whether to validate
the Azure client URI | true | Boolean
|===
// spring-boot-auto-configure options: END
