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/12/11 12:29:38 UTC
[camel] branch master updated (97f0a64 -> b862e01)
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 97f0a64 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-kinesis-firehose
new a4ab5e5 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-kms
new b862e01 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-lambda
The 2 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/aws/kms/KMSComponent.java | 34 ++++++++-------------
.../aws/kms/KMSComponentClientRegistryTest.java | 4 +--
.../aws/kms/KMSComponentConfigurationTest.java | 6 ++--
.../component/aws/lambda/LambdaComponent.java | 35 ++++++++--------------
.../lambda/LambdaComponentClientRegistryTest.java | 4 +--
.../lambda/LambdaComponentConfigurationTest.java | 18 +++++------
6 files changed, 42 insertions(+), 59 deletions(-)
[camel] 01/02: CAMEL-14284: Configuring endpoint should set
properties on endpoint and not configuration object - aws-kms
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 a4ab5e5887ab9a25900e66d579bc0048899c08cd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 11 13:20:29 2019 +0100
CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-kms
---
.../camel/component/aws/kms/KMSComponent.java | 34 +++++++++-------------
.../aws/kms/KMSComponentClientRegistryTest.java | 4 +--
.../aws/kms/KMSComponentConfigurationTest.java | 6 ++--
3 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponent.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponent.java
index ce8fe7d..cad3b50 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponent.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponent.java
@@ -25,7 +25,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.util.ObjectHelper;
/**
* For working with Amazon KMS.
@@ -49,30 +48,23 @@ public class KMSComponent extends DefaultComponent {
public KMSComponent(CamelContext context) {
super(context);
- this.configuration = new KMSConfiguration();
registerExtension(new KMSComponentVerifierExtension());
}
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- KMSConfiguration configuration = this.configuration.copy();
- setProperties(configuration, parameters);
-
- if (ObjectHelper.isEmpty(configuration.getAccessKey())) {
- setAccessKey(accessKey);
- }
- if (ObjectHelper.isEmpty(configuration.getSecretKey())) {
- setSecretKey(secretKey);
- }
- if (ObjectHelper.isEmpty(configuration.getRegion())) {
- setRegion(region);
- }
+ KMSConfiguration configuration = this.configuration != null ? this.configuration.copy() : new KMSConfiguration();
+
+ KMSEndpoint endpoint = new KMSEndpoint(uri, this, configuration);
+ endpoint.getConfiguration().setAccessKey(accessKey);
+ endpoint.getConfiguration().setSecretKey(secretKey);
+ endpoint.getConfiguration().setRegion(region);
+ setProperties(endpoint, parameters);
checkAndSetRegistryClient(configuration);
if (configuration.getKmsClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
throw new IllegalArgumentException("Amazon kms client or accessKey and secretKey must be specified");
}
- KMSEndpoint endpoint = new KMSEndpoint(uri, this, configuration);
return endpoint;
}
@@ -88,36 +80,36 @@ public class KMSComponent extends DefaultComponent {
}
public String getAccessKey() {
- return configuration.getAccessKey();
+ return accessKey;
}
/**
* Amazon AWS Access Key
*/
public void setAccessKey(String accessKey) {
- configuration.setAccessKey(accessKey);
+ this.accessKey = accessKey;
}
public String getSecretKey() {
- return configuration.getSecretKey();
+ return secretKey;
}
/**
* Amazon AWS Secret Key
*/
public void setSecretKey(String secretKey) {
- configuration.setSecretKey(secretKey);
+ this.secretKey = secretKey;
}
public String getRegion() {
- return configuration.getRegion();
+ return region;
}
/**
* The region in which KMS client needs to work
*/
public void setRegion(String region) {
- configuration.setRegion(region);
+ this.region = region;
}
private void checkAndSetRegistryClient(KMSConfiguration configuration) {
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentClientRegistryTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentClientRegistryTest.java
index c765e2b..ca1434a 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentClientRegistryTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentClientRegistryTest.java
@@ -26,7 +26,7 @@ public class KMSComponentClientRegistryTest extends CamelTestSupport {
AmazonKMSClientMock clientMock = new AmazonKMSClientMock();
context.getRegistry().bind("amazonKmsClient", clientMock);
- KMSComponent component = new KMSComponent(context);
+ KMSComponent component = context.getComponent("aws-kms", KMSComponent.class);
KMSEndpoint endpoint = (KMSEndpoint)component.createEndpoint("aws-kms://TestDomain");
assertNotNull(endpoint.getConfiguration().getKmsClient());
@@ -35,7 +35,7 @@ public class KMSComponentClientRegistryTest extends CamelTestSupport {
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithMinimalKMSClientMisconfiguration() throws Exception {
- KMSComponent component = new KMSComponent(context);
+ KMSComponent component = context.getComponent("aws-kms", KMSComponent.class);
KMSEndpoint endpoint = (KMSEndpoint)component.createEndpoint("aws-kms://TestDomain");
}
}
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
index 66e412e..81957a8 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
@@ -26,7 +26,7 @@ public class KMSComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentElements() throws Exception {
- KMSComponent component = new KMSComponent(context);
+ KMSComponent component = context.getComponent("aws-kms", KMSComponent.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
KMSEndpoint endpoint = (KMSEndpoint)component.createEndpoint("aws-kms://label");
@@ -37,7 +37,7 @@ public class KMSComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentAndEndpointElements() throws Exception {
- KMSComponent component = new KMSComponent(context);
+ KMSComponent component = context.getComponent("aws-kms", KMSComponent.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Regions.US_WEST_1.toString());
@@ -50,7 +50,7 @@ public class KMSComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentEndpointElementsAndProxy() throws Exception {
- KMSComponent component = new KMSComponent(context);
+ KMSComponent component = context.getComponent("aws-kms", KMSComponent.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Regions.US_WEST_1.toString());
[camel] 02/02: CAMEL-14284: Configuring endpoint should set
properties on endpoint and not configuration object - aws-lambda
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 b862e018b25dff176048213f6a81209360919acd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 11 13:29:03 2019 +0100
CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-lambda
---
.../component/aws/lambda/LambdaComponent.java | 35 ++++++++--------------
.../lambda/LambdaComponentClientRegistryTest.java | 4 +--
.../lambda/LambdaComponentConfigurationTest.java | 18 +++++------
3 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponent.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponent.java
index 04d0b19..2d88ac9 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponent.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponent.java
@@ -25,7 +25,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.util.ObjectHelper;
@Component("aws-lambda")
public class LambdaComponent extends DefaultComponent {
@@ -46,31 +45,23 @@ public class LambdaComponent extends DefaultComponent {
public LambdaComponent(CamelContext context) {
super(context);
- this.configuration = new LambdaConfiguration();
registerExtension(new LambdaComponentVerifierExtension());
}
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- LambdaConfiguration configuration = this.configuration.copy();
- setProperties(configuration, parameters);
+ LambdaConfiguration configuration = this.configuration != null ? this.configuration.copy() : new LambdaConfiguration();
configuration.setFunction(remaining);
-
- if (ObjectHelper.isEmpty(configuration.getAccessKey())) {
- setAccessKey(accessKey);
- }
- if (ObjectHelper.isEmpty(configuration.getSecretKey())) {
- setSecretKey(secretKey);
- }
- if (ObjectHelper.isEmpty(configuration.getRegion())) {
- setRegion(region);
- }
+ LambdaEndpoint endpoint = new LambdaEndpoint(uri, this, configuration);
+ endpoint.getConfiguration().setAccessKey(accessKey);
+ endpoint.getConfiguration().setSecretKey(secretKey);
+ endpoint.getConfiguration().setRegion(region);
+ setProperties(endpoint, parameters);
checkAndSetRegistryClient(configuration);
- if (ObjectHelper.isEmpty(configuration.getAwsLambdaClient()) && (ObjectHelper.isEmpty(configuration.getAccessKey()) || ObjectHelper.isEmpty(configuration.getSecretKey()))) {
+ if (configuration.getAwsLambdaClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
throw new IllegalArgumentException("accessKey/secretKey or awsLambdaClient must be specified");
}
- LambdaEndpoint endpoint = new LambdaEndpoint(uri, this, configuration);
return endpoint;
}
@@ -86,36 +77,36 @@ public class LambdaComponent extends DefaultComponent {
}
public String getAccessKey() {
- return configuration.getAccessKey();
+ return accessKey;
}
/**
* Amazon AWS Access Key
*/
public void setAccessKey(String accessKey) {
- configuration.setAccessKey(accessKey);
+ this.accessKey = accessKey;
}
public String getSecretKey() {
- return configuration.getSecretKey();
+ return secretKey;
}
/**
* Amazon AWS Secret Key
*/
public void setSecretKey(String secretKey) {
- configuration.setSecretKey(secretKey);
+ this.secretKey = secretKey;
}
public String getRegion() {
- return configuration.getRegion();
+ return region;
}
/**
* Amazon AWS Region
*/
public void setRegion(String region) {
- configuration.setRegion(region);
+ this.region = region;
}
private void checkAndSetRegistryClient(LambdaConfiguration configuration) {
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
index 1fb30be..573aa3b 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
@@ -30,7 +30,7 @@ public class LambdaComponentClientRegistryTest extends CamelTestSupport {
AWSLambdaClient awsLambdaClient = mock(AWSLambdaClient.class);
context.getRegistry().bind("awsLambdaClient", awsLambdaClient);
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
LambdaEndpoint endpoint = (LambdaEndpoint) component.createEndpoint(
"aws-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
@@ -40,7 +40,7 @@ public class LambdaComponentClientRegistryTest extends CamelTestSupport {
@Test(expected = PropertyBindingException.class)
public void createEndpointWithMinimalKMSClientMisconfiguration() throws Exception {
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
LambdaEndpoint endpoint = (LambdaEndpoint) component.createEndpoint(
"aws-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
}
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
index 0c0112b..bf7fec8 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
@@ -30,7 +30,7 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
public void createEndpointWithMinimalConfiguration() throws Exception {
AWSLambdaClient awsLambdaClient = mock(AWSLambdaClient.class);
context.getRegistry().bind("awsLambdaClient", awsLambdaClient);
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
LambdaEndpoint endpoint = (LambdaEndpoint) component.createEndpoint(
"aws-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
@@ -41,25 +41,25 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutOperation() throws Exception {
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
component.createEndpoint("aws-lambda://myFunction");
}
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutAmazonLambdaClientConfiguration() throws Exception {
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
component.createEndpoint("aws-lambda://myFunction?operation=getFunction");
}
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
component.createEndpoint("aws-lambda://myFunction?operation=getFunction&secretKey=yyy");
}
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
component.createEndpoint("aws-lambda://myFunction?operation=getFunction&accessKey=xxx");
}
@@ -67,13 +67,13 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
public void createEndpointWithoutSecretKeyAndAccessKeyConfiguration() throws Exception {
AWSLambdaClient awsLambdaClient = mock(AWSLambdaClient.class);
context.getRegistry().bind("awsLambdaClient", awsLambdaClient);
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
component.createEndpoint("aws-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient");
}
@Test
public void createEndpointWithComponentElements() throws Exception {
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
LambdaEndpoint endpoint = (LambdaEndpoint)component.createEndpoint("aws-lambda://myFunction");
@@ -85,7 +85,7 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentAndEndpointElements() throws Exception {
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Regions.US_WEST_1.toString());
@@ -99,7 +99,7 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
@Test
public void createEndpointWithComponentEndpointElementsAndProxy() throws Exception {
- LambdaComponent component = new LambdaComponent(context);
+ LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Regions.US_WEST_1.toString());