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 2019/03/01 08:40:22 UTC

[camel] branch master updated (e7b18c8 -> 764556a)

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 e7b18c8  Fixed flaky test
     new 0700e7c  Camel-AWS IAM: Fixed javadoc and clean up a bit
     new dc5f5a4  Camel-AWS IAM: Regen docs
     new 764556a  Camel-AWS KMS: Minor fix to test name

The 3 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:
 components/camel-aws-iam/src/main/docs/aws-iam-component.adoc       | 6 +++---
 .../main/java/org/apache/camel/component/aws/iam/IAMComponent.java  | 2 +-
 .../java/org/apache/camel/component/aws/iam/IAMConfiguration.java   | 6 +++---
 .../main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java   | 4 ++--
 .../org/apache/camel/component/aws/kms/KMSProducerSpringTest.java   | 2 +-
 .../component/aws/iam/springboot/IAMComponentConfiguration.java     | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)


[camel] 01/03: Camel-AWS IAM: Fixed javadoc and clean up a bit

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 0700e7c37340733c41b982dfc21793749c5ec9d6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 1 09:33:04 2019 +0100

    Camel-AWS IAM: Fixed javadoc and clean up a bit
---
 .../main/java/org/apache/camel/component/aws/iam/IAMComponent.java  | 2 +-
 .../java/org/apache/camel/component/aws/iam/IAMConfiguration.java   | 6 +++---
 .../main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponent.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponent.java
index f2be3d5..2bab138 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponent.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponent.java
@@ -27,7 +27,7 @@ import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.util.ObjectHelper;
 
 /**
- * For working with Amazon KMS.
+ * For working with Amazon IAM.
  */
 @Component("aws-iam")
 public class IAMComponent extends DefaultComponent {
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMConfiguration.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMConfiguration.java
index 9efa90e..8b88f5e 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMConfiguration.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMConfiguration.java
@@ -95,7 +95,7 @@ public class IAMConfiguration implements Cloneable {
     }
 
     /**
-     * To define a proxy host when instantiating the KMS client
+     * To define a proxy host when instantiating the IAM client
      */
     public void setProxyHost(String proxyHost) {
         this.proxyHost = proxyHost;
@@ -106,7 +106,7 @@ public class IAMConfiguration implements Cloneable {
     }
 
     /**
-     * To define a proxy port when instantiating the KMS client
+     * To define a proxy port when instantiating the IAM client
      */
     public void setProxyPort(Integer proxyPort) {
         this.proxyPort = proxyPort;
@@ -117,7 +117,7 @@ public class IAMConfiguration implements Cloneable {
     }
 
     /**
-     * The region in which KMS client needs to work
+     * The region in which IAM client needs to work
      */
     public void setRegion(String region) {
         this.region = region;
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
index 1297fff..171d3ea 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
@@ -65,7 +65,7 @@ public class IAMEndpoint extends ScheduledPollEndpoint {
     public void doStart() throws Exception {
         super.doStart();
 
-        iamClient = configuration.getIamClient() != null ? configuration.getIamClient() : createKMSClient();
+        iamClient = configuration.getIamClient() != null ? configuration.getIamClient() : createIAMClient();
     }
 
     @Override
@@ -86,7 +86,7 @@ public class IAMEndpoint extends ScheduledPollEndpoint {
         return iamClient;
     }
 
-    AmazonIdentityManagement createKMSClient() {
+    AmazonIdentityManagement createIAMClient() {
         AmazonIdentityManagement client = null;
         ClientConfiguration clientConfiguration = null;
         AmazonIdentityManagementClientBuilder clientBuilder = null;


[camel] 02/03: Camel-AWS IAM: Regen docs

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 dc5f5a420554d9c3a910e1ac419b229850039eff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 1 09:37:59 2019 +0100

    Camel-AWS IAM: Regen docs
---
 components/camel-aws-iam/src/main/docs/aws-iam-component.adoc       | 6 +++---
 .../component/aws/iam/springboot/IAMComponentConfiguration.java     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc b/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
index cc601f6..eca7e10 100644
--- a/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
+++ b/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
@@ -72,9 +72,9 @@ with the following path and query parameters:
 | *accessKey* (producer) | Amazon AWS Access Key |  | String
 | *iamClient* (producer) | To use a existing configured AWS IAM as client |  | AmazonIdentity ManagementClient
 | *operation* (producer) | *Required* The operation to perform |  | IAMOperations
-| *proxyHost* (producer) | To define a proxy host when instantiating the KMS client |  | String
-| *proxyPort* (producer) | To define a proxy port when instantiating the KMS client |  | Integer
-| *region* (producer) | The region in which KMS client needs to work |  | String
+| *proxyHost* (producer) | To define a proxy host when instantiating the IAM client |  | String
+| *proxyPort* (producer) | To define a proxy port when instantiating the IAM client |  | Integer
+| *region* (producer) | The region in which IAM client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
diff --git a/platforms/spring-boot/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
index b4aa40f..c483092 100644
--- a/platforms/spring-boot/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
@@ -122,15 +122,15 @@ public class IAMComponentConfiguration
          */
         private IAMOperations operation;
         /**
-         * To define a proxy host when instantiating the KMS client
+         * To define a proxy host when instantiating the IAM client
          */
         private String proxyHost;
         /**
-         * To define a proxy port when instantiating the KMS client
+         * To define a proxy port when instantiating the IAM client
          */
         private Integer proxyPort;
         /**
-         * The region in which KMS client needs to work
+         * The region in which IAM client needs to work
          */
         private String region;
 


[camel] 03/03: Camel-AWS KMS: Minor fix to test name

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 764556ad89dc3e3146bb9a68ed604af362eeb9af
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 1 09:39:27 2019 +0100

    Camel-AWS KMS: Minor fix to test name
---
 .../java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
index b6cd1d9..88c657f 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
@@ -35,7 +35,7 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
     private MockEndpoint mock;
     
     @Test
-    public void mqListBrokersTest() throws Exception {
+    public void kmsListBrokersTest() throws Exception {
 
         mock.expectedMessageCount(1);
         Exchange exchange = template.request("direct:listKeys", new Processor() {