You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/12/18 14:58:56 UTC
[camel] branch master updated (65dd97a -> 0290c8d)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 65dd97a CAMEL-12871: disconnect on handshake failure
new da81043 CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy as file and not as plain String
new 2c11088 CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy as file and not as plain String, regen
new 8f17e45 CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy as file and not as plain String, fixed test
new e337a3f CAMEL-15973 - Regen and sync
new 0290c8d CAMEL-15973 - Added a note in migration guide
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/catalog/components/aws2-sqs.json | 4 +-
.../camel/catalog/docs/aws2-sqs-component.adoc | 4 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 71 +---------------------
components/camel-aws2-sqs/pom.xml | 4 ++
.../apache/camel/component/aws2/sqs/aws2-sqs.json | 4 +-
.../src/main/docs/aws2-sqs-component.adoc | 4 +-
.../component/aws2/sqs/Sqs2Configuration.java | 3 +-
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 19 ++++--
.../integration/SqsComponentIntegrationTest.java | 4 +-
.../sqs/localstack/SqsComponentLocalstackTest.java | 4 +-
.../org/apache/camel/component/aws2/sqs/policy.txt | 1 +
.../dsl/Aws2SqsComponentBuilderFactory.java | 4 +-
.../endpoint/dsl/Sqs2EndpointBuilderFactory.java | 12 +++-
.../modules/ROOT/pages/aws2-sqs-component.adoc | 4 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_8.adoc | 4 ++
15 files changed, 51 insertions(+), 95 deletions(-)
create mode 100644 components/camel-aws2-sqs/src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt
[camel] 02/05: CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy
as file and not as plain String, regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2c11088a3f4360ae380f87ef341afad5aa51174a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 18 13:42:32 2020 +0100
CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy as file and not as plain String, regen
---
.../org/apache/camel/catalog/docs/aws2-sqs-component.adoc | 4 ++--
.../org/apache/camel/component/aws2/sqs/aws2-sqs.json | 4 ++--
.../camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc | 4 ++--
.../apache/camel/component/aws2/sqs/Sqs2Configuration.java | 4 ++--
.../component/dsl/Aws2SqsComponentBuilderFactory.java | 4 +++-
.../builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java | 12 +++++++++---
docs/components/modules/ROOT/pages/aws2-sqs-component.adoc | 4 ++--
7 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc
index 5914660..f56dee2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-sqs-component.adoc
@@ -85,7 +85,7 @@ The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are li
| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client | | Integer
| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. | | Integer
| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. | | Integer
-| *policy* (queue) | The policy for this queue | | String
+| *policy* (queue) | The policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. | | Integer
| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. | | String
| *accessKey* (security) | Amazon AWS Access Key | | String
@@ -165,7 +165,7 @@ with the following path and query parameters:
| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client | | Integer
| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. | | Integer
| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. | | Integer
-| *policy* (queue) | The policy for this queue | | String
+| *policy* (queue) | The policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. | | Integer
| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. | | String
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
diff --git a/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json b/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
index 37a82bd..d47130b 100644
--- a/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
+++ b/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
@@ -57,7 +57,7 @@
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "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": "To define a proxy port when instantiating the SQS client" },
"maximumMessageSize": { "kind": "property", "displayName": "Maximum Message Size", "group": "queue", "label": "queue", "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 maximumMessageSize (in bytes) an SQS message can contain for this queue." },
"messageRetentionPeriod": { "kind": "property", "displayName": "Message Retention Period", "group": "queue", "label": "queue", "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 messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue." },
- "policy": { "kind": "property", "displayName": "Policy", "group": "queue", "label": "queue", "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 policy for this queue" },
+ "policy": { "kind": "property", "displayName": "Policy", "group": "queue", "label": "queue", "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 policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the [...]
"receiveMessageWaitTimeSeconds": { "kind": "property", "displayName": "Receive Message Wait Time Seconds", "group": "queue", "label": "queue", "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": "If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveM [...]
"redrivePolicy": { "kind": "property", "displayName": "Redrive Policy", "group": "queue", "label": "queue", "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": "Specify the policy that send message to DeadLetter queue. See detail at Amazon docs." },
"accessKey": { "kind": "property", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
@@ -105,7 +105,7 @@
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "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": "To define a proxy port when instantiating the SQS client" },
"maximumMessageSize": { "kind": "parameter", "displayName": "Maximum Message Size", "group": "queue", "label": "queue", "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 maximumMessageSize (in bytes) an SQS message can contain for this queue." },
"messageRetentionPeriod": { "kind": "parameter", "displayName": "Message Retention Period", "group": "queue", "label": "queue", "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 messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue." },
- "policy": { "kind": "parameter", "displayName": "Policy", "group": "queue", "label": "queue", "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 policy for this queue" },
+ "policy": { "kind": "parameter", "displayName": "Policy", "group": "queue", "label": "queue", "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 policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load th [...]
"receiveMessageWaitTimeSeconds": { "kind": "parameter", "displayName": "Receive Message Wait Time Seconds", "group": "queue", "label": "queue", "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": "If you do not specify WaitTimeSeconds in the request, the queue attribute Receive [...]
"redrivePolicy": { "kind": "parameter", "displayName": "Redrive Policy", "group": "queue", "label": "queue", "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": "Specify the policy that send message to DeadLetter queue. See detail at Amazon docs." },
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": 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/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc b/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
index 5914660..f56dee2 100644
--- a/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
+++ b/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
@@ -85,7 +85,7 @@ The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are li
| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client | | Integer
| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. | | Integer
| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. | | Integer
-| *policy* (queue) | The policy for this queue | | String
+| *policy* (queue) | The policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. | | Integer
| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. | | String
| *accessKey* (security) | Amazon AWS Access Key | | String
@@ -165,7 +165,7 @@ with the following path and query parameters:
| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client | | Integer
| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. | | Integer
| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. | | Integer
-| *policy* (queue) | The policy for this queue | | String
+| *policy* (queue) | The policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. | | Integer
| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. | | String
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
index e824a72..3347d84 100644
--- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
+++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
@@ -286,8 +286,8 @@ public class Sqs2Configuration implements Cloneable {
}
/**
- * The policy for this queue. It can be loaded by default from classpath, but you can prefix with "classpath:", "file:", or
- * "http:" to load the resource from different systems.
+ * The policy for this queue. It can be loaded by default from classpath, but you can prefix with "classpath:",
+ * "file:", or "http:" to load the resource from different systems.
*/
public void setPolicy(String policy) {
this.policy = policy;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java
index 793fa58..d83549b 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java
@@ -645,7 +645,9 @@ public interface Aws2SqsComponentBuilderFactory {
return this;
}
/**
- * The policy for this queue.
+ * The policy for this queue. It can be loaded by default from
+ * classpath, but you can prefix with classpath:, file:, or http: to
+ * load the resource from different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
index 9cd25ea..9c74acf 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
@@ -903,7 +903,9 @@ public interface Sqs2EndpointBuilderFactory {
return this;
}
/**
- * The policy for this queue.
+ * The policy for this queue. It can be loaded by default from
+ * classpath, but you can prefix with classpath:, file:, or http: to
+ * load the resource from different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -2248,7 +2250,9 @@ public interface Sqs2EndpointBuilderFactory {
return this;
}
/**
- * The policy for this queue.
+ * The policy for this queue. It can be loaded by default from
+ * classpath, but you can prefix with classpath:, file:, or http: to
+ * load the resource from different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -2818,7 +2822,9 @@ public interface Sqs2EndpointBuilderFactory {
return this;
}
/**
- * The policy for this queue.
+ * The policy for this queue. It can be loaded by default from
+ * classpath, but you can prefix with classpath:, file:, or http: to
+ * load the resource from different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
diff --git a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
index beb08c0..7e2aff0 100644
--- a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
@@ -87,7 +87,7 @@ The AWS 2 Simple Queue Service (SQS) component supports 40 options, which are li
| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client | | Integer
| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. | | Integer
| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. | | Integer
-| *policy* (queue) | The policy for this queue | | String
+| *policy* (queue) | The policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. | | Integer
| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. | | String
| *accessKey* (security) | Amazon AWS Access Key | | String
@@ -167,7 +167,7 @@ with the following path and query parameters:
| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client | | Integer
| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. | | Integer
| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. | | Integer
-| *policy* (queue) | The policy for this queue | | String
+| *policy* (queue) | The policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. | | Integer
| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. | | String
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
[camel] 03/05: CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy
as file and not as plain String, fixed test
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8f17e45d187eb259ac6cdd1107b904ad2992b936
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 18 14:05:27 2020 +0100
CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy as file and not as plain String, fixed test
---
.../component/aws2/sqs/integration/SqsComponentIntegrationTest.java | 4 +---
.../component/aws2/sqs/localstack/SqsComponentLocalstackTest.java | 4 +---
.../src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt | 1 +
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java
index 6ca4578..d38d2ab 100644
--- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java
+++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsComponentIntegrationTest.java
@@ -111,9 +111,7 @@ public class SqsComponentIntegrationTest extends CamelTestSupport {
credentials.accessKeyId(),
credentials.secretAccessKey(),
"1209600", "65536", "60",
- "%7B%22Version%22%3A%222008-10-17%22%2C%22Id%22%3A%22%2F195004372649%2FMyNewCamelQueue%2FSQSDefaultPolicy%22%2C%22"
- + "Statement%22%3A%5B%7B%22Sid%22%3A%22Queue1ReceiveMessage%22%2C%22Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22AWS%22%3A%22*%22%7D%2C%22"
- + "Action%22%3A%22SQS%3AReceiveMessage%22%2C%22Resource%22%3A%22%2F195004372649%2FMyNewCamelQueue%22%7D%5D%7D",
+ "file:src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt",
"#class:" + TestSqsConfiguration.class.getName());
return new RouteBuilder() {
diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsComponentLocalstackTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsComponentLocalstackTest.java
index eebb2e4..d6ed735 100644
--- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsComponentLocalstackTest.java
+++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/localstack/SqsComponentLocalstackTest.java
@@ -91,9 +91,7 @@ public class SqsComponentLocalstackTest extends Aws2SQSBaseTest {
.format("aws2-sqs://%s?messageRetentionPeriod=%s&maximumMessageSize=%s&visibilityTimeout=%s&policy=%s",
sharedNameGenerator.getName(),
"1209600", "65536", "60",
- "%7B%22Version%22%3A%222008-10-17%22%2C%22Id%22%3A%22%2F195004372649%2FMyNewCamelQueue%2FSQSDefaultPolicy%22%2C%22"
- + "Statement%22%3A%5B%7B%22Sid%22%3A%22Queue1ReceiveMessage%22%2C%22Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22AWS%22%3A%22*%22%7D%2C%22"
- + "Action%22%3A%22SQS%3AReceiveMessage%22%2C%22Resource%22%3A%22%2F195004372649%2FMyNewCamelQueue%22%7D%5D%7D");
+ "file:src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt");
return new RouteBuilder() {
@Override
diff --git a/components/camel-aws2-sqs/src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt b/components/camel-aws2-sqs/src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt
new file mode 100644
index 0000000..135a933
--- /dev/null
+++ b/components/camel-aws2-sqs/src/test/resources/org/apache/camel/component/aws2/sqs/policy.txt
@@ -0,0 +1 @@
+{"Version":"2008-10-17","Id":"/195004372649/MyNewCamelQueue/SQSDefaultPolicy","Statement":[{"Sid":"Queue1ReceiveMessage","Effect":"Allow","Principal":{"AWS":"*"},"Action":"SQS:ReceiveMessage","Resource":"/195004372649/MyNewCamelQueue"}]}
[camel] 04/05: CAMEL-15973 - Regen and sync
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e337a3fe9895d8bac34cc80eaf554eba45ce2257
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 18 15:57:14 2020 +0100
CAMEL-15973 - Regen and sync
---
.../apache/camel/catalog/components/aws2-sqs.json | 4 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 71 +---------------------
2 files changed, 3 insertions(+), 72 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
index 37a82bd..d47130b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
@@ -57,7 +57,7 @@
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "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": "To define a proxy port when instantiating the SQS client" },
"maximumMessageSize": { "kind": "property", "displayName": "Maximum Message Size", "group": "queue", "label": "queue", "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 maximumMessageSize (in bytes) an SQS message can contain for this queue." },
"messageRetentionPeriod": { "kind": "property", "displayName": "Message Retention Period", "group": "queue", "label": "queue", "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 messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue." },
- "policy": { "kind": "property", "displayName": "Policy", "group": "queue", "label": "queue", "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 policy for this queue" },
+ "policy": { "kind": "property", "displayName": "Policy", "group": "queue", "label": "queue", "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 policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the [...]
"receiveMessageWaitTimeSeconds": { "kind": "property", "displayName": "Receive Message Wait Time Seconds", "group": "queue", "label": "queue", "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": "If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveM [...]
"redrivePolicy": { "kind": "property", "displayName": "Redrive Policy", "group": "queue", "label": "queue", "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": "Specify the policy that send message to DeadLetter queue. See detail at Amazon docs." },
"accessKey": { "kind": "property", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
@@ -105,7 +105,7 @@
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "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": "To define a proxy port when instantiating the SQS client" },
"maximumMessageSize": { "kind": "parameter", "displayName": "Maximum Message Size", "group": "queue", "label": "queue", "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 maximumMessageSize (in bytes) an SQS message can contain for this queue." },
"messageRetentionPeriod": { "kind": "parameter", "displayName": "Message Retention Period", "group": "queue", "label": "queue", "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 messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue." },
- "policy": { "kind": "parameter", "displayName": "Policy", "group": "queue", "label": "queue", "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 policy for this queue" },
+ "policy": { "kind": "parameter", "displayName": "Policy", "group": "queue", "label": "queue", "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 policy for this queue. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load th [...]
"receiveMessageWaitTimeSeconds": { "kind": "parameter", "displayName": "Receive Message Wait Time Seconds", "group": "queue", "label": "queue", "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": "If you do not specify WaitTimeSeconds in the request, the queue attribute Receive [...]
"redrivePolicy": { "kind": "parameter", "displayName": "Redrive Policy", "group": "queue", "label": "queue", "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": "Specify the policy that send message to DeadLetter queue. See detail at Amazon docs." },
"backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": 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/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 3a8d28f..a4e492f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -4374,6 +4374,7 @@ To use a specific charset when converting.
<xs:complexContent>
<xs:extension base="tns:identifiedType">
<xs:sequence/>
+ <xs:attribute name="contentTypeHeader" type="xs:string"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6441,16 +6442,6 @@ true (which is the default).
<xs:list itemType="xs:string"/>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6734,16 +6725,6 @@ enabled when desired to be used. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6903,16 +6884,6 @@ JAXB provider properties to be used with the JAXB marshaller.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7092,16 +7063,6 @@ Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7216,16 +7177,6 @@ value is native. Default value: native
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7497,16 +7448,6 @@ representation. The default value is binary. Default value: binary
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7818,16 +7759,6 @@ SINGLE_NODE_XPATH_RELATIVE_REFERENCES SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
[camel] 05/05: CAMEL-15973 - Added a note in migration guide
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0290c8dd30b93d0018a2afbeeb21f6d0820a0e9f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 18 15:58:09 2020 +0100
CAMEL-15973 - Added a note in migration guide
---
docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc
index 298406e..b5d6c69 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_8.adoc
@@ -10,3 +10,7 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
The policy option now expects a file, since the policy are going to be complex. It can be from classpath:, http: or file: etc.
+=== Camel-AWS2-SQS
+
+The policy option now expects a file, since the policy are going to be complex. It can be from classpath:, http: or file: etc.
+
[camel] 01/05: CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy
as file and not as plain String
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit da81043f14c91d961d8dd040c3e409d777eb9a63
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 18 13:40:29 2020 +0100
CAMEL-15973 - Camel-AWS2-SQS: Set the queue policy as file and not as plain String
---
components/camel-aws2-sqs/pom.xml | 4 ++++
.../camel/component/aws2/sqs/Sqs2Configuration.java | 3 ++-
.../apache/camel/component/aws2/sqs/Sqs2Endpoint.java | 19 +++++++++++++++----
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/components/camel-aws2-sqs/pom.xml b/components/camel-aws2-sqs/pom.xml
index a5a6944..47296d4 100644
--- a/components/camel-aws2-sqs/pom.xml
+++ b/components/camel-aws2-sqs/pom.xml
@@ -50,6 +50,10 @@
<artifactId>apache-client</artifactId>
<version>${aws-java-sdk2-version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<!-- test infra -->
<dependency>
diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
index 9b7f0b2..e824a72 100644
--- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
+++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Configuration.java
@@ -286,7 +286,8 @@ public class Sqs2Configuration implements Cloneable {
}
/**
- * The policy for this queue
+ * The policy for this queue. It can be loaded by default from classpath, but you can prefix with "classpath:", "file:", or
+ * "http:" to load the resource from different systems.
*/
public void setPolicy(String policy) {
this.policy = policy;
diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
index 1282b4b..2dc209c 100644
--- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
+++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.aws2.sqs;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -35,9 +38,11 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultScheduledPollConsumerScheduler;
+import org.apache.camel.support.ResourceHelper;
import org.apache.camel.support.ScheduledPollEndpoint;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
+import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.regions.Region;
@@ -211,7 +216,7 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS
}
}
- protected void createQueue(SqsClient client) {
+ protected void createQueue(SqsClient client) throws IOException {
if (queueExists(client)) {
return;
}
@@ -239,7 +244,10 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS
String.valueOf(getConfiguration().getMessageRetentionPeriod()));
}
if (getConfiguration().getPolicy() != null) {
- attributes.put(QueueAttributeName.POLICY, String.valueOf(getConfiguration().getPolicy()));
+ InputStream s = ResourceHelper.resolveMandatoryResourceAsInputStream(this.getCamelContext(),
+ getConfiguration().getPolicy());
+ String policy = IOUtils.toString(s, Charset.defaultCharset());
+ attributes.put(QueueAttributeName.POLICY, policy);
}
if (getConfiguration().getReceiveMessageWaitTimeSeconds() != null) {
attributes.put(QueueAttributeName.RECEIVE_MESSAGE_WAIT_TIME_SECONDS,
@@ -278,7 +286,7 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS
LOG.trace("Queue created and available at: {}", queueUrl);
}
- private void updateQueueAttributes(SqsClient client) {
+ private void updateQueueAttributes(SqsClient client) throws IOException {
SetQueueAttributesRequest.Builder request = SetQueueAttributesRequest.builder().queueUrl(queueUrl);
Map<QueueAttributeName, String> attributes = new HashMap<QueueAttributeName, String>();
if (getConfiguration().getDefaultVisibilityTimeout() != null) {
@@ -293,7 +301,10 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS
String.valueOf(getConfiguration().getMessageRetentionPeriod()));
}
if (getConfiguration().getPolicy() != null) {
- attributes.put(QueueAttributeName.POLICY, String.valueOf(getConfiguration().getPolicy()));
+ InputStream s = ResourceHelper.resolveMandatoryResourceAsInputStream(this.getCamelContext(),
+ getConfiguration().getPolicy());
+ String policy = IOUtils.toString(s, Charset.defaultCharset());
+ attributes.put(QueueAttributeName.POLICY, policy);
}
if (getConfiguration().getReceiveMessageWaitTimeSeconds() != null) {
attributes.put(QueueAttributeName.RECEIVE_MESSAGE_WAIT_TIME_SECONDS,