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 8cec20d8c287a8459b6baa7c366eecbfa45a95b6 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri May 24 14:51:28 2019 +0200 CAMEL-13570 - Full regen --- .../camel-aws-sqs/src/main/docs/aws-sqs-component.adoc | 9 ++++++--- docs/components/modules/ROOT/pages/aws-sqs-component.adoc | 11 +++++++++-- .../aws/sqs/springboot/SqsComponentConfiguration.java | 13 +++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc index c33ee42..89a046e 100644 --- a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc +++ b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc @@ -27,7 +27,7 @@ The queue will be created if they don't already exists. + // component options: START -The AWS Simple Queue Service component supports 5 options, which are listed below. +The AWS Simple Queue Service component supports 6 options, which are listed below. @@ -39,6 +39,7 @@ The AWS Simple Queue Service component supports 5 options, which are listed belo | *secretKey* (common) | Amazon AWS Secret Key | | String | *region* (common) | Specify the queue region which could be used with queueOwnerAWSAccountId to build the service URL. | | String | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean +| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean |=== // component options: END @@ -68,7 +69,7 @@ with the following path and query parameters: |=== -==== Query Parameters (53 parameters): +==== Query Parameters (54 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -102,6 +103,7 @@ with the following path and query parameters: | *messageDeduplicationId Strategy* (producer) | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. | useExchangeId | MessageDeduplicationId Strategy | *messageGroupIdStrategy* (producer) | Only for FIFO queues. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. | | MessageGroupIdStrategy | *operation* (producer) | The operation to do in case the user don't want to send only a message | | SqsOperations +| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *delayQueue* (advanced) | Define if you want to apply delaySeconds option to the queue or on single messages | false | boolean | *queueUrl* (advanced) | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | | String | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean @@ -145,7 +147,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 38 options, which are listed below. +The component supports 39 options, which are listed below. @@ -158,6 +160,7 @@ The component supports 38 options, which are listed below. | *camel.component.aws-sqs.configuration.amazon-a-w-s-host* | The hostname of the Amazon AWS cloud. | amazonaws.com | String | *camel.component.aws-sqs.configuration.amazon-s-q-s-client* | To use the AmazonSQS as client | | AmazonSQS | *camel.component.aws-sqs.configuration.attribute-names* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String +| *camel.component.aws-sqs.configuration.auto-create-queue* | Setting the autocreation of the queue | true | Boolean | *camel.component.aws-sqs.configuration.concurrent-consumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | Integer | *camel.component.aws-sqs.configuration.default-visibility-timeout* | The default visibility timeout (in seconds) | | Integer | *camel.component.aws-sqs.configuration.delay-queue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | Boolean diff --git a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc index 4784854..89a046e 100644 --- a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc @@ -69,7 +69,7 @@ with the following path and query parameters: |=== -==== Query Parameters (53 parameters): +==== Query Parameters (54 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -77,6 +77,7 @@ with the following path and query parameters: | Name | Description | Default | Type | *amazonAWSHost* (common) | The hostname of the Amazon AWS cloud. | amazonaws.com | String | *amazonSQSClient* (common) | To use the AmazonSQS as client | | AmazonSQS +| *autoCreateQueue* (common) | Setting the autocreation of the queue | true | boolean | *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to map headers to/from Camel. | | HeaderFilterStrategy | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id when you need to connect the queue with different account owner. | | String | *region* (common) | Specify the queue region which could be used with queueOwnerAWSAccountId to build the service URL. | | String @@ -146,7 +147,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 38 options, which are listed below. +The component supports 39 options, which are listed below. @@ -159,6 +160,7 @@ The component supports 38 options, which are listed below. | *camel.component.aws-sqs.configuration.amazon-a-w-s-host* | The hostname of the Amazon AWS cloud. | amazonaws.com | String | *camel.component.aws-sqs.configuration.amazon-s-q-s-client* | To use the AmazonSQS as client | | AmazonSQS | *camel.component.aws-sqs.configuration.attribute-names* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | | String +| *camel.component.aws-sqs.configuration.auto-create-queue* | Setting the autocreation of the queue | true | Boolean | *camel.component.aws-sqs.configuration.concurrent-consumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | Integer | *camel.component.aws-sqs.configuration.default-visibility-timeout* | The default visibility timeout (in seconds) | | Integer | *camel.component.aws-sqs.configuration.delay-queue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | Boolean @@ -389,6 +391,11 @@ from("direct:start") As result you'll get an exchange containing a `ListQueuesResult` instance, that you can examinate to check the actual queues. +### Queue Autocreation + +With the option `autoCreateQueue` users are able to avoid the autocreation of an SQS Queue in case it doesn't exist. The default for this option is `true`. +If set to false any operation on a not-existent queue in AWS won't be successful and an error will be returned. + ### Automatic detection of AmazonSQS client in registry From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonSQS bean into the registry. diff --git a/platforms/spring-boot/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java index 544961b..23c657c 100644 --- a/platforms/spring-boot/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java @@ -62,6 +62,11 @@ public class SqsComponentConfiguration * placeholders. */ private Boolean resolvePropertyPlaceholders = true; + /** + * Whether the component should use basic property binding (Camel 2.x) or + * the newer property binding with additional capabilities + */ + private Boolean basicPropertyBinding = false; public SqsConfigurationNestedConfiguration getConfiguration() { return configuration; @@ -105,6 +110,14 @@ public class SqsComponentConfiguration this.resolvePropertyPlaceholders = resolvePropertyPlaceholders; } + public Boolean getBasicPropertyBinding() { + return basicPropertyBinding; + } + + public void setBasicPropertyBinding(Boolean basicPropertyBinding) { + this.basicPropertyBinding = basicPropertyBinding; + } + public static class SqsConfigurationNestedConfiguration { public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.sqs.SqsConfiguration.class; /**