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/11/16 16:59:10 UTC
[camel] branch master updated (b3ec175 -> 60a289b)
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 b3ec175 CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis Firehose client, added note to migration guide
new bc8fa17 CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis client
new ab88d89 CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis client, regen configurers and component
new ce3b0b7 CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis client, regen catalog
new 60a289b CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis client, added a note to migration guide
The 4 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:
.../camel/catalog/components/aws2-kinesis.json | 6 +-
.../camel/catalog/docs/aws2-kinesis-component.adoc | 10 +--
.../aws2/kinesis/Kinesis2ComponentConfigurer.java | 11 ++-
.../aws2/kinesis/Kinesis2EndpointConfigurer.java | 11 ++-
.../aws2/kinesis/Kinesis2EndpointUriFactory.java | 3 +-
.../camel/component/aws2/kinesis/aws2-kinesis.json | 6 +-
.../src/main/docs/aws2-kinesis-component.adoc | 10 +--
.../component/aws2/kinesis/Kinesis2Component.java | 12 ---
.../aws2/kinesis/Kinesis2Configuration.java | 13 +---
.../kinesis/KinesisComponentConfigurationTest.java | 12 ---
.../dsl/Aws2KinesisComponentBuilderFactory.java | 16 ----
.../dsl/Kinesis2EndpointBuilderFactory.java | 90 ----------------------
.../modules/ROOT/pages/aws2-kinesis-component.adoc | 10 +--
.../ROOT/pages/camel-3x-upgrade-guide-3_7.adoc | 3 +
14 files changed, 31 insertions(+), 182 deletions(-)
[camel] 01/04: CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on
the Kinesis client
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 bc8fa176a66bfab4b5385305c626fddc01d29c2b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 16 16:40:38 2020 +0100
CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis client
---
.../camel/component/aws2/kinesis/Kinesis2Component.java | 10 ----------
.../camel/component/aws2/kinesis/Kinesis2Configuration.java | 13 +------------
.../aws2/kinesis/KinesisComponentConfigurationTest.java | 12 ------------
3 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
index 07faa98..1e7212c 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
@@ -49,9 +49,6 @@ public class Kinesis2Component extends DefaultComponent {
configuration.setStreamName(remaining);
Kinesis2Endpoint endpoint = new Kinesis2Endpoint(uri, configuration, this);
setProperties(endpoint, parameters);
- if (endpoint.getConfiguration().isAutoDiscoverClient()) {
- checkAndSetRegistryClient(configuration);
- }
if (configuration.getAmazonKinesisClient() == null
&& (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
throw new IllegalArgumentException("amazonKinesisClient or accessKey and secretKey must be specified");
@@ -69,11 +66,4 @@ public class Kinesis2Component extends DefaultComponent {
public void setConfiguration(Kinesis2Configuration configuration) {
this.configuration = configuration;
}
-
- private void checkAndSetRegistryClient(Kinesis2Configuration configuration) {
- Set<KinesisClient> clients = getCamelContext().getRegistry().findByType(KinesisClient.class);
- if (clients.size() == 1) {
- configuration.setAmazonKinesisClient(clients.stream().findFirst().get());
- }
- }
}
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 f202e61..65fc6af 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
@@ -39,6 +39,7 @@ public class Kinesis2Configuration implements Cloneable {
+ "region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id()")
private String region;
@UriParam(description = "Amazon Kinesis client to use for all requests for this endpoint")
+ @Metadata(autowired = true)
private KinesisClient amazonKinesisClient;
@UriParam(label = "consumer", description = "Maximum number of records that will be fetched in each poll",
defaultValue = "1")
@@ -67,10 +68,6 @@ public class Kinesis2Configuration implements Cloneable {
@UriParam(defaultValue = "false", description = "If we want to trust all certificates in case of overriding the endpoint")
private boolean trustAllCertificates;
@UriParam(label = "common", defaultValue = "true",
- 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;
@@ -186,14 +183,6 @@ public class Kinesis2Configuration implements Cloneable {
this.trustAllCertificates = trustAllCertificates;
}
- public boolean isAutoDiscoverClient() {
- return autoDiscoverClient;
- }
-
- public void setAutoDiscoverClient(boolean autoDiscoverClient) {
- this.autoDiscoverClient = autoDiscoverClient;
- }
-
public boolean isCborEnabled() {
return cborEnabled;
}
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
index 4c365e1..a305f4a 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
@@ -80,16 +80,4 @@ public class KinesisComponentConfigurationTest extends CamelTestSupport {
assertEquals("localhost", endpoint.getConfiguration().getProxyHost());
assertEquals(Integer.valueOf(9000), endpoint.getConfiguration().getProxyPort());
}
-
- @Test
- public void createEndpointWithAutoDiscoverClientFalse() throws Exception {
- Kinesis2Component component = context.getComponent("aws2-kinesis", Kinesis2Component.class);
- Kinesis2Endpoint endpoint = (Kinesis2Endpoint) component
- .createEndpoint("aws2-kinesis://some_stream_name?accessKey=xxxxx&secretKey=yyyyy&autoDiscoverClient=false");
-
- assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
- assertEquals("xxxxx", endpoint.getConfiguration().getAccessKey());
- assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
- assertEquals(false, endpoint.getConfiguration().isAutoDiscoverClient());
- }
}
[camel] 04/04: CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on
the Kinesis client, added a note to migration guide
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 60a289b2a03ee25354916bd90ae60af5087522a6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 16 17:49:56 2020 +0100
CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis client, added a note to migration guide
---
docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
index c25c7a1..b798a7c 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
@@ -203,6 +203,9 @@ In this context, it wasn't having any sense to maintain the autodiscoverClient o
=== Camel-AWS2-Kinesis Autowire support
+The camel-aws2-kinesis has now support for autowiring the amazonKinesisClient option with KinesisClient instance coming from the registry.
+In this context, it wasn't having any sense to maintain the autodiscoverClient option, which has been now removed.
+
The camel-aws2-kinesis-firehose has now support for autowiring the amazonKinesisFirehoseClient option with FirehoseClient instance coming from the registry.
In this context, it wasn't having any sense to maintain the autodiscoverClient option, which has been now removed.
[camel] 02/04: CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on
the Kinesis client, regen configurers and component
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 ab88d890a2ddf2d2afda10733ac9bc3f9338ffcc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 16 17:44:21 2020 +0100
CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis client, regen configurers and component
---
.../camel/catalog/docs/aws2-kinesis-component.adoc | 10 +--
.../aws2/kinesis/Kinesis2ComponentConfigurer.java | 11 ++-
.../aws2/kinesis/Kinesis2EndpointConfigurer.java | 11 ++-
.../aws2/kinesis/Kinesis2EndpointUriFactory.java | 3 +-
.../camel/component/aws2/kinesis/aws2-kinesis.json | 6 +-
.../src/main/docs/aws2-kinesis-component.adoc | 10 +--
.../component/aws2/kinesis/Kinesis2Component.java | 2 -
.../dsl/Aws2KinesisComponentBuilderFactory.java | 16 ----
.../dsl/Kinesis2EndpointBuilderFactory.java | 90 ----------------------
.../modules/ROOT/pages/aws2-kinesis-component.adoc | 10 +--
10 files changed, 25 insertions(+), 144 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 eabbe18..6733920 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,15 +43,14 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis component supports 19 options, which are listed below.
+The AWS 2 Kinesis component supports 18 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
+| *amazonKinesisClient* (common) | *Autowired* Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *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
@@ -97,14 +96,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (36 parameters):
+=== Query Parameters (35 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
+| *amazonKinesisClient* (common) | *Autowired* Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *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
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 a9ee51e..1df10be 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
@@ -32,8 +32,6 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
case "accessKey": getOrCreateConfiguration(target).setAccessKey(property(camelContext, java.lang.String.class, value)); return true;
case "amazonkinesisclient":
case "amazonKinesisClient": getOrCreateConfiguration(target).setAmazonKinesisClient(property(camelContext, software.amazon.awssdk.services.kinesis.KinesisClient.class, value)); return true;
- case "autodiscoverclient":
- case "autoDiscoverClient": getOrCreateConfiguration(target).setAutoDiscoverClient(property(camelContext, boolean.class, value)); return true;
case "autowiredenabled":
case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
case "bridgeerrorhandler":
@@ -69,14 +67,17 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
}
@Override
+ public String[] getAutowiredNames() {
+ return new String[]{"amazonKinesisClient"};
+ }
+
+ @Override
public Class<?> getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
case "accesskey":
case "accessKey": return java.lang.String.class;
case "amazonkinesisclient":
case "amazonKinesisClient": return software.amazon.awssdk.services.kinesis.KinesisClient.class;
- case "autodiscoverclient":
- case "autoDiscoverClient": return boolean.class;
case "autowiredenabled":
case "autowiredEnabled": return boolean.class;
case "bridgeerrorhandler":
@@ -119,8 +120,6 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
case "accessKey": return getOrCreateConfiguration(target).getAccessKey();
case "amazonkinesisclient":
case "amazonKinesisClient": return getOrCreateConfiguration(target).getAmazonKinesisClient();
- case "autodiscoverclient":
- case "autoDiscoverClient": return getOrCreateConfiguration(target).isAutoDiscoverClient();
case "autowiredenabled":
case "autowiredEnabled": return target.isAutowiredEnabled();
case "bridgeerrorhandler":
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 41cc17d..3cce636 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
@@ -25,8 +25,6 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
case "accessKey": target.getConfiguration().setAccessKey(property(camelContext, java.lang.String.class, value)); return true;
case "amazonkinesisclient":
case "amazonKinesisClient": target.getConfiguration().setAmazonKinesisClient(property(camelContext, software.amazon.awssdk.services.kinesis.KinesisClient.class, value)); return true;
- case "autodiscoverclient":
- case "autoDiscoverClient": target.getConfiguration().setAutoDiscoverClient(property(camelContext, boolean.class, value)); return true;
case "backofferrorthreshold":
case "backoffErrorThreshold": target.setBackoffErrorThreshold(property(camelContext, int.class, value)); return true;
case "backoffidlethreshold":
@@ -93,14 +91,17 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
}
@Override
+ public String[] getAutowiredNames() {
+ return new String[]{"amazonKinesisClient"};
+ }
+
+ @Override
public Class<?> getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
case "accesskey":
case "accessKey": return java.lang.String.class;
case "amazonkinesisclient":
case "amazonKinesisClient": return software.amazon.awssdk.services.kinesis.KinesisClient.class;
- case "autodiscoverclient":
- case "autoDiscoverClient": return boolean.class;
case "backofferrorthreshold":
case "backoffErrorThreshold": return int.class;
case "backoffidlethreshold":
@@ -174,8 +175,6 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
case "accessKey": return target.getConfiguration().getAccessKey();
case "amazonkinesisclient":
case "amazonKinesisClient": return target.getConfiguration().getAmazonKinesisClient();
- case "autodiscoverclient":
- case "autoDiscoverClient": return target.getConfiguration().isAutoDiscoverClient();
case "backofferrorthreshold":
case "backoffErrorThreshold": return target.getBackoffErrorThreshold();
case "backoffidlethreshold":
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 f0e060b..4050afb 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<>(36);
props.add("backoffMultiplier");
props.add("synchronous");
props.add("initialDelay");
@@ -37,7 +37,6 @@ public class Kinesis2EndpointUriFactory extends org.apache.camel.support.compone
props.add("scheduledExecutorService");
props.add("repeatCount");
props.add("timeUnit");
- props.add("autoDiscoverClient");
props.add("sequenceNumber");
props.add("proxyProtocol");
props.add("secretKey");
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 78c497c..eefd31c 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
@@ -22,8 +22,7 @@
"lenientProperties": false
},
"componentProperties": {
- "amazonKinesisClient": { "kind": "property", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "autowired": 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, "autowired": 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 cli [...]
+ "amazonKinesisClient": { "kind": "property", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis client to use for all reques [...]
"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.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, "autowired": 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, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" },
@@ -44,8 +43,7 @@
},
"properties": {
"streamName": { "kind": "path", "displayName": "Stream Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "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, "autowired": 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, "autowired": 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 cl [...]
+ "amazonKinesisClient": { "kind": "parameter", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis client to use for all reque [...]
"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.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, "autowired": 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, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the Kinesis client" },
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 eabbe18..6733920 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,15 +43,14 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis component supports 19 options, which are listed below.
+The AWS 2 Kinesis component supports 18 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
+| *amazonKinesisClient* (common) | *Autowired* Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *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
@@ -97,14 +96,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (36 parameters):
+=== Query Parameters (35 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
+| *amazonKinesisClient* (common) | *Autowired* Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *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
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
index 1e7212c..1e7c55f 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
@@ -17,14 +17,12 @@
package org.apache.camel.component.aws2.kinesis;
import java.util.Map;
-import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import software.amazon.awssdk.services.kinesis.KinesisClient;
@Component("aws2-kinesis")
public class Kinesis2Component extends DefaultComponent {
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 a0f4402..c39a62a 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
@@ -65,21 +65,6 @@ public interface Aws2KinesisComponentBuilderFactory {
return this;
}
/**
- * Setting the autoDiscoverClient mechanism, if true, the component will
- * look for a client instance in the registry automatically otherwise it
- * will skip that checking.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- */
- default Aws2KinesisComponentBuilder autoDiscoverClient(
- boolean autoDiscoverClient) {
- doSetProperty("autoDiscoverClient", autoDiscoverClient);
- return this;
- }
- /**
* This option will set the CBOR_ENABLED property during the execution.
*
* The option is a: <code>boolean</code> type.
@@ -344,7 +329,6 @@ public interface Aws2KinesisComponentBuilderFactory {
Object value) {
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;
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 f9dd029..4e2d483 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
@@ -76,36 +76,6 @@ public interface Kinesis2EndpointBuilderFactory {
return this;
}
/**
- * Setting the autoDiscoverClient mechanism, if true, the component will
- * look for a client instance in the registry automatically otherwise it
- * will skip that checking.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- */
- default Kinesis2EndpointConsumerBuilder autoDiscoverClient(
- boolean autoDiscoverClient) {
- doSetProperty("autoDiscoverClient", autoDiscoverClient);
- return this;
- }
- /**
- * Setting the autoDiscoverClient mechanism, if true, the component will
- * look for a client instance in the registry automatically otherwise it
- * will skip that checking.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- */
- default Kinesis2EndpointConsumerBuilder autoDiscoverClient(
- String autoDiscoverClient) {
- doSetProperty("autoDiscoverClient", autoDiscoverClient);
- return this;
- }
- /**
* This option will set the CBOR_ENABLED property during the execution.
*
* The option is a: <code>boolean</code> type.
@@ -989,36 +959,6 @@ public interface Kinesis2EndpointBuilderFactory {
return this;
}
/**
- * Setting the autoDiscoverClient mechanism, if true, the component will
- * look for a client instance in the registry automatically otherwise it
- * will skip that checking.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- */
- default Kinesis2EndpointProducerBuilder autoDiscoverClient(
- boolean autoDiscoverClient) {
- doSetProperty("autoDiscoverClient", autoDiscoverClient);
- return this;
- }
- /**
- * Setting the autoDiscoverClient mechanism, if true, the component will
- * look for a client instance in the registry automatically otherwise it
- * will skip that checking.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- */
- default Kinesis2EndpointProducerBuilder autoDiscoverClient(
- String autoDiscoverClient) {
- doSetProperty("autoDiscoverClient", autoDiscoverClient);
- return this;
- }
- /**
* This option will set the CBOR_ENABLED property during the execution.
*
* The option is a: <code>boolean</code> type.
@@ -1290,36 +1230,6 @@ public interface Kinesis2EndpointBuilderFactory {
return this;
}
/**
- * Setting the autoDiscoverClient mechanism, if true, the component will
- * look for a client instance in the registry automatically otherwise it
- * will skip that checking.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- */
- default Kinesis2EndpointBuilder autoDiscoverClient(
- boolean autoDiscoverClient) {
- doSetProperty("autoDiscoverClient", autoDiscoverClient);
- return this;
- }
- /**
- * Setting the autoDiscoverClient mechanism, if true, the component will
- * look for a client instance in the registry automatically otherwise it
- * will skip that checking.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Default: true
- * Group: common
- */
- default Kinesis2EndpointBuilder autoDiscoverClient(
- String autoDiscoverClient) {
- doSetProperty("autoDiscoverClient", autoDiscoverClient);
- return this;
- }
- /**
* This option will set the CBOR_ENABLED property during the execution.
*
* The option is a: <code>boolean</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 9bb53ad..269e523 100644
--- a/docs/components/modules/ROOT/pages/aws2-kinesis-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-kinesis-component.adoc
@@ -45,15 +45,14 @@ The stream needs to be created prior to it being used. +
// component options: START
-The AWS 2 Kinesis component supports 19 options, which are listed below.
+The AWS 2 Kinesis component supports 18 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
+| *amazonKinesisClient* (common) | *Autowired* Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *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
@@ -99,14 +98,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (36 parameters):
+=== Query Parameters (35 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| 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
+| *amazonKinesisClient* (common) | *Autowired* Amazon Kinesis client to use for all requests for this endpoint | | KinesisClient
| *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
[camel] 03/04: CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on
the Kinesis client, 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 ce3b0b74dd3fbe69c6033828109460ec9dac6dfc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 16 17:48:59 2020 +0100
CAMEL-15836 - Camel-AWS2-Kinesis: enable autowire on the Kinesis client, regen catalog
---
.../resources/org/apache/camel/catalog/components/aws2-kinesis.json | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
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 78c497c..eefd31c 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
@@ -22,8 +22,7 @@
"lenientProperties": false
},
"componentProperties": {
- "amazonKinesisClient": { "kind": "property", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "autowired": 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, "autowired": 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 cli [...]
+ "amazonKinesisClient": { "kind": "property", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis client to use for all reques [...]
"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.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, "autowired": 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, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Kinesis client" },
@@ -44,8 +43,7 @@
},
"properties": {
"streamName": { "kind": "path", "displayName": "Stream Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "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, "autowired": 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, "autowired": 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 cl [...]
+ "amazonKinesisClient": { "kind": "parameter", "displayName": "Amazon Kinesis Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "Amazon Kinesis client to use for all reque [...]
"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.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, "autowired": 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, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the Kinesis client" },