[camel] 01/02: CAMEL-14690 - Camel-AWS2: Better logging when checking client instance in the registry, ECS

[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 27b3af5a7098afd790a08fb7f19b13894b2a430b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 11 11:49:39 2020 +0100

    CAMEL-14690 - Camel-AWS2: Better logging when checking client instance in the registry, ECS
---
 .../camel/component/aws2/ecs/ECS2Component.java    | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/components/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java b/components/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java
index 8c05af1..e7cbe52 100644
--- a/components/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java
+++ b/components/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java
@@ -24,6 +24,10 @@ 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import software.amazon.awssdk.services.ecs.EcsClient;
 
 /**
@@ -32,6 +36,8 @@ import software.amazon.awssdk.services.ecs.EcsClient;
 @Component("aws2-ecs")
 public class ECS2Component extends DefaultComponent {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ECS2Component.class);
+    
     @Metadata
     private ECS2Configuration configuration = new ECS2Configuration();
 
@@ -50,7 +56,7 @@ public class ECS2Component extends DefaultComponent {
         ECS2Configuration configuration = this.configuration != null ? this.configuration.copy() : new ECS2Configuration();
         ECS2Endpoint endpoint = new ECS2Endpoint(uri, this, configuration);
         setProperties(endpoint, parameters);
-        checkAndSetRegistryClient(configuration);
+        checkAndSetRegistryClient(configuration, endpoint);
         if (configuration.getEcsClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) {
             throw new IllegalArgumentException("Amazon ecs client or accessKey and secretKey must be specified");
         }
@@ -69,10 +75,18 @@ public class ECS2Component extends DefaultComponent {
         this.configuration = configuration;
     }
 
-    private void checkAndSetRegistryClient(ECS2Configuration configuration) {
-        Set<EcsClient> clients = getCamelContext().getRegistry().findByType(EcsClient.class);
-        if (clients.size() == 1) {
-            configuration.setEcsClient(clients.stream().findFirst().get());
+    private void checkAndSetRegistryClient(ECS2Configuration configuration, ECS2Endpoint endpoint) {
+        if (ObjectHelper.isEmpty(endpoint.getConfiguration().getEcsClient())) {
+            LOG.debug("Looking for an EcsClient instance in the registry");
+            Set<EcsClient> clients = getCamelContext().getRegistry().findByType(EcsClient.class);
+            if (clients.size() == 1) {
+                LOG.debug("Found exactly one EcsClient instance in the registry");
+                configuration.setEcsClient(clients.stream().findFirst().get());
+            } else {
+                LOG.debug("No EcsClient instance in the registry");
+            }
+        } else {
+            LOG.debug("EcsClient instance is already set at endpoint level: skipping the check in the registry");
         }
     }
 }