[camel] 01/07: CAMEL-13723 - Camel-AWS: Harmonize how to specify region in all the components, Kinesis

[acosentino]

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 f794a99a99b9ace09c43e94bfd9db3cb32eebee8
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jul 4 15:39:46 2019 +0200

    CAMEL-13723 - Camel-AWS: Harmonize how to specify region in all the 
components, Kinesis
---
 .../camel/component/aws/firehose/KinesisFirehoseEndpoint.java  |  3 ++-
 .../apache/camel/component/aws/kinesis/KinesisEndpoint.java    |  3 ++-
 .../kinesis/integration/KinesisComponentIntegrationTest.java   | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git 
a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
 
b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
index ebdb5b7..717fe90 100644
--- 
a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
+++ 
b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
@@ -21,6 +21,7 @@ import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
 import 
com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehoseClientBuilder;
 
@@ -104,7 +105,7 @@ public class KinesisFirehoseEndpoint extends 
DefaultEndpoint {
             }
         }
         if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
-            clientBuilder = 
clientBuilder.withRegion(configuration.getRegion());
+            clientBuilder = 
clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
         }
         client = clientBuilder.build();
         return client;
diff --git 
a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
 
b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
index 80ac9d8..25b0390 100644
--- 
a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
+++ 
b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
@@ -21,6 +21,7 @@ import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
 import com.amazonaws.services.kinesis.model.Record;
@@ -132,7 +133,7 @@ public class KinesisEndpoint extends ScheduledPollEndpoint {
             }
         }
         if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
-            clientBuilder = 
clientBuilder.withRegion(configuration.getRegion());
+            clientBuilder = 
clientBuilder.withRegion(Regions.valueOf(configuration.getRegion()));
         }
         client = clientBuilder.build();
         return client;
diff --git 
a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
 
b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
index d43362e..1a1d0cb 100644
--- 
a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
+++ 
b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.aws.kinesis.integration;
 
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
@@ -34,11 +36,11 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
-@Ignore("Must be manually tested.")
+//@Ignore("Must be manually tested.")
 public class KinesisComponentIntegrationTest extends CamelTestSupport {
 
     @BindToRegistry("amazonKinesisClient")
-    AmazonKinesis client = 
AmazonKinesisClientBuilder.standard().withRegion(Regions.EU_CENTRAL_1).build();
+    AmazonKinesis client = 
AmazonKinesisClientBuilder.standard().withRegion(Regions.EU_WEST_1).withCredentials(new
 AWSStaticCredentialsProvider(new BasicAWSCredentials("AKIAIHMCLOA573Z7SKYQ", 
"DC1Ow3nyac3/2OHV7zLl57oC7hnLPOB1BTtrUQGI"))).build();
 
     @EndpointInject("direct:start")
     private ProducerTemplate template;
@@ -83,11 +85,9 @@ public class KinesisComponentIntegrationTest extends 
CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                String kinesisEndpointUri = 
"aws-kinesis://etl?amazonKinesisClient=#amazonKinesisClient";
+                String kinesisEndpointUri = 
"aws-kinesis://kinesis1?amazonKinesisClient=#amazonKinesisClient";
 
                 from("direct:start").to(kinesisEndpointUri);
-
-                from(kinesisEndpointUri).to("mock:result");
             }
         };
     }