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/10/12 16:18:47 UTC
[camel] branch master updated (d23efa9 -> 0aa7bd6)
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 d23efa9 Regen
new a48779e CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis
new dee2a10 CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis regen
new 7ef733f CAMEL-15647 - Regen catalog
new f137ea6 CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis-firehose
new 9c13168 CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis-firehose regen
new 0aa7bd6 CAMEL-15647 - Regen catalog
The 6 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:
.../catalog/components/aws2-kinesis-firehose.json | 2 +
.../camel/catalog/components/aws2-kinesis.json | 2 +
.../camel/catalog/docs/aws2-kinesis-component.adoc | 6 +-
.../docs/aws2-kinesis-firehose-component.adoc | 6 +-
.../KinesisFirehose2ComponentConfigurer.java | 5 ++
.../KinesisFirehose2EndpointConfigurer.java | 5 ++
.../KinesisFirehose2EndpointUriFactory.java | 3 +-
.../aws2/kinesis/Kinesis2ComponentConfigurer.java | 5 ++
.../aws2/kinesis/Kinesis2EndpointConfigurer.java | 5 ++
.../aws2/kinesis/Kinesis2EndpointUriFactory.java | 3 +-
.../aws2/firehose/aws2-kinesis-firehose.json | 2 +
.../camel/component/aws2/kinesis/aws2-kinesis.json | 2 +
.../src/main/docs/aws2-kinesis-component.adoc | 6 +-
.../main/docs/aws2-kinesis-firehose-component.adoc | 6 +-
.../firehose/KinesisFirehose2Configuration.java | 11 ++++
.../aws2/firehose/KinesisFirehose2Endpoint.java | 8 +++
.../aws2/kinesis/Kinesis2Configuration.java | 12 +++-
.../component/aws2/kinesis/Kinesis2Endpoint.java | 8 +++
.../dsl/Aws2KinesisComponentBuilderFactory.java | 13 ++++
...Aws2KinesisFirehoseComponentBuilderFactory.java | 14 +++++
.../dsl/Kinesis2EndpointBuilderFactory.java | 72 ++++++++++++++++++++++
.../KinesisFirehose2EndpointBuilderFactory.java | 24 ++++++++
.../modules/ROOT/pages/aws2-kinesis-component.adoc | 6 +-
.../pages/aws2-kinesis-firehose-component.adoc | 6 +-
24 files changed, 217 insertions(+), 15 deletions(-)
[camel] 03/06: CAMEL-15647 - Regen catalog
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 7ef733f24b1983dc8eaf029a17bedbb1bef483c7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 12 18:10:19 2020 +0200
CAMEL-15647 - Regen catalog
---
.../resources/org/apache/camel/catalog/components/aws2-kinesis.json | 2 ++
1 file changed, 2 insertions(+)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
index af983f5..bc8e0ce 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
@@ -24,6 +24,7 @@
"componentProperties": {
"amazonKinesisClient": { "kind": "property", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis client to use for all requests for this endpoint" },
"autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in th [...]
+ "cborEnabled": { "kind": "property", "displayName": "Cbor Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "This option will set the CBOR_ENABLED property during the execution" },
"configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "deprecated": false, "secret": false, "description": "Component configuration" },
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the Kinesis client" },
@@ -45,6 +46,7 @@
"streamName": { "kind": "path", "displayName": "Stream Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Name of the stream" },
"amazonKinesisClient": { "kind": "parameter", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis client to use for all requests for this endpoint" },
"autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in t [...]
+ "cborEnabled": { "kind": "parameter", "displayName": "Cbor Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "This option will set the CBOR_ENABLED property during the execution" },
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the Kinesis client" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the Kinesis cl [...]
[camel] 05/06: CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a
CborEnabled option explicitly, kinesis-firehose 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 9c131685c5242e2b73294f832bdabcce48a2e4ce
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 12 18:15:23 2020 +0200
CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis-firehose regen
---
.../docs/aws2-kinesis-firehose-component.adoc | 6 ++++--
.../KinesisFirehose2ComponentConfigurer.java | 5 +++++
.../KinesisFirehose2EndpointConfigurer.java | 5 +++++
.../KinesisFirehose2EndpointUriFactory.java | 3 ++-
.../aws2/firehose/aws2-kinesis-firehose.json | 2 ++
.../main/docs/aws2-kinesis-firehose-component.adoc | 6 ++++--
.../firehose/KinesisFirehose2Configuration.java | 6 +++---
.../aws2/firehose/KinesisFirehose2Endpoint.java | 4 ++--
...Aws2KinesisFirehoseComponentBuilderFactory.java | 14 +++++++++++++
.../KinesisFirehose2EndpointBuilderFactory.java | 24 ++++++++++++++++++++++
.../pages/aws2-kinesis-firehose-component.adoc | 6 ++++--
11 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-kinesis-firehose-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-kinesis-firehose-component.adoc
index 433528f..9f75f63 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-kinesis-firehose-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-kinesis-firehose-component.adoc
@@ -42,7 +42,7 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis Firehose component supports 13 options, which are listed below.
+The AWS 2 Kinesis Firehose component supports 14 options, which are listed below.
@@ -51,6 +51,7 @@ The AWS 2 Kinesis Firehose component supports 13 options, which are listed below
| Name | Description | Default | Type
| *amazonKinesisFirehoseClient* (producer) | Amazon Kinesis Firehose client to use for all requests for this endpoint | | FirehoseClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *configuration* (producer) | Component configuration | | KinesisFirehose2Configuration
| *lazyStartProducer* (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 then creating and [...]
| *operation* (producer) | The operation to do in case the user don't want to send only a record. There are 5 enums and the value can be one of: sendBatchRecord, createDeliveryStream, deleteDeliveryStream, describeDeliveryStream, updateDestination | | KinesisFirehose2Operations
@@ -90,7 +91,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (13 parameters):
+=== Query Parameters (14 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +99,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonKinesisFirehoseClient* (producer) | Amazon Kinesis Firehose client to use for all requests for this endpoint | | FirehoseClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *lazyStartProducer* (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 then creating and [...]
| *operation* (producer) | The operation to do in case the user don't want to send only a record. There are 5 enums and the value can be one of: sendBatchRecord, createDeliveryStream, deleteDeliveryStream, describeDeliveryStream, updateDestination | | KinesisFirehose2Operations
| *proxyHost* (producer) | To define a proxy host when instantiating the Kinesis Firehose client | | String
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
index 0795128..6595651 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
@@ -20,6 +20,7 @@ public class KinesisFirehose2ComponentConfigurer extends PropertyConfigurerSuppo
Map<String, Object> map = new CaseInsensitiveMap();
map.put("amazonKinesisFirehoseClient", software.amazon.awssdk.services.firehose.FirehoseClient.class);
map.put("autoDiscoverClient", boolean.class);
+ map.put("cborEnabled", boolean.class);
map.put("configuration", org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration.class);
map.put("lazyStartProducer", boolean.class);
map.put("operation", org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class);
@@ -53,6 +54,8 @@ public class KinesisFirehose2ComponentConfigurer extends PropertyConfigurerSuppo
case "autoDiscoverClient": getOrCreateConfiguration(target).setAutoDiscoverClient(property(camelContext, boolean.class, value)); return true;
case "basicpropertybinding":
case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
+ case "cborenabled":
+ case "cborEnabled": getOrCreateConfiguration(target).setCborEnabled(property(camelContext, boolean.class, value)); return true;
case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
@@ -89,6 +92,8 @@ public class KinesisFirehose2ComponentConfigurer extends PropertyConfigurerSuppo
case "autoDiscoverClient": return getOrCreateConfiguration(target).isAutoDiscoverClient();
case "basicpropertybinding":
case "basicPropertyBinding": return target.isBasicPropertyBinding();
+ case "cborenabled":
+ case "cborEnabled": return getOrCreateConfiguration(target).isCborEnabled();
case "configuration": return target.getConfiguration();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
index 0d243fa..7d402f9 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
@@ -21,6 +21,7 @@ public class KinesisFirehose2EndpointConfigurer extends PropertyConfigurerSuppor
map.put("streamName", java.lang.String.class);
map.put("amazonKinesisFirehoseClient", software.amazon.awssdk.services.firehose.FirehoseClient.class);
map.put("autoDiscoverClient", boolean.class);
+ map.put("cborEnabled", boolean.class);
map.put("lazyStartProducer", boolean.class);
map.put("operation", org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class);
map.put("proxyHost", java.lang.String.class);
@@ -47,6 +48,8 @@ public class KinesisFirehose2EndpointConfigurer extends PropertyConfigurerSuppor
case "autoDiscoverClient": target.getConfiguration().setAutoDiscoverClient(property(camelContext, boolean.class, value)); return true;
case "basicpropertybinding":
case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
+ case "cborenabled":
+ case "cborEnabled": target.getConfiguration().setCborEnabled(property(camelContext, boolean.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
case "operation": target.getConfiguration().setOperation(property(camelContext, org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class, value)); return true;
@@ -83,6 +86,8 @@ public class KinesisFirehose2EndpointConfigurer extends PropertyConfigurerSuppor
case "autoDiscoverClient": return target.getConfiguration().isAutoDiscoverClient();
case "basicpropertybinding":
case "basicPropertyBinding": return target.isBasicPropertyBinding();
+ case "cborenabled":
+ case "cborEnabled": return target.getConfiguration().isCborEnabled();
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
case "operation": return target.getConfiguration().getOperation();
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java
index 33f902a..cf53300 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java
@@ -20,7 +20,7 @@ public class KinesisFirehose2EndpointUriFactory extends org.apache.camel.support
private static final Set<String> PROPERTY_NAMES;
private static final Set<String> SECRET_PROPERTY_NAMES;
static {
- Set<String> props = new HashSet<>(14);
+ Set<String> props = new HashSet<>(15);
props.add("basicPropertyBinding");
props.add("autoDiscoverClient");
props.add("amazonKinesisFirehoseClient");
@@ -33,6 +33,7 @@ public class KinesisFirehose2EndpointUriFactory extends org.apache.camel.support
props.add("proxyPort");
props.add("lazyStartProducer");
props.add("accessKey");
+ props.add("cborEnabled");
props.add("region");
props.add("operation");
PROPERTY_NAMES = Collections.unmodifiableSet(props);
diff --git a/components/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/firehose/aws2-kinesis-firehose.json b/components/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/firehose/aws2-kinesis-firehose.json
index bc1fc30..71d1baf 100644
--- a/components/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/firehose/aws2-kinesis-firehose.json
+++ b/components/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/firehose/aws2-kinesis-firehose.json
@@ -24,6 +24,7 @@
"componentProperties": {
"amazonKinesisFirehoseClient": { "kind": "property", "displayName": "Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis Firehose client to use for all requests [...]
"autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client insta [...]
+ "cborEnabled": { "kind": "property", "displayName": "Cbor Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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, "secret": false, "description": "Component configuration" },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
"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, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "co [...]
@@ -40,6 +41,7 @@
"streamName": { "kind": "path", "displayName": "Stream Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "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, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis Firehose client to use for all requests [...]
"autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client inst [...]
+ "cborEnabled": { "kind": "parameter", "displayName": "Cbor Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the [...]
"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, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "c [...]
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": 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" },
diff --git a/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-firehose-component.adoc b/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-firehose-component.adoc
index 433528f..9f75f63 100644
--- a/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-firehose-component.adoc
+++ b/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-firehose-component.adoc
@@ -42,7 +42,7 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis Firehose component supports 13 options, which are listed below.
+The AWS 2 Kinesis Firehose component supports 14 options, which are listed below.
@@ -51,6 +51,7 @@ The AWS 2 Kinesis Firehose component supports 13 options, which are listed below
| Name | Description | Default | Type
| *amazonKinesisFirehoseClient* (producer) | Amazon Kinesis Firehose client to use for all requests for this endpoint | | FirehoseClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *configuration* (producer) | Component configuration | | KinesisFirehose2Configuration
| *lazyStartProducer* (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 then creating and [...]
| *operation* (producer) | The operation to do in case the user don't want to send only a record. There are 5 enums and the value can be one of: sendBatchRecord, createDeliveryStream, deleteDeliveryStream, describeDeliveryStream, updateDestination | | KinesisFirehose2Operations
@@ -90,7 +91,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (13 parameters):
+=== Query Parameters (14 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +99,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonKinesisFirehoseClient* (producer) | Amazon Kinesis Firehose client to use for all requests for this endpoint | | FirehoseClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *lazyStartProducer* (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 then creating and [...]
| *operation* (producer) | The operation to do in case the user don't want to send only a record. There are 5 enums and the value can be one of: sendBatchRecord, createDeliveryStream, deleteDeliveryStream, describeDeliveryStream, updateDestination | | KinesisFirehose2Operations
| *proxyHost* (producer) | To define a proxy host when instantiating the Kinesis Firehose client | | String
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
index 292a3b2..e162838 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
@@ -55,8 +55,8 @@ public class KinesisFirehose2Configuration implements Cloneable {
+ " look for a client instance in the registry automatically otherwise it will skip that checking")
private boolean autoDiscoverClient = true;
@UriParam(label = "common", defaultValue = "true",
- description = "This option will set the CBOR_ENABLED property during the execution")
- private boolean cborEnabled = true;
+ description = "This option will set the CBOR_ENABLED property during the execution")
+ private boolean cborEnabled = true;
public void setAmazonKinesisFirehoseClient(FirehoseClient client) {
this.amazonKinesisFirehoseClient = client;
@@ -145,7 +145,7 @@ public class KinesisFirehose2Configuration implements Cloneable {
public void setAutoDiscoverClient(boolean autoDiscoverClient) {
this.autoDiscoverClient = autoDiscoverClient;
}
-
+
public boolean isCborEnabled() {
return cborEnabled;
}
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
index 96a8a0a..07545be 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.aws2.firehose;
-import static software.amazon.awssdk.core.SdkSystemSetting.CBOR_ENABLED;
-
import java.net.URI;
import org.apache.camel.Category;
@@ -39,6 +37,8 @@ import software.amazon.awssdk.services.firehose.FirehoseClient;
import software.amazon.awssdk.services.firehose.FirehoseClientBuilder;
import software.amazon.awssdk.utils.AttributeMap;
+import static software.amazon.awssdk.core.SdkSystemSetting.CBOR_ENABLED;
+
/**
* Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x.
*/
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisFirehoseComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisFirehoseComponentBuilderFactory.java
index d32e8b8..d7090f6 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisFirehoseComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisFirehoseComponentBuilderFactory.java
@@ -79,6 +79,19 @@ public interface Aws2KinesisFirehoseComponentBuilderFactory {
return this;
}
/**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default Aws2KinesisFirehoseComponentBuilder cborEnabled(
+ boolean cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
* Component configuration.
*
* The option is a:
@@ -261,6 +274,7 @@ public interface Aws2KinesisFirehoseComponentBuilderFactory {
switch (name) {
case "amazonKinesisFirehoseClient": getOrCreateConfiguration((KinesisFirehose2Component) component).setAmazonKinesisFirehoseClient((software.amazon.awssdk.services.firehose.FirehoseClient) value); return true;
case "autoDiscoverClient": getOrCreateConfiguration((KinesisFirehose2Component) component).setAutoDiscoverClient((boolean) value); return true;
+ case "cborEnabled": getOrCreateConfiguration((KinesisFirehose2Component) component).setCborEnabled((boolean) value); return true;
case "configuration": ((KinesisFirehose2Component) component).setConfiguration((org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration) value); return true;
case "lazyStartProducer": ((KinesisFirehose2Component) component).setLazyStartProducer((boolean) value); return true;
case "operation": getOrCreateConfiguration((KinesisFirehose2Component) component).setOperation((org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations) value); return true;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
index 64b5d85..e5af6c9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
@@ -100,6 +100,30 @@ public interface KinesisFirehose2EndpointBuilderFactory {
return this;
}
/**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default KinesisFirehose2EndpointBuilder cborEnabled(boolean cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default KinesisFirehose2EndpointBuilder cborEnabled(String cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
* 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
diff --git a/docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc b/docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc
index d509a33..6ad4277 100644
--- a/docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-kinesis-firehose-component.adoc
@@ -44,7 +44,7 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis Firehose component supports 13 options, which are listed below.
+The AWS 2 Kinesis Firehose component supports 14 options, which are listed below.
@@ -53,6 +53,7 @@ The AWS 2 Kinesis Firehose component supports 13 options, which are listed below
| Name | Description | Default | Type
| *amazonKinesisFirehoseClient* (producer) | Amazon Kinesis Firehose client to use for all requests for this endpoint | | FirehoseClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *configuration* (producer) | Component configuration | | KinesisFirehose2Configuration
| *lazyStartProducer* (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 then creating and [...]
| *operation* (producer) | The operation to do in case the user don't want to send only a record. There are 5 enums and the value can be one of: sendBatchRecord, createDeliveryStream, deleteDeliveryStream, describeDeliveryStream, updateDestination | | KinesisFirehose2Operations
@@ -92,7 +93,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (13 parameters):
+=== Query Parameters (14 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -100,6 +101,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonKinesisFirehoseClient* (producer) | Amazon Kinesis Firehose client to use for all requests for this endpoint | | FirehoseClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *lazyStartProducer* (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 then creating and [...]
| *operation* (producer) | The operation to do in case the user don't want to send only a record. There are 5 enums and the value can be one of: sendBatchRecord, createDeliveryStream, deleteDeliveryStream, describeDeliveryStream, updateDestination | | KinesisFirehose2Operations
| *proxyHost* (producer) | To define a proxy host when instantiating the Kinesis Firehose client | | String
[camel] 04/06: CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a
CborEnabled option explicitly, kinesis-firehose
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 f137ea6487de5152700ac14ee66f30de42643c24
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 12 18:14:36 2020 +0200
CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis-firehose
---
.../aws2/firehose/KinesisFirehose2Configuration.java | 11 +++++++++++
.../component/aws2/firehose/KinesisFirehose2Endpoint.java | 8 ++++++++
2 files changed, 19 insertions(+)
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
index 2317d12..292a3b2 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
@@ -54,6 +54,9 @@ public class KinesisFirehose2Configuration implements Cloneable {
description = "Setting the autoDiscoverClient mechanism, if true, the component will "
+ " look for a client instance in the registry automatically otherwise it will skip that checking")
private boolean autoDiscoverClient = true;
+ @UriParam(label = "common", defaultValue = "true",
+ description = "This option will set the CBOR_ENABLED property during the execution")
+ private boolean cborEnabled = true;
public void setAmazonKinesisFirehoseClient(FirehoseClient client) {
this.amazonKinesisFirehoseClient = client;
@@ -142,6 +145,14 @@ public class KinesisFirehose2Configuration implements Cloneable {
public void setAutoDiscoverClient(boolean autoDiscoverClient) {
this.autoDiscoverClient = autoDiscoverClient;
}
+
+ public boolean isCborEnabled() {
+ return cborEnabled;
+ }
+
+ public void setCborEnabled(boolean cborEnabled) {
+ this.cborEnabled = cborEnabled;
+ }
// *************************************************
//
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
index 757542a..96a8a0a 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.aws2.firehose;
+import static software.amazon.awssdk.core.SdkSystemSetting.CBOR_ENABLED;
+
import java.net.URI;
import org.apache.camel.Category;
@@ -70,6 +72,9 @@ public class KinesisFirehose2Endpoint extends DefaultEndpoint {
@Override
protected void doStart() throws Exception {
super.doStart();
+ if (!configuration.isCborEnabled()) {
+ System.setProperty(CBOR_ENABLED.property(), "false");
+ }
kinesisFirehoseClient = configuration.getAmazonKinesisFirehoseClient() != null
? configuration.getAmazonKinesisFirehoseClient() : createKinesisFirehoseClient();
@@ -82,6 +87,9 @@ public class KinesisFirehose2Endpoint extends DefaultEndpoint {
kinesisFirehoseClient.close();
}
}
+ if (!configuration.isCborEnabled()) {
+ System.clearProperty(CBOR_ENABLED.property());
+ }
super.doStop();
}
[camel] 06/06: CAMEL-15647 - Regen catalog
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 0aa7bd6d9daf5b71f8486bd7fbecdda20f2aad98
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 12 18:17:33 2020 +0200
CAMEL-15647 - Regen catalog
---
.../org/apache/camel/catalog/components/aws2-kinesis-firehose.json | 2 ++
1 file changed, 2 insertions(+)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
index bc1fc30..71d1baf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
@@ -24,6 +24,7 @@
"componentProperties": {
"amazonKinesisFirehoseClient": { "kind": "property", "displayName": "Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis Firehose client to use for all requests [...]
"autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client insta [...]
+ "cborEnabled": { "kind": "property", "displayName": "Cbor Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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, "secret": false, "description": "Component configuration" },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
"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, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "co [...]
@@ -40,6 +41,7 @@
"streamName": { "kind": "path", "displayName": "Stream Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "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, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis Firehose client to use for all requests [...]
"autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client inst [...]
+ "cborEnabled": { "kind": "parameter", "displayName": "Cbor Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the [...]
"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, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "c [...]
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": 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" },
[camel] 02/06: CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a
CborEnabled option explicitly, kinesis 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 dee2a10973cd74b8582def3fac64248ddb15cb0c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 12 18:09:22 2020 +0200
CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis regen
---
.../camel/catalog/docs/aws2-kinesis-component.adoc | 6 +-
.../aws2/kinesis/Kinesis2ComponentConfigurer.java | 5 ++
.../aws2/kinesis/Kinesis2EndpointConfigurer.java | 5 ++
.../aws2/kinesis/Kinesis2EndpointUriFactory.java | 3 +-
.../camel/component/aws2/kinesis/aws2-kinesis.json | 2 +
.../src/main/docs/aws2-kinesis-component.adoc | 6 +-
.../aws2/kinesis/Kinesis2Configuration.java | 18 +++---
.../component/aws2/kinesis/Kinesis2Endpoint.java | 4 +-
.../dsl/Aws2KinesisComponentBuilderFactory.java | 13 ++++
.../dsl/Kinesis2EndpointBuilderFactory.java | 72 ++++++++++++++++++++++
.../modules/ROOT/pages/aws2-kinesis-component.adoc | 6 +-
11 files changed, 122 insertions(+), 18 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-kinesis-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-kinesis-component.adoc
index cd134c2..6eb04b2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-kinesis-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-kinesis-component.adoc
@@ -43,7 +43,7 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis component supports 18 options, which are listed below.
+The AWS 2 Kinesis component supports 19 options, which are listed below.
@@ -52,6 +52,7 @@ The AWS 2 Kinesis component supports 18 options, which are listed below.
| Name | Description | Default | Type
| *amazonKinesisClient* (common) | Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *configuration* (common) | Component configuration | | Kinesis2Configuration
| *proxyHost* (common) | To define a proxy host when instantiating the Kinesis client | | String
| *proxyPort* (common) | To define a proxy port when instantiating the Kinesis client | | Integer
@@ -96,7 +97,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (36 parameters):
+=== Query Parameters (37 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -104,6 +105,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonKinesisClient* (common) | Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *proxyHost* (common) | To define a proxy host when instantiating the Kinesis client | | String
| *proxyPort* (common) | To define a proxy port when instantiating the Kinesis client | | Integer
| *proxyProtocol* (common) | To define a proxy protocol when instantiating the Kinesis client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
index 59d9784..489b236 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
@@ -20,6 +20,7 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
Map<String, Object> map = new CaseInsensitiveMap();
map.put("amazonKinesisClient", software.amazon.awssdk.services.kinesis.KinesisClient.class);
map.put("autoDiscoverClient", boolean.class);
+ map.put("cborEnabled", boolean.class);
map.put("configuration", org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class);
map.put("proxyHost", java.lang.String.class);
map.put("proxyPort", java.lang.Integer.class);
@@ -60,6 +61,8 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
case "bridgeerrorhandler":
case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
+ case "cborenabled":
+ case "cborEnabled": getOrCreateConfiguration(target).setCborEnabled(property(camelContext, boolean.class, value)); return true;
case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class, value)); return true;
case "iteratortype":
case "iteratorType": getOrCreateConfiguration(target).setIteratorType(property(camelContext, software.amazon.awssdk.services.kinesis.model.ShardIteratorType.class, value)); return true;
@@ -107,6 +110,8 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
case "basicPropertyBinding": return target.isBasicPropertyBinding();
case "bridgeerrorhandler":
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
+ case "cborenabled":
+ case "cborEnabled": return getOrCreateConfiguration(target).isCborEnabled();
case "configuration": return target.getConfiguration();
case "iteratortype":
case "iteratorType": return getOrCreateConfiguration(target).getIteratorType();
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
index 70d2655..bf0bba7 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
@@ -21,6 +21,7 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
map.put("streamName", java.lang.String.class);
map.put("amazonKinesisClient", software.amazon.awssdk.services.kinesis.KinesisClient.class);
map.put("autoDiscoverClient", boolean.class);
+ map.put("cborEnabled", boolean.class);
map.put("proxyHost", java.lang.String.class);
map.put("proxyPort", java.lang.Integer.class);
map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
@@ -78,6 +79,8 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
case "bridgeerrorhandler":
case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
+ case "cborenabled":
+ case "cborEnabled": target.getConfiguration().setCborEnabled(property(camelContext, boolean.class, value)); return true;
case "delay": target.setDelay(property(camelContext, long.class, value)); return true;
case "exceptionhandler":
case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
@@ -158,6 +161,8 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
case "basicPropertyBinding": return target.isBasicPropertyBinding();
case "bridgeerrorhandler":
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
+ case "cborenabled":
+ case "cborEnabled": return target.getConfiguration().isCborEnabled();
case "delay": return target.getDelay();
case "exceptionhandler":
case "exceptionHandler": return target.getExceptionHandler();
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java
index d0ebd0a..748a6b3 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java
@@ -20,7 +20,7 @@ public class Kinesis2EndpointUriFactory extends org.apache.camel.support.compone
private static final Set<String> PROPERTY_NAMES;
private static final Set<String> SECRET_PROPERTY_NAMES;
static {
- Set<String> props = new HashSet<>(37);
+ Set<String> props = new HashSet<>(38);
props.add("basicPropertyBinding");
props.add("backoffMultiplier");
props.add("synchronous");
@@ -32,6 +32,7 @@ public class Kinesis2EndpointUriFactory extends org.apache.camel.support.compone
props.add("runLoggingLevel");
props.add("backoffErrorThreshold");
props.add("amazonKinesisClient");
+ props.add("cborEnabled");
props.add("greedy");
props.add("shardClosed");
props.add("scheduledExecutorService");
diff --git a/components/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/kinesis/aws2-kinesis.json b/components/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/kinesis/aws2-kinesis.json
index af983f5..bc8e0ce 100644
--- a/components/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/kinesis/aws2-kinesis.json
+++ b/components/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/kinesis/aws2-kinesis.json
@@ -24,6 +24,7 @@
"componentProperties": {
"amazonKinesisClient": { "kind": "property", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis client to use for all requests for this endpoint" },
"autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in th [...]
+ "cborEnabled": { "kind": "property", "displayName": "Cbor Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "This option will set the CBOR_ENABLED property during the execution" },
"configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "deprecated": false, "secret": false, "description": "Component configuration" },
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the Kinesis client" },
@@ -45,6 +46,7 @@
"streamName": { "kind": "path", "displayName": "Stream Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Name of the stream" },
"amazonKinesisClient": { "kind": "parameter", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis client to use for all requests for this endpoint" },
"autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in t [...]
+ "cborEnabled": { "kind": "parameter", "displayName": "Cbor Enabled", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "This option will set the CBOR_ENABLED property during the execution" },
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the Kinesis client" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the Kinesis cl [...]
diff --git a/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-component.adoc b/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-component.adoc
index cd134c2..6eb04b2 100644
--- a/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-component.adoc
+++ b/components/camel-aws2-kinesis/src/main/docs/aws2-kinesis-component.adoc
@@ -43,7 +43,7 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis component supports 18 options, which are listed below.
+The AWS 2 Kinesis component supports 19 options, which are listed below.
@@ -52,6 +52,7 @@ The AWS 2 Kinesis component supports 18 options, which are listed below.
| Name | Description | Default | Type
| *amazonKinesisClient* (common) | Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *configuration* (common) | Component configuration | | Kinesis2Configuration
| *proxyHost* (common) | To define a proxy host when instantiating the Kinesis client | | String
| *proxyPort* (common) | To define a proxy port when instantiating the Kinesis client | | Integer
@@ -96,7 +97,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (36 parameters):
+=== Query Parameters (37 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -104,6 +105,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonKinesisClient* (common) | Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *proxyHost* (common) | To define a proxy host when instantiating the Kinesis client | | String
| *proxyPort* (common) | To define a proxy port when instantiating the Kinesis client | | Integer
| *proxyProtocol* (common) | To define a proxy protocol when instantiating the Kinesis client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java
index d1607f5..f202e61 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java
@@ -70,8 +70,8 @@ public class Kinesis2Configuration implements Cloneable {
description = "Setting the autoDiscoverClient mechanism, if true, the component will "
+ " look for a client instance in the registry automatically otherwise it will skip that checking")
private boolean autoDiscoverClient = true;
- @UriParam(label = "common", defaultValue = "true",
- description = "This option will set the CBOR_ENABLED property during the execution")
+ @UriParam(label = "common", defaultValue = "true",
+ description = "This option will set the CBOR_ENABLED property during the execution")
private boolean cborEnabled = true;
public KinesisClient getAmazonKinesisClient() {
@@ -193,19 +193,19 @@ public class Kinesis2Configuration implements Cloneable {
public void setAutoDiscoverClient(boolean autoDiscoverClient) {
this.autoDiscoverClient = autoDiscoverClient;
}
-
+
public boolean isCborEnabled() {
- return cborEnabled;
- }
+ return cborEnabled;
+ }
- public void setCborEnabled(boolean cborEnabled) {
- this.cborEnabled = cborEnabled;
- }
+ public void setCborEnabled(boolean cborEnabled) {
+ this.cborEnabled = cborEnabled;
+ }
// *************************************************
//
// *************************************************
- public Kinesis2Configuration copy() {
+ public Kinesis2Configuration copy() {
try {
return (Kinesis2Configuration) super.clone();
} catch (CloneNotSupportedException e) {
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
index 20c8433..4f1ea9b 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
@@ -63,7 +63,7 @@ public class Kinesis2Endpoint extends ScheduledPollEndpoint {
protected void doStart() throws Exception {
super.doStart();
if (!configuration.isCborEnabled()) {
- System.setProperty(CBOR_ENABLED.property(), "false");
+ System.setProperty(CBOR_ENABLED.property(), "false");
}
kinesisClient = configuration.getAmazonKinesisClient() != null
? configuration.getAmazonKinesisClient() : createKinesisClient();
@@ -84,7 +84,7 @@ public class Kinesis2Endpoint extends ScheduledPollEndpoint {
}
}
if (!configuration.isCborEnabled()) {
- System.clearProperty(CBOR_ENABLED.property());
+ System.clearProperty(CBOR_ENABLED.property());
}
super.doStop();
}
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisComponentBuilderFactory.java
index 1f95272..39de344 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisComponentBuilderFactory.java
@@ -80,6 +80,18 @@ public interface Aws2KinesisComponentBuilderFactory {
return this;
}
/**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default Aws2KinesisComponentBuilder cborEnabled(boolean cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
* Component configuration.
*
* The option is a:
@@ -330,6 +342,7 @@ public interface Aws2KinesisComponentBuilderFactory {
switch (name) {
case "amazonKinesisClient": getOrCreateConfiguration((Kinesis2Component) component).setAmazonKinesisClient((software.amazon.awssdk.services.kinesis.KinesisClient) value); return true;
case "autoDiscoverClient": getOrCreateConfiguration((Kinesis2Component) component).setAutoDiscoverClient((boolean) value); return true;
+ case "cborEnabled": getOrCreateConfiguration((Kinesis2Component) component).setCborEnabled((boolean) value); return true;
case "configuration": ((Kinesis2Component) component).setConfiguration((org.apache.camel.component.aws2.kinesis.Kinesis2Configuration) value); return true;
case "proxyHost": getOrCreateConfiguration((Kinesis2Component) component).setProxyHost((java.lang.String) value); return true;
case "proxyPort": getOrCreateConfiguration((Kinesis2Component) component).setProxyPort((java.lang.Integer) value); return true;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
index 5a662e5..7da8414 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
@@ -106,6 +106,30 @@ public interface Kinesis2EndpointBuilderFactory {
return this;
}
/**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default Kinesis2EndpointConsumerBuilder cborEnabled(boolean cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default Kinesis2EndpointConsumerBuilder cborEnabled(String cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
* To define a proxy host when instantiating the Kinesis client.
*
* The option is a: <code>java.lang.String</code> type.
@@ -1023,6 +1047,30 @@ public interface Kinesis2EndpointBuilderFactory {
return this;
}
/**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default Kinesis2EndpointProducerBuilder cborEnabled(boolean cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default Kinesis2EndpointProducerBuilder cborEnabled(String cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
* To define a proxy host when instantiating the Kinesis client.
*
* The option is a: <code>java.lang.String</code> type.
@@ -1328,6 +1376,30 @@ public interface Kinesis2EndpointBuilderFactory {
return this;
}
/**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default Kinesis2EndpointBuilder cborEnabled(boolean cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
+ * This option will set the CBOR_ENABLED property during the execution.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default Kinesis2EndpointBuilder cborEnabled(String cborEnabled) {
+ doSetProperty("cborEnabled", cborEnabled);
+ return this;
+ }
+ /**
* To define a proxy host when instantiating the Kinesis client.
*
* The option is a: <code>java.lang.String</code> type.
diff --git a/docs/components/modules/ROOT/pages/aws2-kinesis-component.adoc b/docs/components/modules/ROOT/pages/aws2-kinesis-component.adoc
index 15e7a8f..9b2001e 100644
--- a/docs/components/modules/ROOT/pages/aws2-kinesis-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-kinesis-component.adoc
@@ -45,7 +45,7 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis component supports 18 options, which are listed below.
+The AWS 2 Kinesis component supports 19 options, which are listed below.
@@ -54,6 +54,7 @@ The AWS 2 Kinesis component supports 18 options, which are listed below.
| Name | Description | Default | Type
| *amazonKinesisClient* (common) | Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *configuration* (common) | Component configuration | | Kinesis2Configuration
| *proxyHost* (common) | To define a proxy host when instantiating the Kinesis client | | String
| *proxyPort* (common) | To define a proxy port when instantiating the Kinesis client | | Integer
@@ -98,7 +99,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (36 parameters):
+=== Query Parameters (37 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -106,6 +107,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonKinesisClient* (common) | Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean
+| *cborEnabled* (common) | This option will set the CBOR_ENABLED property during the execution | true | boolean
| *proxyHost* (common) | To define a proxy host when instantiating the Kinesis client | | String
| *proxyPort* (common) | To define a proxy port when instantiating the Kinesis client | | Integer
| *proxyProtocol* (common) | To define a proxy protocol when instantiating the Kinesis client. There are 2 enums and the value can be one of: HTTP, HTTPS | HTTPS | Protocol
[camel] 01/06: CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a
CborEnabled option explicitly, kinesis
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 a48779e221f0f837650d19b6f41b43cc616f750f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 12 18:07:23 2020 +0200
CAMEL-15647 - Camel-AWS2-Kinesis-*: Added a CborEnabled option explicitly, kinesis
---
.../component/aws2/kinesis/Kinesis2Configuration.java | 14 ++++++++++++--
.../camel/component/aws2/kinesis/Kinesis2Endpoint.java | 8 ++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java
index d978969..d1607f5 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java
@@ -70,6 +70,9 @@ public class Kinesis2Configuration implements Cloneable {
description = "Setting the autoDiscoverClient mechanism, if true, the component will "
+ " look for a client instance in the registry automatically otherwise it will skip that checking")
private boolean autoDiscoverClient = true;
+ @UriParam(label = "common", defaultValue = "true",
+ description = "This option will set the CBOR_ENABLED property during the execution")
+ private boolean cborEnabled = true;
public KinesisClient getAmazonKinesisClient() {
return amazonKinesisClient;
@@ -190,12 +193,19 @@ public class Kinesis2Configuration implements Cloneable {
public void setAutoDiscoverClient(boolean autoDiscoverClient) {
this.autoDiscoverClient = autoDiscoverClient;
}
+
+ public boolean isCborEnabled() {
+ return cborEnabled;
+ }
+
+ public void setCborEnabled(boolean cborEnabled) {
+ this.cborEnabled = cborEnabled;
+ }
// *************************************************
//
// *************************************************
-
- public Kinesis2Configuration copy() {
+ public Kinesis2Configuration copy() {
try {
return (Kinesis2Configuration) super.clone();
} catch (CloneNotSupportedException e) {
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
index 072e8bb..20c8433 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
@@ -40,6 +40,8 @@ import software.amazon.awssdk.services.kinesis.model.Record;
import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
import software.amazon.awssdk.utils.AttributeMap;
+import static software.amazon.awssdk.core.SdkSystemSetting.CBOR_ENABLED;
+
/**
* Consume and produce records from and to AWS Kinesis Streams using AWS SDK version 2.x.
*/
@@ -60,6 +62,9 @@ public class Kinesis2Endpoint extends ScheduledPollEndpoint {
@Override
protected void doStart() throws Exception {
super.doStart();
+ if (!configuration.isCborEnabled()) {
+ System.setProperty(CBOR_ENABLED.property(), "false");
+ }
kinesisClient = configuration.getAmazonKinesisClient() != null
? configuration.getAmazonKinesisClient() : createKinesisClient();
@@ -78,6 +83,9 @@ public class Kinesis2Endpoint extends ScheduledPollEndpoint {
kinesisClient.close();
}
}
+ if (!configuration.isCborEnabled()) {
+ System.clearProperty(CBOR_ENABLED.property());
+ }
super.doStop();
}