[camel] branch master updated: CAMEL-16037 Minio: if autowiredEnabled is set to false on camelContext, minioClient is still autowired (#4886)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 96eb570  CAMEL-16037 Minio: if autowiredEnabled is set to false on camelContext, minioClient is still autowired (#4886)
96eb570 is described below

commit 96eb5704825443ea891a04d108771bbcab2890d0
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Thu Jan 14 20:12:21 2021 +0100

    CAMEL-16037 Minio: if autowiredEnabled is set to false on camelContext, minioClient is still autowired (#4886)
---
 .../apache/camel/component/minio/MinioComponent.java | 20 --------------------
 .../minio/MinioComponentConfigurationTest.java       | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioComponent.java b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioComponent.java
index 64e960e..a87608b 100644
--- a/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioComponent.java
+++ b/components/camel-minio/src/main/java/org/apache/camel/component/minio/MinioComponent.java
@@ -17,9 +17,7 @@
 package org.apache.camel.component.minio;
 
 import java.util.Map;
-import java.util.Set;
 
-import io.minio.MinioClient;
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
@@ -58,7 +56,6 @@ public class MinioComponent extends DefaultComponent {
         configuration.setBucketName(remaining);
         MinioEndpoint endpoint = new MinioEndpoint(uri, this, configuration);
         setProperties(endpoint, parameters);
-        checkAndSetRegistryClient(configuration, endpoint);
 
         return endpoint;
     }
@@ -73,21 +70,4 @@ public class MinioComponent extends DefaultComponent {
     public void setConfiguration(MinioConfiguration configuration) {
         this.configuration = configuration;
     }
-
-    private void checkAndSetRegistryClient(MinioConfiguration configuration, MinioEndpoint endpoint) {
-        if (isEmpty(endpoint.getConfiguration().getMinioClient())) {
-            LOG.debug("Looking for an MinioClient instance in the registry");
-            Set<MinioClient> clients = getCamelContext().getRegistry().findByType(MinioClient.class);
-            if (clients.size() > 1) {
-                LOG.debug("Found more than one MinioClient instance in the registry");
-            } else if (clients.size() == 1) {
-                LOG.debug("Found exactly one MinioClient instance in the registry");
-                configuration.setMinioClient(clients.stream().findFirst().get());
-            } else {
-                LOG.debug("No MinioClient instance in the registry");
-            }
-        } else {
-            LOG.debug("MinioClient instance is already set at endpoint level: skipping the check in the registry");
-        }
-    }
 }
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioComponentConfigurationTest.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioComponentConfigurationTest.java
index d67f782..5ba72ed 100644
--- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioComponentConfigurationTest.java
+++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/MinioComponentConfigurationTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
 class MinioComponentConfigurationTest extends CamelTestSupport {
@@ -55,4 +56,22 @@ class MinioComponentConfigurationTest extends CamelTestSupport {
         assertEquals("MyBucket", endpoint.getConfiguration().getBucketName());
         assertSame(client, endpoint.getConfiguration().getMinioClient());
     }
+
+    @Test
+    void createEndpoinWthAutowiredDisabledAndClientExistInRegistry() throws Exception {
+        final Properties properties = MinioTestUtils.loadMinioPropertiesFile();
+
+        context.setAutowiredEnabled(false);
+        MinioClient client = MinioClient.builder()
+                .endpoint(properties.getProperty("endpoint"))
+                .build();
+        context.getRegistry().bind("minioClient", client);
+        MinioComponent component = context.getComponent("minio", MinioComponent.class);
+        MinioEndpoint endpoint = (MinioEndpoint) component
+                .createEndpoint(
+                        "minio://MyBucket?accessKey=RAW(XXX)&secretKey=RAW(XXX)&region=eu-west-1&endpoint=https://play.min.io");
+        context.setAutowiredEnabled(true);
+        assertEquals("MyBucket", endpoint.getConfiguration().getBucketName());
+        assertNull(endpoint.getConfiguration().getMinioClient());
+    }
 }