[camel] 01/04: CAMEL-16512 - Camel-Azure components: mark the clients as autowired - Storage-Queue

[acosentino]

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 5adbf2fb6ef9a0bce4ccdf409fbf9c87129951a0
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Apr 15 15:07:47 2021 +0200

    CAMEL-16512 - Camel-Azure components: mark the clients as autowired - 
Storage-Queue
---
 .../azure/storage/queue/QueueComponent.java          | 20 +-------------------
 .../azure/storage/queue/QueueConfiguration.java      | 14 --------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git 
a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueComponent.java
 
b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueComponent.java
index d34f51b..6af4d28 100644
--- 
a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueComponent.java
+++ 
b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueComponent.java
@@ -71,9 +71,6 @@ public class QueueComponent extends DefaultComponent {
         final QueueEndpoint endpoint = new QueueEndpoint(uri, this, 
configuration);
         setProperties(endpoint, parameters);
 
-        if (configuration.isAutoDiscoverClient()) {
-            checkAndSetRegistryClient(configuration);
-        }
 
         checkCredentials(configuration);
         validateConfigurations(configuration);
@@ -104,22 +101,7 @@ public class QueueComponent extends DefaultComponent {
             }
         }
     }
-
-    private void checkAndSetRegistryClient(final QueueConfiguration 
configuration) {
-        if (ObjectHelper.isEmpty(configuration.getServiceClient())) {
-            final Set<QueueServiceClient> clients = 
getCamelContext().getRegistry().findByType(QueueServiceClient.class);
-            if (clients.size() == 1) {
-                
configuration.setServiceClient(clients.stream().findFirst().get());
-            } else if (clients.size() > 1) {
-                LOG.info("More than one QueueServiceClient instance in the 
registry, make sure to have only one instance");
-            } else {
-                LOG.info("No QueueServiceClient instance in the registry");
-            }
-        } else {
-            LOG.info("QueueServiceClient instance is already set at endpoint 
level: skipping the check in the registry");
-        }
-    }
-
+    
     private void validateConfigurations(final QueueConfiguration 
configuration) {
         if (configuration.getServiceClient() == null && 
configuration.getAccessKey() == null
                 && configuration.getCredentials() == null) {
diff --git 
a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueConfiguration.java
 
b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueConfiguration.java
index 2fab4be..ab9c15c 100644
--- 
a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueConfiguration.java
+++ 
b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueConfiguration.java
@@ -40,8 +40,6 @@ public class QueueConfiguration implements Cloneable {
     @UriParam(label = "common")
     @Metadata(autowired = true)
     private QueueServiceClient serviceClient;
-    @UriParam(label = "common", defaultValue = "true")
-    private boolean autoDiscoverClient = true;
     @UriParam(label = "producer")
     private QueueOperationDefinition operation = 
QueueOperationDefinition.sendMessage;
     @UriParam(label = "producer", defaultValue = "true")
@@ -222,18 +220,6 @@ public class QueueConfiguration implements Cloneable {
         this.popReceipt = popReceipt;
     }
 
-    /**
-     * 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 boolean isAutoDiscoverClient() {
-        return autoDiscoverClient;
-    }
-
-    public void setAutoDiscoverClient(boolean autoDiscoverClient) {
-        this.autoDiscoverClient = autoDiscoverClient;
-    }
-
     // *************************************************
     //
     // *************************************************