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 78ba39a [create-pull-request] automated change
78ba39a is described below
commit 78ba39a1159f267905c66f392867b03eee2d0a3a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Feb 12 00:50:26 2021 +0000
[create-pull-request] automated change
---
.../springboot/catalog/components/aws2-sqs.json | 2 ++
.../springboot/catalog/components/mongodb.json | 2 +-
.../src/main/docs/aws2-sqs-starter.adoc | 3 ++-
.../sqs/springboot/Sqs2ComponentConfiguration.java | 12 +++++++++++
docs/modules/ROOT/pages/aws2-sqs-starter.adoc | 3 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 24 +++++++++++-----------
6 files changed, 31 insertions(+), 15 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
index 8b365b0..2f1c895 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
@@ -45,6 +45,7 @@
"serverSideEncryptionEnabled": { "kind": "property", "displayName":
"Server Side Encryption Enabled", "group": "consumer", "label": "consumer",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration", "description": "Define if Server Side
Encryption is enabled or not on the queue" },
"visibilityTimeout": { "kind": "property", "displayName": "Visibility
Timeout", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The duration (in seconds) that the received
messages are hidden from subsequent retrieve requests after [...]
"waitTimeSeconds": { "kind": "property", "displayName": "Wait Time
Seconds", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Duration in seconds (0 to 20) that the
ReceiveMessage action call will wait until a message is in the queu [...]
+ "batchSeparator": { "kind": "property", "displayName": "Batch Separator",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": ",", "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Set the separator when passing a String to
send batch message operation" },
"delaySeconds": { "kind": "property", "displayName": "Delay Seconds",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Delay sending messages for a number of
seconds." },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
"messageDeduplicationIdStrategy": { "kind": "property", "displayName":
"Message Deduplication Id Strategy", "group": "producer", "label": "producer",
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [
"useExchangeId", "useContentBasedDeduplication" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "useExchangeId",
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration", [...]
@@ -93,6 +94,7 @@
"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, "autowired": 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
con [...]
"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, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
"pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy",
"group": "consumer (advanced)", "label": "consumer,advanced", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "A pluggable
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your
custom implementation to control error handling usually occurred during the
poll operation [...]
+ "batchSeparator": { "kind": "parameter", "displayName": "Batch Separator",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": ",", "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Set the separator when passing a String to
send batch message operation" },
"delaySeconds": { "kind": "parameter", "displayName": "Delay Seconds",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Delay sending messages for a number of
seconds." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during sta [...]
"messageDeduplicationIdStrategy": { "kind": "parameter", "displayName":
"Message Deduplication Id Strategy", "group": "producer", "label": "producer",
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [
"useExchangeId", "useContentBasedDeduplication" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "useExchangeId",
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration" [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
index a7ddb5c..48d5422 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
@@ -22,7 +22,7 @@
"lenientProperties": false
},
"componentProperties": {
- "mongoConnection": { "kind": "property", "displayName": "Mongo
Connection", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "com.mongodb.client.MongoClient", "deprecated": false,
"autowired": false, "secret": false, "description": "Shared client used for
connection. All endpoints generated from the component will share this
connection client." },
+ "mongoConnection": { "kind": "property", "displayName": "Mongo
Connection", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "com.mongodb.client.MongoClient", "deprecated": false,
"autowired": true, "secret": false, "description": "Shared client used for
connection. All endpoints generated from the component will share this
connection client." },
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 me [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
diff --git
a/components-starter/camel-aws2-sqs-starter/src/main/docs/aws2-sqs-starter.adoc
b/components-starter/camel-aws2-sqs-starter/src/main/docs/aws2-sqs-starter.adoc
index 827408d..509b36f 100644
---
a/components-starter/camel-aws2-sqs-starter/src/main/docs/aws2-sqs-starter.adoc
+++
b/components-starter/camel-aws2-sqs-starter/src/main/docs/aws2-sqs-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-sqs with Spring Boot make sure to use the
following Maven depend
----
-The component supports 41 options, which are listed below.
+The component supports 42 options, which are listed below.
@@ -30,6 +30,7 @@ The component supports 41 options, which are listed below.
| *camel.component.aws2-sqs.attribute-names* | A list of attribute names to
receive when consuming. Multiple names can be separated by comma. | | String
| *camel.component.aws2-sqs.auto-create-queue* | Setting the autocreation of
the queue | true | Boolean
| *camel.component.aws2-sqs.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
+| *camel.component.aws2-sqs.batch-separator* | Set the separator when passing
a String to send batch message operation | , | String
| *camel.component.aws2-sqs.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-sqs.concurrent-consumers* | Allows you to use multiple
threads to poll the sqs queue to increase throughput | 1 | Integer
| *camel.component.aws2-sqs.configuration* | The AWS SQS default
configuration. The option is a
org.apache.camel.component.aws2.sqs.Sqs2Configuration type. | |
Sqs2Configuration
diff --git
a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java
b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java
index 9c860cb..d0bd56f 100644
---
a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConfiguration.java
@@ -165,6 +165,10 @@ public class Sqs2ComponentConfiguration
*/
private Integer waitTimeSeconds;
/**
+ * Set the separator when passing a String to send batch message operation
+ */
+ private String batchSeparator = ",";
+ /**
* Delay sending messages for a number of seconds.
*/
private Integer delaySeconds;
@@ -447,6 +451,14 @@ public class Sqs2ComponentConfiguration
this.waitTimeSeconds = waitTimeSeconds;
}
+ public String getBatchSeparator() {
+ return batchSeparator;
+ }
+
+ public void setBatchSeparator(String batchSeparator) {
+ this.batchSeparator = batchSeparator;
+ }
+
public Integer getDelaySeconds() {
return delaySeconds;
}
diff --git a/docs/modules/ROOT/pages/aws2-sqs-starter.adoc
b/docs/modules/ROOT/pages/aws2-sqs-starter.adoc
index 827408d..509b36f 100644
--- a/docs/modules/ROOT/pages/aws2-sqs-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-sqs-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-sqs with Spring Boot make sure to use the
following Maven depend
----
-The component supports 41 options, which are listed below.
+The component supports 42 options, which are listed below.
@@ -30,6 +30,7 @@ The component supports 41 options, which are listed below.
| *camel.component.aws2-sqs.attribute-names* | A list of attribute names to
receive when consuming. Multiple names can be separated by comma. | | String
| *camel.component.aws2-sqs.auto-create-queue* | Setting the autocreation of
the queue | true | Boolean
| *camel.component.aws2-sqs.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
+| *camel.component.aws2-sqs.batch-separator* | Set the separator when passing
a String to send batch message operation | , | String
| *camel.component.aws2-sqs.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-sqs.concurrent-consumers* | Allows you to use multiple
threads to poll the sqs queue to increase throughput | 1 | Integer
| *camel.component.aws2-sqs.configuration* | The AWS SQS default
configuration. The option is a
org.apache.camel.component.aws2.sqs.Sqs2Configuration type. | |
Sqs2Configuration
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index c5f05df..30723b2 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4678,62 +4678,62 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>cassandra</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>couchbase</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>elasticsearch</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>jdbc</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>localstack</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mongodb</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>pulsar</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>rabbitmq</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.15.1</version>
+ <version>1.15.2</version>
</dependency>
<dependency>
<groupId>rhino</groupId>