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 2021/04/07 14:38:14 UTC
[camel] branch master updated (a3b340f -> 61f8ee5)
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 a3b340f CAMEL-16400: split unit and integration tests for camel-aws2-sqs (#5304)
new d614ddb CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the components - Kinesis component
new d155888 CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the components - Kinesis Firehose component
new f564561 CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the components - Kinesis component
new 61f8ee5 Fixed CS
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/component/aws2/firehose/KinesisFirehose2Component.java | 5 +++--
.../org/apache/camel/component/aws2/kinesis/Kinesis2Component.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
[camel] 02/04: CAMEL-16465 - Camel-AWS: Add
useDefaultCredentialProvider option to all the components - Kinesis
Firehose 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 d155888e7f77aa75f46ac2f4c4ced7017330e7bf
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 7 16:34:51 2021 +0200
CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the components - Kinesis Firehose component
---
.../camel/component/aws2/firehose/KinesisFirehose2Component.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Component.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Component.java
index 3914334..48c0340 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Component.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Component.java
@@ -47,9 +47,9 @@ public class KinesisFirehose2Component extends DefaultComponent {
configuration.setStreamName(remaining);
KinesisFirehose2Endpoint endpoint = new KinesisFirehose2Endpoint(uri, configuration, this);
setProperties(endpoint, parameters);
- if (configuration.getAmazonKinesisFirehoseClient() == null
+ if (!configuration.isUseDefaultCredentialsProvider() && configuration.getAmazonKinesisFirehoseClient() == null
&& (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
- throw new IllegalArgumentException("AmazonKinesisFirehoseClient or accessKey and secretKey must be specified");
+ throw new IllegalArgumentException("useDefaultCredentialsProvider is set to false, AmazonKinesisFirehoseClient or accessKey and secretKey must be specified");
}
return endpoint;
}
[camel] 03/04: CAMEL-16465 - Camel-AWS: Add
useDefaultCredentialProvider option to all the components - Kinesis
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 f56456179d95997bc03ac95d1fed140261c2830f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 7 16:36:07 2021 +0200
CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the components - Kinesis component
---
.../java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
index 0ef531c..42e5c9e 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
@@ -49,7 +49,7 @@ public class Kinesis2Component extends DefaultComponent {
setProperties(endpoint, parameters);
if (!configuration.isUseDefaultCredentialsProvider() && configuration.getAmazonKinesisClient() == null
&& (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
- throw new IllegalArgumentException("amazonKinesisClient or accessKey and secretKey must be specified");
+ throw new IllegalArgumentException("useDefaultCredentialsProvider is set to false, AmazonKinesisClient or accessKey and secretKey must be specified");
}
return endpoint;
}
[camel] 01/04: CAMEL-16465 - Camel-AWS: Add
useDefaultCredentialProvider option to all the components - Kinesis
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 d614ddbe7c2a6336c6c06e6c5dc0dbfddbf2adfb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 7 16:33:47 2021 +0200
CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the components - Kinesis component
---
.../java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
index 1e7c55f..0ef531c 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
@@ -47,7 +47,7 @@ public class Kinesis2Component extends DefaultComponent {
configuration.setStreamName(remaining);
Kinesis2Endpoint endpoint = new Kinesis2Endpoint(uri, configuration, this);
setProperties(endpoint, parameters);
- if (configuration.getAmazonKinesisClient() == null
+ if (!configuration.isUseDefaultCredentialsProvider() && configuration.getAmazonKinesisClient() == null
&& (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
throw new IllegalArgumentException("amazonKinesisClient or accessKey and secretKey must be specified");
}
[camel] 04/04: Fixed CS
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 61f8ee59e3cc659af9563a158492f55cdca477d2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 7 16:37:01 2021 +0200
Fixed CS
---
.../camel/component/aws2/firehose/KinesisFirehose2Component.java | 3 ++-
.../org/apache/camel/component/aws2/kinesis/Kinesis2Component.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Component.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Component.java
index 48c0340..226767d 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Component.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Component.java
@@ -49,7 +49,8 @@ public class KinesisFirehose2Component extends DefaultComponent {
setProperties(endpoint, parameters);
if (!configuration.isUseDefaultCredentialsProvider() && configuration.getAmazonKinesisFirehoseClient() == null
&& (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
- throw new IllegalArgumentException("useDefaultCredentialsProvider is set to false, AmazonKinesisFirehoseClient or accessKey and secretKey must be specified");
+ throw new IllegalArgumentException(
+ "useDefaultCredentialsProvider is set to false, AmazonKinesisFirehoseClient or accessKey and secretKey must be specified");
}
return endpoint;
}
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
index 42e5c9e..6d8fd79 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java
@@ -49,7 +49,8 @@ public class Kinesis2Component extends DefaultComponent {
setProperties(endpoint, parameters);
if (!configuration.isUseDefaultCredentialsProvider() && configuration.getAmazonKinesisClient() == null
&& (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
- throw new IllegalArgumentException("useDefaultCredentialsProvider is set to false, AmazonKinesisClient or accessKey and secretKey must be specified");
+ throw new IllegalArgumentException(
+ "useDefaultCredentialsProvider is set to false, AmazonKinesisClient or accessKey and secretKey must be specified");
}
return endpoint;
}