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 5046c59 Regen
5046c59 is described below
commit 5046c596fcaaa854ad5a482d7a085289473221c9
Author: Andrea Cosentino <[email protected]>
AuthorDate: Tue Mar 2 14:38:02 2021 +0100
Regen
---
.../springboot/catalog/components/aws2-mq.json | 4 ++++
.../springboot/catalog/components/couchbase.json | 2 +-
.../src/main/docs/aws2-mq-starter.adoc | 4 +++-
.../mq/springboot/MQ2ComponentConfiguration.java | 26 ++++++++++++++++++++++
docs/modules/ROOT/pages/aws2-mq-starter.adoc | 4 +++-
5 files changed, 37 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-mq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-mq.json
index ee42c54..f6d254a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-mq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-mq.json
@@ -26,12 +26,14 @@
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.mq.MQ2Configuration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component configuration" },
"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 [...]
"operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.mq.MQ2Operations", "enum": [ "listBrokers",
"createBroker", "deleteBroker", "rebootBroker", "updateBroker",
"describeBroker" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField": "c
[...]
+ "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.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpoint [...]
"pojoRequest": { "kind": "property", "displayName": "Pojo Request",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"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.mq.MQ2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the MQ 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.mq.MQ2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the MQ client" },
"proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"HTTPS", "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "To define a proxy protocol when instantiating
the [...]
"region": { "kind": "property", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.mq.MQ2Configuration",
"configurationField": "configuration", "description": "The region in which MQ
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the region (fo [...]
"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.mq.MQ2Configuration", "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.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
"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.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "property", "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.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
@@ -41,12 +43,14 @@
"amazonMqClient": { "kind": "parameter", "displayName": "Amazon Mq
Client", "group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.services.mq.MqClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.mq.MQ2Configuration",
"configurationField": "configuration", "description": "To use a existing
configured AmazonMQClient as client" },
"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 [...]
"operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.mq.MQ2Operations", "enum": [ "listBrokers",
"createBroker", "deleteBroker", "rebootBroker", "updateBroker",
"describeBroker" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField": "
[...]
+ "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.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpoin [...]
"pojoRequest": { "kind": "parameter", "displayName": "Pojo Request",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"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.mq.MQ2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the MQ 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.mq.MQ2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the MQ client" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"HTTPS", "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "To define a proxy protocol when instantiating
th [...]
"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.mq.MQ2Configuration",
"configurationField": "configuration", "description": "The region in which MQ
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the region (f [...]
"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.mq.MQ2Configuration", "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.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
"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.mq.MQ2Configuration", "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.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
index 2cc8742..ba94a5d 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
@@ -14,7 +14,7 @@
"version": "3.9.0-SNAPSHOT",
"scheme": "couchbase",
"extendsScheme": "",
- "syntax": "couchbase:protocol:hostname:port",
+ "syntax": "couchbase:protocol:\/\/hostname:port",
"async": false,
"api": false,
"consumerOnly": false,
diff --git
a/components-starter/camel-aws2-mq-starter/src/main/docs/aws2-mq-starter.adoc
b/components-starter/camel-aws2-mq-starter/src/main/docs/aws2-mq-starter.adoc
index 493f734..ec53a1e 100644
---
a/components-starter/camel-aws2-mq-starter/src/main/docs/aws2-mq-starter.adoc
+++
b/components-starter/camel-aws2-mq-starter/src/main/docs/aws2-mq-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-mq with Spring Boot make sure to use the
following Maven depende
----
-The component supports 14 options, which are listed below.
+The component supports 16 options, which are listed below.
@@ -31,6 +31,7 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-mq.enabled* | Whether to enable auto configuration of
the aws2-mq component. This is enabled by default. | | Boolean
| *camel.component.aws2-mq.lazy-start-producer* | 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 starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed th [...]
| *camel.component.aws2-mq.operation* | The operation to perform. It can be
listBrokers,createBroker,deleteBroker | | MQ2Operations
+| *camel.component.aws2-mq.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-mq.pojo-request* | If we want to use a POJO request as
body or not | false | Boolean
| *camel.component.aws2-mq.proxy-host* | To define a proxy host when
instantiating the MQ client | | String
| *camel.component.aws2-mq.proxy-port* | To define a proxy port when
instantiating the MQ client | | Integer
@@ -38,5 +39,6 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-mq.region* | The region in which MQ client needs to
work. When using this parameter, the configuration will expect the lowercase
name of the region (for example ap-east-1) You'll need to use the name
Region.EU_WEST_1.id() | | String
| *camel.component.aws2-mq.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-mq.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-mq.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConfiguration.java
b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConfiguration.java
index 43b6bc9..83b17ab 100644
---
a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConfiguration.java
@@ -67,6 +67,11 @@ public class MQ2ComponentConfiguration
*/
private MQ2Operations operation;
/**
+ * Set the need for overidding the endpoint. This option needs to be used
in
+ * combination with uriEndpointOverride option
+ */
+ private Boolean overrideEndpoint = false;
+ /**
* If we want to use a POJO request as body or not
*/
private Boolean pojoRequest = false;
@@ -93,6 +98,11 @@ public class MQ2ComponentConfiguration
*/
private Boolean trustAllCertificates = false;
/**
+ * Set the overriding uri endpoint. This option needs to be used in
+ * combination with overrideEndpoint option
+ */
+ private String uriEndpointOverride;
+ /**
* 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
@@ -142,6 +152,14 @@ public class MQ2ComponentConfiguration
this.operation = operation;
}
+ public Boolean getOverrideEndpoint() {
+ return overrideEndpoint;
+ }
+
+ public void setOverrideEndpoint(Boolean overrideEndpoint) {
+ this.overrideEndpoint = overrideEndpoint;
+ }
+
public Boolean getPojoRequest() {
return pojoRequest;
}
@@ -190,6 +208,14 @@ public class MQ2ComponentConfiguration
this.trustAllCertificates = trustAllCertificates;
}
+ public String getUriEndpointOverride() {
+ return uriEndpointOverride;
+ }
+
+ public void setUriEndpointOverride(String uriEndpointOverride) {
+ this.uriEndpointOverride = uriEndpointOverride;
+ }
+
public Boolean getAutowiredEnabled() {
return autowiredEnabled;
}
diff --git a/docs/modules/ROOT/pages/aws2-mq-starter.adoc
b/docs/modules/ROOT/pages/aws2-mq-starter.adoc
index 493f734..ec53a1e 100644
--- a/docs/modules/ROOT/pages/aws2-mq-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-mq-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-mq with Spring Boot make sure to use the
following Maven depende
----
-The component supports 14 options, which are listed below.
+The component supports 16 options, which are listed below.
@@ -31,6 +31,7 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-mq.enabled* | Whether to enable auto configuration of
the aws2-mq component. This is enabled by default. | | Boolean
| *camel.component.aws2-mq.lazy-start-producer* | 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 starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed th [...]
| *camel.component.aws2-mq.operation* | The operation to perform. It can be
listBrokers,createBroker,deleteBroker | | MQ2Operations
+| *camel.component.aws2-mq.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-mq.pojo-request* | If we want to use a POJO request as
body or not | false | Boolean
| *camel.component.aws2-mq.proxy-host* | To define a proxy host when
instantiating the MQ client | | String
| *camel.component.aws2-mq.proxy-port* | To define a proxy port when
instantiating the MQ client | | Integer
@@ -38,5 +39,6 @@ The component supports 14 options, which are listed below.
| *camel.component.aws2-mq.region* | The region in which MQ client needs to
work. When using this parameter, the configuration will expect the lowercase
name of the region (for example ap-east-1) You'll need to use the name
Region.EU_WEST_1.id() | | String
| *camel.component.aws2-mq.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-mq.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-mq.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
|===
// spring-boot-auto-configure options: END
