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/02/28 15:02:52 UTC
[camel] 03/04: CAMEL-14568 - Fixed AWS Kinesis
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 53e244d1b9e0b3f4b1516b4ba987d9e9a31a52ed
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 28 16:00:22 2020 +0100
CAMEL-14568 - Fixed AWS Kinesis
---
.../component/aws/kinesis/KinesisComponent.java | 48 ++--------------------
.../kinesis/KinesisComponentConfigurationTest.java | 16 ++++----
2 files changed, 11 insertions(+), 53 deletions(-)
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
index c51182b..46309ce 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
@@ -29,14 +29,8 @@ import org.apache.camel.support.DefaultComponent;
@Component("aws-kinesis")
public class KinesisComponent extends DefaultComponent {
- @Metadata
- private String accessKey;
- @Metadata
- private String secretKey;
- @Metadata
- private String region;
- @Metadata(label = "advanced")
- private KinesisConfiguration configuration;
+ @Metadata
+ private KinesisConfiguration configuration = new KinesisConfiguration();
public KinesisComponent() {
this(null);
@@ -53,9 +47,6 @@ public class KinesisComponent extends DefaultComponent {
KinesisConfiguration configuration = this.configuration != null ? this.configuration.copy() : new KinesisConfiguration();
configuration.setStreamName(remaining);
KinesisEndpoint endpoint = new KinesisEndpoint(uri, configuration, this);
- endpoint.getConfiguration().setAccessKey(accessKey);
- endpoint.getConfiguration().setSecretKey(secretKey);
- endpoint.getConfiguration().setRegion(region);
setProperties(endpoint, parameters);
checkAndSetRegistryClient(configuration);
if (configuration.getAmazonKinesisClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
@@ -69,45 +60,12 @@ public class KinesisComponent extends DefaultComponent {
}
/**
- * The AWS S3 default configuration
+ * The component configuration
*/
public void setConfiguration(KinesisConfiguration configuration) {
this.configuration = configuration;
}
- public String getAccessKey() {
- return accessKey;
- }
-
- /**
- * Amazon AWS Access Key
- */
- public void setAccessKey(String accessKey) {
- this.accessKey = accessKey;
- }
-
- public String getSecretKey() {
- return secretKey;
- }
-
- /**
- * Amazon AWS Secret Key
- */
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getRegion() {
- return region;
- }
-
- /**
- * Amazon AWS Region
- */
- public void setRegion(String region) {
- this.region = region;
- }
-
private void checkAndSetRegistryClient(KinesisConfiguration configuration) {
Set<AmazonKinesis> clients = getCamelContext().getRegistry().findByType(AmazonKinesis.class);
if (clients.size() == 1) {
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
index a4c8a68..d6d147b 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
@@ -36,8 +36,8 @@ public class KinesisComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentElements() throws Exception {
KinesisComponent component = context.getComponent("aws-kinesis", KinesisComponent.class);
- component.setAccessKey("XXX");
- component.setSecretKey("YYY");
+ component.getConfiguration().setAccessKey("XXX");
+ component.getConfiguration().setSecretKey("YYY");
KinesisEndpoint endpoint = (KinesisEndpoint)component.createEndpoint("aws-kinesis://some_stream_name");
assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
@@ -48,9 +48,9 @@ public class KinesisComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentAndEndpointElements() throws Exception {
KinesisComponent component = context.getComponent("aws-kinesis", KinesisComponent.class);
- component.setAccessKey("XXX");
- component.setSecretKey("YYY");
- component.setRegion(Regions.US_WEST_1.toString());
+ component.getConfiguration().setAccessKey("XXX");
+ component.getConfiguration().setSecretKey("YYY");
+ component.getConfiguration().setRegion(Regions.US_WEST_1.toString());
KinesisEndpoint endpoint = (KinesisEndpoint)component.createEndpoint("aws-kinesis://some_stream_name?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1");
assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
@@ -62,9 +62,9 @@ public class KinesisComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentEndpointElementsAndProxy() throws Exception {
KinesisComponent component = context.getComponent("aws-kinesis", KinesisComponent.class);
- component.setAccessKey("XXX");
- component.setSecretKey("YYY");
- component.setRegion(Regions.US_WEST_1.toString());
+ component.getConfiguration().setAccessKey("XXX");
+ component.getConfiguration().setSecretKey("YYY");
+ component.getConfiguration().setRegion(Regions.US_WEST_1.toString());
KinesisEndpoint endpoint = (KinesisEndpoint)component.createEndpoint("aws-kinesis://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());