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 7ba5c9c CAMEL-16171 - Add uri-endpoint-override options to all AWS2
components - AWS2-SNS component
7ba5c9c is described below
commit 7ba5c9c140775532f9a24da99582ba38f77cdad0
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Mar 3 13:25:11 2021 +0100
CAMEL-16171 - Add uri-endpoint-override options to all AWS2 components -
AWS2-SNS component
---
.../springboot/catalog/components/aws2-sns.json | 4 ++++
.../src/main/docs/aws2-sns-starter.adoc | 4 +++-
.../sns/springboot/Sns2ComponentConfiguration.java | 26 ++++++++++++++++++++++
docs/modules/ROOT/pages/aws2-sns-starter.adoc | 4 +++-
4 files changed, 36 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json
index f5ce4e7..16091de 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sns.json
@@ -30,6 +30,7 @@
"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.sns.Sns2Configuration",
"configurationField": "configuration", [...]
"messageGroupIdStrategy": { "kind": "property", "displayName": "Message
Group Id Strategy", "group": "producer", "label": "producer", "required":
false, "type": "string", "javaType": "java.lang.String", "enum": [
"useConstant", "useExchangeId", "usePropertyValue" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Only for FIFO Topic. Strategy [...]
"messageStructure": { "kind": "property", "displayName": "Message
Structure", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "The message structure to use such as json" },
+ "overrideEndpoint": { "kind": "property", "displayName": "Override
Endpoint", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpoi [...]
"policy": { "kind": "property", "displayName": "Policy", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "The policy for this
topic. Is loaded by default from classpath, but you can prefix with classpath:,
file:, or http: to load the resource [...]
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the SNS client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the SNS client" },
@@ -40,6 +41,7 @@
"subject": { "kind": "property", "displayName": "Subject", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "The subject which is
used if the message header 'CamelAwsSnsSubject' is not present." },
"subscribeSNStoSQS": { "kind": "property", "displayName": "Subscribe SNSto
SQS", "group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Define if the subscription between SNS Topic
and SQS must be done or not" },
"trustAllCertificates": { "kind": "property", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
+ "uriEndpointOverride": { "kind": "property", "displayName": "Uri Endpoint
Override", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
"useDefaultCredentialsProvider": { "kind": "property", "displayName": "Use
Default Credentials Provider", "group": "producer", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "Set whether the SNS
client should expect to load credentials on an AWS i [...]
"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 [...]
"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.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
@@ -55,6 +57,7 @@
"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.sns.Sns2Configuration",
"configurationField": "configuration" [...]
"messageGroupIdStrategy": { "kind": "parameter", "displayName": "Message
Group Id Strategy", "group": "producer", "label": "producer", "required":
false, "type": "string", "javaType": "java.lang.String", "enum": [
"useConstant", "useExchangeId", "usePropertyValue" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Only for FIFO Topic. Strateg [...]
"messageStructure": { "kind": "parameter", "displayName": "Message
Structure", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "The message structure to use such as json" },
+ "overrideEndpoint": { "kind": "parameter", "displayName": "Override
Endpoint", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpo [...]
"policy": { "kind": "parameter", "displayName": "Policy", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "The policy for this
topic. Is loaded by default from classpath, but you can prefix with classpath:,
file:, or http: to load the resourc [...]
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the SNS client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the SNS client" },
@@ -65,6 +68,7 @@
"subject": { "kind": "parameter", "displayName": "Subject", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "The subject which is
used if the message header 'CamelAwsSnsSubject' is not present." },
"subscribeSNStoSQS": { "kind": "parameter", "displayName": "Subscribe
SNSto SQS", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Define if the subscription between SNS Topic
and SQS must be done or not" },
"trustAllCertificates": { "kind": "parameter", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
+ "uriEndpointOverride": { "kind": "parameter", "displayName": "Uri Endpoint
Override", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
"useDefaultCredentialsProvider": { "kind": "parameter", "displayName":
"Use Default Credentials Provider", "group": "producer", "label": "",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.sns.Sns2Configuration",
"configurationField": "configuration", "description": "Set whether the SNS
client should expect to load credentials on an AWS [...]
"accessKey": { "kind": "parameter", "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.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "parameter", "displayName": "Secret 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.sns.Sns2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
diff --git
a/components-starter/camel-aws2-sns-starter/src/main/docs/aws2-sns-starter.adoc
b/components-starter/camel-aws2-sns-starter/src/main/docs/aws2-sns-starter.adoc
index 1cdb833..b6a6a5f 100644
---
a/components-starter/camel-aws2-sns-starter/src/main/docs/aws2-sns-starter.adoc
+++
b/components-starter/camel-aws2-sns-starter/src/main/docs/aws2-sns-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-sns with Spring Boot make sure to use the
following Maven depend
----
-The component supports 23 options, which are listed below.
+The component supports 25 options, which are listed below.
@@ -35,6 +35,7 @@ The component supports 23 options, which are listed below.
| *camel.component.aws2-sns.message-deduplication-id-strategy* | Only for FIFO
Topic. 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 | String
| *camel.component.aws2-sns.message-group-id-strategy* | Only for FIFO Topic.
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. | | String
| *camel.component.aws2-sns.message-structure* | The message structure to use
such as json | | String
+| *camel.component.aws2-sns.override-endpoint* | Set the need for overidding
the endpoint. This option needs to be used in combination with
uriEndpointOverride option | false | Boolean
| *camel.component.aws2-sns.policy* | The policy for this topic. Is loaded by
default from classpath, but you can prefix with classpath:, file:, or http: to
load the resource from different systems. | | String
| *camel.component.aws2-sns.proxy-host* | To define a proxy host when
instantiating the SNS client | | String
| *camel.component.aws2-sns.proxy-port* | To define a proxy port when
instantiating the SNS client | | Integer
@@ -46,6 +47,7 @@ The component supports 23 options, which are listed below.
| *camel.component.aws2-sns.subject* | The subject which is used if the
message header 'CamelAwsSnsSubject' is not present. | | String
| *camel.component.aws2-sns.subscribe-s-n-sto-s-q-s* | Define if the
subscription between SNS Topic and SQS must be done or not | false | Boolean
| *camel.component.aws2-sns.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-sns.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
| *camel.component.aws2-sns.use-default-credentials-provider* | Set whether
the SNS client should expect to load credentials on an AWS infra instance or to
expect static credentials to be passed in. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConfiguration.java
b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConfiguration.java
index 9c425d0..72dcb26 100644
---
a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConfiguration.java
@@ -89,6 +89,11 @@ public class Sns2ComponentConfiguration
*/
private String messageStructure;
/**
+ * Set the need for overidding the endpoint. This option needs to be used
in
+ * combination with uriEndpointOverride option
+ */
+ private Boolean overrideEndpoint = false;
+ /**
* The policy for this topic. Is loaded by default from classpath, but you
* can prefix with classpath:, file:, or http: to load the resource from
* different systems.
@@ -134,6 +139,11 @@ public class Sns2ComponentConfiguration
*/
private Boolean trustAllCertificates = false;
/**
+ * Set the overriding uri endpoint. This option needs to be used in
+ * combination with overrideEndpoint option
+ */
+ private String uriEndpointOverride;
+ /**
* Set whether the SNS client should expect to load credentials on an AWS
* infra instance or to expect static credentials to be passed in.
*/
@@ -221,6 +231,14 @@ public class Sns2ComponentConfiguration
this.messageStructure = messageStructure;
}
+ public Boolean getOverrideEndpoint() {
+ return overrideEndpoint;
+ }
+
+ public void setOverrideEndpoint(Boolean overrideEndpoint) {
+ this.overrideEndpoint = overrideEndpoint;
+ }
+
public String getPolicy() {
return policy;
}
@@ -302,6 +320,14 @@ public class Sns2ComponentConfiguration
this.trustAllCertificates = trustAllCertificates;
}
+ public String getUriEndpointOverride() {
+ return uriEndpointOverride;
+ }
+
+ public void setUriEndpointOverride(String uriEndpointOverride) {
+ this.uriEndpointOverride = uriEndpointOverride;
+ }
+
public Boolean getUseDefaultCredentialsProvider() {
return useDefaultCredentialsProvider;
}
diff --git a/docs/modules/ROOT/pages/aws2-sns-starter.adoc
b/docs/modules/ROOT/pages/aws2-sns-starter.adoc
index 1cdb833..b6a6a5f 100644
--- a/docs/modules/ROOT/pages/aws2-sns-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-sns-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-sns with Spring Boot make sure to use the
following Maven depend
----
-The component supports 23 options, which are listed below.
+The component supports 25 options, which are listed below.
@@ -35,6 +35,7 @@ The component supports 23 options, which are listed below.
| *camel.component.aws2-sns.message-deduplication-id-strategy* | Only for FIFO
Topic. 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 | String
| *camel.component.aws2-sns.message-group-id-strategy* | Only for FIFO Topic.
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. | | String
| *camel.component.aws2-sns.message-structure* | The message structure to use
such as json | | String
+| *camel.component.aws2-sns.override-endpoint* | Set the need for overidding
the endpoint. This option needs to be used in combination with
uriEndpointOverride option | false | Boolean
| *camel.component.aws2-sns.policy* | The policy for this topic. Is loaded by
default from classpath, but you can prefix with classpath:, file:, or http: to
load the resource from different systems. | | String
| *camel.component.aws2-sns.proxy-host* | To define a proxy host when
instantiating the SNS client | | String
| *camel.component.aws2-sns.proxy-port* | To define a proxy port when
instantiating the SNS client | | Integer
@@ -46,6 +47,7 @@ The component supports 23 options, which are listed below.
| *camel.component.aws2-sns.subject* | The subject which is used if the
message header 'CamelAwsSnsSubject' is not present. | | String
| *camel.component.aws2-sns.subscribe-s-n-sto-s-q-s* | Define if the
subscription between SNS Topic and SQS must be done or not | false | Boolean
| *camel.component.aws2-sns.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-sns.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
| *camel.component.aws2-sns.use-default-credentials-provider* | Set whether
the SNS client should expect to load credentials on an AWS infra instance or to
expect static credentials to be passed in. | false | Boolean
|===
// spring-boot-auto-configure options: END
