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 b99af65 [create-pull-request] automated change
b99af65 is described below
commit b99af659a164da8bfc57b29ee0ad71824b8cfe8e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jan 20 01:10:01 2021 +0000
[create-pull-request] automated change
---
.../catalog/components/aws2-kinesis-firehose.json | 4 ++++
.../src/main/docs/aws2-kinesis-starter.adoc | 4 +++-
.../KinesisFirehose2ComponentConfiguration.java | 26 ++++++++++++++++++++++
docs/modules/ROOT/pages/aws2-kinesis-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-kinesis-firehose.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
index f6970d9..351780a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
@@ -25,6 +25,7 @@
"amazonKinesisFirehoseClient": { "kind": "property", "displayName":
"Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Amazon Kinesi [...]
"cborEnabled": { "kind": "property", "displayName": "Cbor Enabled",
"group": "common", "label": "common", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "This option will set the
CBOR_ENABLED property during the execution" },
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component configuration" },
+ "overrideEndpoint": { "kind": "property", "displayName": "Override
Endpoint", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Set the need for
overidding the endpoint. This option needs to be used in combi [...]
"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": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations", "enum":
[ "sendBatchRecord", "createDeliveryStream", "deleteDeliveryStream",
"describeDeliveryStream", "updateDestination" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose [...]
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis Firehose client" },
@@ -32,6 +33,7 @@
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol whe [...]
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "The region in which
Kinesis Firehose client needs to work. When using this parameter, the
configuration will expect the [...]
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "uriEndpointOverride": { "kind": "property", "displayName": "Uri Endpoint
Override", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Set the overriding uri
endpoint. This option needs to be used in combination with overr [...]
"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.firehose.KinesisFirehose2Configuration",
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" }
@@ -40,6 +42,7 @@
"streamName": { "kind": "path", "displayName": "Stream Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Name of the stream" },
"amazonKinesisFirehoseClient": { "kind": "parameter", "displayName":
"Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Amazon Kines [...]
"cborEnabled": { "kind": "parameter", "displayName": "Cbor Enabled",
"group": "common", "label": "common", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "This option will set the
CBOR_ENABLED property during the execution" },
+ "overrideEndpoint": { "kind": "parameter", "displayName": "Override
Endpoint", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Set the need for
overidding the endpoint. This option needs to be used in comb [...]
"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": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations", "enum":
[ "sendBatchRecord", "createDeliveryStream", "deleteDeliveryStream",
"describeDeliveryStream", "updateDestination" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehos [...]
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis Firehose client" },
@@ -47,6 +50,7 @@
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol wh [...]
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "The region in which
Kinesis Firehose client needs to work. When using this parameter, the
configuration will expect th [...]
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "uriEndpointOverride": { "kind": "parameter", "displayName": "Uri Endpoint
Override", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Set the overriding uri
endpoint. This option needs to be used in combination with over [...]
"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.firehose.KinesisFirehose2Configuration",
"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.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" }
}
diff --git
a/components-starter/camel-aws2-kinesis-starter/src/main/docs/aws2-kinesis-starter.adoc
b/components-starter/camel-aws2-kinesis-starter/src/main/docs/aws2-kinesis-starter.adoc
index 96a3f0e..9c07228 100644
---
a/components-starter/camel-aws2-kinesis-starter/src/main/docs/aws2-kinesis-starter.adoc
+++
b/components-starter/camel-aws2-kinesis-starter/src/main/docs/aws2-kinesis-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-kinesis with Spring Boot make sure to use the
following Maven de
----
-The component supports 35 options, which are listed below.
+The component supports 37 options, which are listed below.
@@ -32,12 +32,14 @@ The component supports 35 options, which are listed below.
| *camel.component.aws2-kinesis-firehose.enabled* | Whether to enable auto
configuration of the aws2-kinesis-firehose component. This is enabled by
default. | | Boolean
| *camel.component.aws2-kinesis-firehose.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 i [...]
| *camel.component.aws2-kinesis-firehose.operation* | The operation to do in
case the user don't want to send only a record | | KinesisFirehose2Operations
+| *camel.component.aws2-kinesis-firehose.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-kinesis-firehose.proxy-host* | To define a proxy host
when instantiating the Kinesis Firehose client | | String
| *camel.component.aws2-kinesis-firehose.proxy-port* | To define a proxy port
when instantiating the Kinesis Firehose client | | Integer
| *camel.component.aws2-kinesis-firehose.proxy-protocol* | To define a proxy
protocol when instantiating the Kinesis Firehose client | | Protocol
| *camel.component.aws2-kinesis-firehose.region* | The region in which Kinesis
Firehose 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-kinesis-firehose.secret-key* | Amazon AWS Secret Key |
| String
| *camel.component.aws2-kinesis-firehose.trust-all-certificates* | If we want
to trust all certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-kinesis-firehose.uri-endpoint-override* | Set the
overriding uri endpoint. This option needs to be used in combination with
overrideEndpoint option | | String
| *camel.component.aws2-kinesis.access-key* | Amazon AWS Access Key | | String
| *camel.component.aws2-kinesis.amazon-kinesis-client* | Amazon Kinesis client
to use for all requests for this endpoint. The option is a
software.amazon.awssdk.services.kinesis.KinesisClient type. | | KinesisClient
| *camel.component.aws2-kinesis.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
diff --git
a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java
b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java
index 728e219..45de5ce 100644
---
a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java
@@ -58,6 +58,11 @@ public class KinesisFirehose2ComponentConfiguration
*/
private KinesisFirehose2Configuration configuration;
/**
+ * Set the need for overidding the endpoint. This option needs to be used
in
+ * combination with uriEndpointOverride option
+ */
+ private Boolean overrideEndpoint = false;
+ /**
* 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
@@ -96,6 +101,11 @@ public class KinesisFirehose2ComponentConfiguration
*/
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
@@ -138,6 +148,14 @@ public class KinesisFirehose2ComponentConfiguration
this.configuration = configuration;
}
+ public Boolean getOverrideEndpoint() {
+ return overrideEndpoint;
+ }
+
+ public void setOverrideEndpoint(Boolean overrideEndpoint) {
+ this.overrideEndpoint = overrideEndpoint;
+ }
+
public Boolean getLazyStartProducer() {
return lazyStartProducer;
}
@@ -194,6 +212,14 @@ public class KinesisFirehose2ComponentConfiguration
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-kinesis-starter.adoc
b/docs/modules/ROOT/pages/aws2-kinesis-starter.adoc
index 96a3f0e..9c07228 100644
--- a/docs/modules/ROOT/pages/aws2-kinesis-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-kinesis-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-kinesis with Spring Boot make sure to use the
following Maven de
----
-The component supports 35 options, which are listed below.
+The component supports 37 options, which are listed below.
@@ -32,12 +32,14 @@ The component supports 35 options, which are listed below.
| *camel.component.aws2-kinesis-firehose.enabled* | Whether to enable auto
configuration of the aws2-kinesis-firehose component. This is enabled by
default. | | Boolean
| *camel.component.aws2-kinesis-firehose.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 i [...]
| *camel.component.aws2-kinesis-firehose.operation* | The operation to do in
case the user don't want to send only a record | | KinesisFirehose2Operations
+| *camel.component.aws2-kinesis-firehose.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-kinesis-firehose.proxy-host* | To define a proxy host
when instantiating the Kinesis Firehose client | | String
| *camel.component.aws2-kinesis-firehose.proxy-port* | To define a proxy port
when instantiating the Kinesis Firehose client | | Integer
| *camel.component.aws2-kinesis-firehose.proxy-protocol* | To define a proxy
protocol when instantiating the Kinesis Firehose client | | Protocol
| *camel.component.aws2-kinesis-firehose.region* | The region in which Kinesis
Firehose 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-kinesis-firehose.secret-key* | Amazon AWS Secret Key |
| String
| *camel.component.aws2-kinesis-firehose.trust-all-certificates* | If we want
to trust all certificates in case of overriding the endpoint | false | Boolean
+| *camel.component.aws2-kinesis-firehose.uri-endpoint-override* | Set the
overriding uri endpoint. This option needs to be used in combination with
overrideEndpoint option | | String
| *camel.component.aws2-kinesis.access-key* | Amazon AWS Access Key | | String
| *camel.component.aws2-kinesis.amazon-kinesis-client* | Amazon Kinesis client
to use for all requests for this endpoint. The option is a
software.amazon.awssdk.services.kinesis.KinesisClient type. | | KinesisClient
| *camel.component.aws2-kinesis.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
