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 <anco...@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());
- }
}
