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 0efeaeefbc31c5114c3218d529d6d83a15b0ede4
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Jul 21 15:39:46 2020 +0200
CAMEL-15310 - AWS* - Support for more than 1 client in the registry -
Camel-AWS-ECS
---
.../component/aws/ecs/ECSComponentConfigurer.java | 5 ++++
.../component/aws/ecs/ECSEndpointConfigurer.java | 5 ++++
.../apache/camel/component/aws/ecs/aws-ecs.json | 2 ++
.../src/main/docs/aws-ecs-component.adoc | 6 +++--
.../camel/component/aws/ecs/ECSComponent.java | 4 +++-
.../camel/component/aws/ecs/ECSConfiguration.java | 15 ++++++++++++
.../aws/ecs/ECSComponentClientRegistryTest.java | 24 +++++++++++++++++++
.../dsl/AwsEcsComponentBuilderFactory.java | 16 +++++++++++++
.../builder/endpoint/StaticEndpointBuilders.java | 8 +++----
.../endpoint/dsl/ECSEndpointBuilderFactory.java | 28 ++++++++++++++++++++++
10 files changed, 106 insertions(+), 7 deletions(-)
diff --git
a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
index e0c905b..a29f634 100644
---
a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
+++
b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
@@ -28,6 +28,8 @@ public class ECSComponentConfigurer extends
PropertyConfigurerSupport implements
switch (ignoreCase ? name.toLowerCase() : name) {
case "accesskey":
case "accessKey":
getOrCreateConfiguration(target).setAccessKey(property(camelContext,
java.lang.String.class, value)); return true;
+ case "autodiscoverclient":
+ case "autoDiscoverClient":
getOrCreateConfiguration(target).setAutoDiscoverClient(property(camelContext,
boolean.class, value)); return true;
case "basicpropertybinding":
case "basicPropertyBinding":
target.setBasicPropertyBinding(property(camelContext, boolean.class, value));
return true;
case "configuration": target.setConfiguration(property(camelContext,
org.apache.camel.component.aws.ecs.ECSConfiguration.class, value)); return true;
@@ -53,6 +55,7 @@ public class ECSComponentConfigurer extends
PropertyConfigurerSupport implements
public Map<String, Object> getAllOptions(Object target) {
Map<String, Object> answer = new CaseInsensitiveMap();
answer.put("accessKey", java.lang.String.class);
+ answer.put("autoDiscoverClient", boolean.class);
answer.put("basicPropertyBinding", boolean.class);
answer.put("configuration",
org.apache.camel.component.aws.ecs.ECSConfiguration.class);
answer.put("ecsClient", com.amazonaws.services.ecs.AmazonECS.class);
@@ -72,6 +75,8 @@ public class ECSComponentConfigurer extends
PropertyConfigurerSupport implements
switch (ignoreCase ? name.toLowerCase() : name) {
case "accesskey":
case "accessKey": return
getOrCreateConfiguration(target).getAccessKey();
+ case "autodiscoverclient":
+ case "autoDiscoverClient": return
getOrCreateConfiguration(target).isAutoDiscoverClient();
case "basicpropertybinding":
case "basicPropertyBinding": return target.isBasicPropertyBinding();
case "configuration": return target.getConfiguration();
diff --git
a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
index 1eb82e6..b3bd6ed 100644
---
a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
+++
b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
@@ -21,6 +21,8 @@ public class ECSEndpointConfigurer extends
PropertyConfigurerSupport implements
switch (ignoreCase ? name.toLowerCase() : name) {
case "accesskey":
case "accessKey":
target.getConfiguration().setAccessKey(property(camelContext,
java.lang.String.class, value)); return true;
+ case "autodiscoverclient":
+ case "autoDiscoverClient":
target.getConfiguration().setAutoDiscoverClient(property(camelContext,
boolean.class, value)); return true;
case "basicpropertybinding":
case "basicPropertyBinding":
target.setBasicPropertyBinding(property(camelContext, boolean.class, value));
return true;
case "ecsclient":
@@ -46,6 +48,7 @@ public class ECSEndpointConfigurer extends
PropertyConfigurerSupport implements
public Map<String, Object> getAllOptions(Object target) {
Map<String, Object> answer = new CaseInsensitiveMap();
answer.put("accessKey", java.lang.String.class);
+ answer.put("autoDiscoverClient", boolean.class);
answer.put("basicPropertyBinding", boolean.class);
answer.put("ecsClient", com.amazonaws.services.ecs.AmazonECS.class);
answer.put("lazyStartProducer", boolean.class);
@@ -65,6 +68,8 @@ public class ECSEndpointConfigurer extends
PropertyConfigurerSupport implements
switch (ignoreCase ? name.toLowerCase() : name) {
case "accesskey":
case "accessKey": return target.getConfiguration().getAccessKey();
+ case "autodiscoverclient":
+ case "autoDiscoverClient": return
target.getConfiguration().isAutoDiscoverClient();
case "basicpropertybinding":
case "basicPropertyBinding": return target.isBasicPropertyBinding();
case "ecsclient":
diff --git
a/components/camel-aws-ecs/src/generated/resources/org/apache/camel/component/aws/ecs/aws-ecs.json
b/components/camel-aws-ecs/src/generated/resources/org/apache/camel/component/aws/ecs/aws-ecs.json
index 9276a93..991c2ab 100644
---
a/components/camel-aws-ecs/src/generated/resources/org/apache/camel/component/aws/ecs/aws-ecs.json
+++
b/components/camel-aws-ecs/src/generated/resources/org/apache/camel/component/aws/ecs/aws-ecs.json
@@ -21,6 +21,7 @@
"lenientProperties": false
},
"componentProperties": {
+ "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover
Client", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws.ecs.ECSConfiguration", "configurationField":
"configuration", "description": "Setting the autoDiscoverClient mechanism, if
true, the component will look for a client instance in the registry [...]
"accessKey": { "kind": "property", "displayName": "Access Key", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass": "org.apache.camel.component.aws.ecs.ECSConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Access Key" },
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws.ecs.ECSConfiguration",
"deprecated": false, "secret": false, "description": "The component
configuration" },
"ecsClient": { "kind": "property", "displayName": "Ecs Client", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.amazonaws.services.ecs.AmazonECS", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws.ecs.ECSConfiguration", "configurationField":
"configuration", "description": "To use a existing configured AWS ECS as
client" },
@@ -35,6 +36,7 @@
},
"properties": {
"label": { "kind": "path", "displayName": "Label", "group": "producer",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.aws.ecs.ECSConfiguration", "configurationField":
"configuration", "description": "Logical name" },
+ "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover
Client", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws.ecs.ECSConfiguration", "configurationField":
"configuration", "description": "Setting the autoDiscoverClient mechanism, if
true, the component will look for a client instance in the registr [...]
"accessKey": { "kind": "parameter", "displayName": "Access Key", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass": "org.apache.camel.component.aws.ecs.ECSConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Access Key" },
"ecsClient": { "kind": "parameter", "displayName": "Ecs Client", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.amazonaws.services.ecs.AmazonECS", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws.ecs.ECSConfiguration", "configurationField":
"configuration", "description": "To use a existing configured AWS ECS as
client" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the [...]
diff --git a/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
b/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
index a35c905..966b662 100644
--- a/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
+++ b/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
@@ -36,13 +36,14 @@ You can append query options to the URI in the following
format,
// component options: START
-The AWS Elastic Container Service (ECS) component supports 11 options, which
are listed below.
+The AWS Elastic Container Service (ECS) component supports 12 options, which
are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if
true, the component will look for a client instance in the registry
automatically otherwise it will skip that checking. | true | boolean
| *accessKey* (producer) | Amazon AWS Access Key | | String
| *configuration* (producer) | The component configuration | |
ECSConfiguration
| *ecsClient* (producer) | To use a existing configured AWS ECS as client | |
AmazonECS
@@ -79,12 +80,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (11 parameters):
+=== Query Parameters (12 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if
true, the component will look for a client instance in the registry
automatically otherwise it will skip that checking. | true | boolean
| *accessKey* (producer) | Amazon AWS Access Key | | String
| *ecsClient* (producer) | To use a existing configured AWS ECS as client | |
AmazonECS
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
diff --git
a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponent.java
b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponent.java
index fdf512a..7b92473 100644
---
a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponent.java
+++
b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponent.java
@@ -50,7 +50,9 @@ public class ECSComponent extends DefaultComponent {
ECSConfiguration configuration = this.configuration != null ?
this.configuration.copy() : new ECSConfiguration();
ECSEndpoint endpoint = new ECSEndpoint(uri, this, configuration);
setProperties(endpoint, parameters);
- checkAndSetRegistryClient(configuration);
+ if (endpoint.getConfiguration().isAutoDiscoverClient()) {
+ checkAndSetRegistryClient(configuration);
+ }
if (configuration.getEcsClient() == null &&
(configuration.getAccessKey() == null || configuration.getSecretKey() == null))
{
throw new IllegalArgumentException("Amazon ecs client or accessKey
and secretKey must be specified");
}
diff --git
a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSConfiguration.java
b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSConfiguration.java
index 9277fad..8c69ebc 100644
---
a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSConfiguration.java
+++
b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSConfiguration.java
@@ -47,6 +47,8 @@ public class ECSConfiguration implements Cloneable {
private Integer proxyPort;
@UriParam
private String region;
+ @UriParam(label = "common", defaultValue = "true")
+ private boolean autoDiscoverClient = true;
public AmazonECS getEcsClient() {
return ecsClient;
@@ -137,6 +139,19 @@ public class ECSConfiguration implements Cloneable {
this.region = region;
}
+ public boolean isAutoDiscoverClient() {
+ return autoDiscoverClient;
+ }
+
+ /**
+ * Setting the autoDiscoverClient mechanism, if true, the component will
+ * look for a client instance in the registry automatically otherwise it
+ * will skip that checking.
+ */
+ public void setAutoDiscoverClient(boolean autoDiscoverClient) {
+ this.autoDiscoverClient = autoDiscoverClient;
+ }
+
// *************************************************
//
// *************************************************
diff --git
a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentClientRegistryTest.java
b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentClientRegistryTest.java
index 926c457..4200fda 100644
---
a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentClientRegistryTest.java
+++
b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentClientRegistryTest.java
@@ -20,6 +20,8 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class ECSComponentClientRegistryTest extends CamelTestSupport {
@@ -42,4 +44,26 @@ public class ECSComponentClientRegistryTest extends
CamelTestSupport {
assertThrows(IllegalArgumentException.class,
() -> component.createEndpoint("aws-ecs://TestDomain"));
}
+
+ @Test
+ public void createEndpointWithAutoDiscoverClientFalse() throws Exception {
+
+ AmazonECSClientMock clientMock = new AmazonECSClientMock();
+ context.getRegistry().bind("amazonEcsClient", clientMock);
+ ECSComponent component = context.getComponent("aws-ecs",
ECSComponent.class);
+ ECSEndpoint endpoint =
(ECSEndpoint)component.createEndpoint("aws-ecs://TestDomain?accessKey=xxx&secretKey=yyy&autoDiscoverClient=false");
+
+ assertNotSame(clientMock, endpoint.getConfiguration().getEcsClient());
+ }
+
+ @Test
+ public void createEndpointWithAutoDiscoverClientTrue() throws Exception {
+
+ AmazonECSClientMock clientMock = new AmazonECSClientMock();
+ context.getRegistry().bind("amazonEcsClient", clientMock);
+ ECSComponent component = context.getComponent("aws-ecs",
ECSComponent.class);
+ ECSEndpoint endpoint =
(ECSEndpoint)component.createEndpoint("aws-ecs://TestDomain?accessKey=xxx&secretKey=yyy");
+
+ assertSame(clientMock, endpoint.getConfiguration().getEcsClient());
+ }
}
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsEcsComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsEcsComponentBuilderFactory.java
index db8a881..af20426 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsEcsComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsEcsComponentBuilderFactory.java
@@ -47,6 +47,21 @@ public interface AwsEcsComponentBuilderFactory {
*/
interface AwsEcsComponentBuilder extends ComponentBuilder<ECSComponent> {
/**
+ * Setting the autoDiscoverClient mechanism, if true, the component
will
+ * look for a client instance in the registry automatically otherwise
it
+ * will skip that checking.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default AwsEcsComponentBuilder autoDiscoverClient(
+ boolean autoDiscoverClient) {
+ doSetProperty("autoDiscoverClient", autoDiscoverClient);
+ return this;
+ }
+ /**
* Amazon AWS Access Key.
*
* The option is a: <code>java.lang.String</code> type.
@@ -216,6 +231,7 @@ public interface AwsEcsComponentBuilderFactory {
String name,
Object value) {
switch (name) {
+ case "autoDiscoverClient": getOrCreateConfiguration((ECSComponent)
component).setAutoDiscoverClient((boolean) value); return true;
case "accessKey": getOrCreateConfiguration((ECSComponent)
component).setAccessKey((java.lang.String) value); return true;
case "configuration": ((ECSComponent)
component).setConfiguration((org.apache.camel.component.aws.ecs.ECSConfiguration)
value); return true;
case "ecsClient": getOrCreateConfiguration((ECSComponent)
component).setEcsClient((com.amazonaws.services.ecs.AmazonECS) value); return
true;
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 64dbf4b..02d7ddd 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -1004,7 +1004,7 @@ public class StaticEndpointBuilders {
*
* @param path label
*/
- static
org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory.AWS2EC2EndpointBuilder
aws2Ec2(
+ public static
org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory.AWS2EC2EndpointBuilder
aws2Ec2(
String path) {
return
org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory.endpointBuilder("aws2-ec2",
path);
}
@@ -1025,7 +1025,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path label
*/
- static
org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory.AWS2EC2EndpointBuilder
aws2Ec2(
+ public static
org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory.AWS2EC2EndpointBuilder
aws2Ec2(
String componentName,
String path) {
return
org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory.endpointBuilder(componentName,
path);
@@ -1791,7 +1791,7 @@ public class StaticEndpointBuilders {
*
* @param path label
*/
- public static
org.apache.camel.builder.endpoint.dsl.ECSEndpointBuilderFactory.ECSEndpointBuilder
awsEcs(
+ static
org.apache.camel.builder.endpoint.dsl.ECSEndpointBuilderFactory.ECSEndpointBuilder
awsEcs(
String path) {
return
org.apache.camel.builder.endpoint.dsl.ECSEndpointBuilderFactory.endpointBuilder("aws-ecs",
path);
}
@@ -1812,7 +1812,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path label
*/
- public static
org.apache.camel.builder.endpoint.dsl.ECSEndpointBuilderFactory.ECSEndpointBuilder
awsEcs(
+ static
org.apache.camel.builder.endpoint.dsl.ECSEndpointBuilderFactory.ECSEndpointBuilder
awsEcs(
String componentName,
String path) {
return
org.apache.camel.builder.endpoint.dsl.ECSEndpointBuilderFactory.endpointBuilder(componentName,
path);
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
index 579e3ac..279c427 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
@@ -39,6 +39,34 @@ public interface ECSEndpointBuilderFactory {
return (AdvancedECSEndpointBuilder) this;
}
/**
+ * Setting the autoDiscoverClient mechanism, if true, the component
will
+ * look for a client instance in the registry automatically otherwise
it
+ * will skip that checking.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default ECSEndpointBuilder autoDiscoverClient(boolean
autoDiscoverClient) {
+ doSetProperty("autoDiscoverClient", autoDiscoverClient);
+ return this;
+ }
+ /**
+ * Setting the autoDiscoverClient mechanism, if true, the component
will
+ * look for a client instance in the registry automatically otherwise
it
+ * will skip that checking.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Default: true
+ * Group: common
+ */
+ default ECSEndpointBuilder autoDiscoverClient(String
autoDiscoverClient) {
+ doSetProperty("autoDiscoverClient", autoDiscoverClient);
+ return this;
+ }
+ /**
* Amazon AWS Access Key.
*
* The option is a: <code>java.lang.String</code> type.
