This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7c70ecda78d58e86807d27f5dc41ee900022cf74
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Mar 16 16:40:06 2021 +0100
Regen
---
.../apache/camel/springboot/catalog/components/aws2-sqs.json | 4 ++--
.../src/main/docs/aws2-sqs-starter.adoc | 2 +-
.../aws2/sqs/springboot/Sqs2ComponentConfiguration.java | 12 +++---------
docs/modules/ROOT/pages/aws2-sqs-starter.adoc | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 7 ++++++-
5 files changed, 13 insertions(+), 14 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 4450e0e..78f75ce 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
@@ -39,7 +39,7 @@
"concurrentConsumers": { "kind": "property", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Allows you to use multiple threads to poll the
sqs queue to increase throughput" },
"defaultVisibilityTimeout": { "kind": "property", "displayName": "Default
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 default visibility timeout (in seconds)" },
"deleteAfterRead": { "kind": "property", "displayName": "Delete After
Read", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Delete message from SQS after it has been
read" },
- "deleteIfFiltered": { "kind": "property", "displayName": "Delete If
Filtered", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": true, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Whether or not to send the DeleteMessage to
the SQS queue if an exchange fails to get through [...]
+ "deleteIfFiltered": { "kind": "property", "displayName": "Delete If
Filtered", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Whether or not to send the DeleteMessage to
the SQS queue if the exchange has property with [...]
"extendMessageVisibility": { "kind": "property", "displayName": "Extend
Message Visibility", "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": "If enabled then a
scheduled background task will keep extending the message v [...]
"kmsDataKeyReusePeriodSeconds": { "kind": "property", "displayName": "Kms
Data Key Reuse Period 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": "The length of time, in seconds, for which
Amazon SQS can reuse a data key to [...]
"kmsMasterKeyId": { "kind": "property", "displayName": "Kms Master Key
Id", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The ID of an AWS-managed customer master key
(CMK) for Amazon SQS or a custom CMK." },
@@ -85,7 +85,7 @@
"concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Allows you to use multiple threads to poll the
sqs queue to increase throughput" },
"defaultVisibilityTimeout": { "kind": "parameter", "displayName": "Default
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 default visibility timeout (in seconds)" },
"deleteAfterRead": { "kind": "parameter", "displayName": "Delete After
Read", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Delete message from SQS after it has been
read" },
- "deleteIfFiltered": { "kind": "parameter", "displayName": "Delete If
Filtered", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": true, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Whether or not to send the DeleteMessage to
the SQS queue if an exchange fails to get throug [...]
+ "deleteIfFiltered": { "kind": "parameter", "displayName": "Delete If
Filtered", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Whether or not to send the DeleteMessage to
the SQS queue if the exchange has property with [...]
"extendMessageVisibility": { "kind": "parameter", "displayName": "Extend
Message Visibility", "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": "If enabled then a
scheduled background task will keep extending the message [...]
"kmsDataKeyReusePeriodSeconds": { "kind": "parameter", "displayName": "Kms
Data Key Reuse Period 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": "The length of time, in seconds, for which
Amazon SQS can reuse a data key to [...]
"kmsMasterKeyId": { "kind": "parameter", "displayName": "Kms Master Key
Id", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The ID of an AWS-managed customer master key
(CMK) for Amazon SQS or a custom CMK." },
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 4e6cdd3..af2c1ba 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
@@ -38,6 +38,7 @@ The component supports 44 options, which are listed below.
| *camel.component.aws2-sqs.delay-queue* | Define if you want to apply
delaySeconds option to the queue or on single messages | false | Boolean
| *camel.component.aws2-sqs.delay-seconds* | Delay sending messages for a
number of seconds. | | Integer
| *camel.component.aws2-sqs.delete-after-read* | Delete message from SQS after
it has been read | true | Boolean
+| *camel.component.aws2-sqs.delete-if-filtered* | Whether or not to send the
DeleteMessage to the SQS queue if the exchange has property with key
Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. |
true | Boolean
| *camel.component.aws2-sqs.enabled* | Whether to enable auto configuration of
the aws2-sqs component. This is enabled by default. | | Boolean
| *camel.component.aws2-sqs.extend-message-visibility* | If enabled then a
scheduled background task will keep extending the message visibility on SQS.
This is needed if it takes a long time to process the message. If set to true
defaultVisibilityTimeout must be set. See details at Amazon docs. | false |
Boolean
| *camel.component.aws2-sqs.kms-data-key-reuse-period-seconds* | The length of
time, in seconds, for which Amazon SQS can reuse a data key to encrypt or
decrypt messages before calling AWS KMS again. An integer representing seconds,
between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5
minutes). | | Integer
@@ -67,6 +68,5 @@ The component supports 44 options, which are listed below.
| *camel.component.aws2-sqs.use-default-credentials-provider* | Set whether
the SQS client should expect to load credentials on an AWS infra instance or to
expect static credentials to be passed in. | false | Boolean
| *camel.component.aws2-sqs.visibility-timeout* | The duration (in seconds)
that the received messages are hidden from subsequent retrieve requests after
being retrieved by a ReceiveMessage request to set in the
com.amazonaws.services.sqs.model.SetQueueAttributesRequest. This only make
sense if its different from defaultVisibilityTimeout. It changes the queue
visibility timeout attribute permanently. | | Integer
| *camel.component.aws2-sqs.wait-time-seconds* | Duration in seconds (0 to 20)
that the ReceiveMessage action call will wait until a message is in the queue
to include in the response. | | Integer
-| *camel.component.aws2-sqs.delete-if-filtered* | *Deprecated* Whether or not
to send the DeleteMessage to the SQS queue if an exchange fails to get through
a filter. If 'false' and exchange does not make it through a Camel filter
upstream in the route, then don't send DeleteMessage. | true | Boolean
|===
// spring-boot-auto-configure options: END
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 ba51931..d4a9618 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
@@ -22,7 +22,6 @@ import org.apache.camel.component.aws2.sqs.Sqs2Configuration;
import org.apache.camel.component.aws2.sqs.Sqs2Operations;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import
org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.sqs.SqsClient;
@@ -127,12 +126,10 @@ public class Sqs2ComponentConfiguration
*/
private Boolean deleteAfterRead = true;
/**
- * Whether or not to send the DeleteMessage to the SQS queue if an exchange
- * fails to get through a filter. If 'false' and exchange does not make it
- * through a Camel filter upstream in the route, then don't send
- * DeleteMessage.
+ * Whether or not to send the DeleteMessage to the SQS queue if the
exchange
+ * has property with key Sqs2Constants#SQS_DELETE_FILTERED
+ * (CamelAwsSqsDeleteFiltered) set to true.
*/
- @Deprecated
private Boolean deleteIfFiltered = true;
/**
* If enabled then a scheduled background task will keep extending the
@@ -413,13 +410,10 @@ public class Sqs2ComponentConfiguration
this.deleteAfterRead = deleteAfterRead;
}
- @Deprecated
- @DeprecatedConfigurationProperty
public Boolean getDeleteIfFiltered() {
return deleteIfFiltered;
}
- @Deprecated
public void setDeleteIfFiltered(Boolean deleteIfFiltered) {
this.deleteIfFiltered = deleteIfFiltered;
}
diff --git a/docs/modules/ROOT/pages/aws2-sqs-starter.adoc
b/docs/modules/ROOT/pages/aws2-sqs-starter.adoc
index 4e6cdd3..af2c1ba 100644
--- a/docs/modules/ROOT/pages/aws2-sqs-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-sqs-starter.adoc
@@ -38,6 +38,7 @@ The component supports 44 options, which are listed below.
| *camel.component.aws2-sqs.delay-queue* | Define if you want to apply
delaySeconds option to the queue or on single messages | false | Boolean
| *camel.component.aws2-sqs.delay-seconds* | Delay sending messages for a
number of seconds. | | Integer
| *camel.component.aws2-sqs.delete-after-read* | Delete message from SQS after
it has been read | true | Boolean
+| *camel.component.aws2-sqs.delete-if-filtered* | Whether or not to send the
DeleteMessage to the SQS queue if the exchange has property with key
Sqs2Constants#SQS_DELETE_FILTERED (CamelAwsSqsDeleteFiltered) set to true. |
true | Boolean
| *camel.component.aws2-sqs.enabled* | Whether to enable auto configuration of
the aws2-sqs component. This is enabled by default. | | Boolean
| *camel.component.aws2-sqs.extend-message-visibility* | If enabled then a
scheduled background task will keep extending the message visibility on SQS.
This is needed if it takes a long time to process the message. If set to true
defaultVisibilityTimeout must be set. See details at Amazon docs. | false |
Boolean
| *camel.component.aws2-sqs.kms-data-key-reuse-period-seconds* | The length of
time, in seconds, for which Amazon SQS can reuse a data key to encrypt or
decrypt messages before calling AWS KMS again. An integer representing seconds,
between 60 seconds (1 minute) and 86,400 seconds (24 hours). Default: 300 (5
minutes). | | Integer
@@ -67,6 +68,5 @@ The component supports 44 options, which are listed below.
| *camel.component.aws2-sqs.use-default-credentials-provider* | Set whether
the SQS client should expect to load credentials on an AWS infra instance or to
expect static credentials to be passed in. | false | Boolean
| *camel.component.aws2-sqs.visibility-timeout* | The duration (in seconds)
that the received messages are hidden from subsequent retrieve requests after
being retrieved by a ReceiveMessage request to set in the
com.amazonaws.services.sqs.model.SetQueueAttributesRequest. This only make
sense if its different from defaultVisibilityTimeout. It changes the queue
visibility timeout attribute permanently. | | Integer
| *camel.component.aws2-sqs.wait-time-seconds* | Duration in seconds (0 to 20)
that the ReceiveMessage action call will wait until a message is in the queue
to include in the response. | | Integer
-| *camel.component.aws2-sqs.delete-if-filtered* | *Deprecated* Whether or not
to send the DeleteMessage to the SQS queue if an exchange fails to get through
a filter. If 'false' and exchange does not make it through a Camel filter
upstream in the route, then don't send DeleteMessage. | true | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 4b959c8..90d0515 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.15</version>
+ <version>1.4.16</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -2994,6 +2994,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-js-dsl</artifactId>
+ <version>3.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-jsch</artifactId>
<version>3.9.0-SNAPSHOT</version>
</dependency>
