camel-quarkus-minio: quarkus.minio.url is mandatory and must be a val…

…id url
apache · Jul 19, 2021 · e4a94be · e4a94be
1 parent 6489700
commit e4a94be
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 85 deletions.
diff --git a/...ent/src/main/java/org/apache/camel/quarkus/component/minio/deployment/MinioProcessor.java b/...ent/src/main/java/org/apache/camel/quarkus/component/minio/deployment/MinioProcessor.java
@@ -18,6 +18,7 @@
 
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
 
 class MinioProcessor {
 
@@ -27,4 +28,9 @@ class MinioProcessor {
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
     }
+
+    @BuildStep
+    RunTimeConfigurationDefaultBuildItem allowEmptyMinioClient() {
+        return new RunTimeConfigurationDefaultBuildItem("quarkus.minio.allow-empty", "true");
+    }
 }
diff --git a/.../minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java b/.../minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java
@@ -25,12 +25,14 @@
 
 public class MinioClientProducer {
 
+    public static String MINIO_CLIENT_URL_PARAMETER = MinioClientProducer.class.getSimpleName() + "_url";
+
     @Produces
     @Singleton
     @Named("minioClient")
     public MinioClient produceMinioClient() {
         return MinioClient.builder()
-                .endpoint(ConfigProvider.getConfig().getValue("quarkus.minio.url", String.class))
+                .endpoint(ConfigProvider.getConfig().getValue(MINIO_CLIENT_URL_PARAMETER, String.class))
                 .credentials(MinioResource.SERVER_ACCESS_KEY, MinioResource.SERVER_SECRET_KEY)
                 .build();
     }

diff --git a/.../minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioConfigProvider.java b/.../minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioConfigProvider.java
diff --git a/...-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioResource.java b/...-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioResource.java
@@ -60,8 +60,7 @@ public String consumer() {
         final String message = consumerTemplate.receiveBody(
                 "minio://mycamel?moveAfterRead=true&destinationBucketName=camel-kafka-connector&autoCreateBucket=true"
                         + "&accessKey=" + SERVER_ACCESS_KEY
-                        + "&secretKey=RAW(" + SERVER_SECRET_KEY + ")"
-                        + "&minioClient=#minioClient",
+                        + "&secretKey=RAW(" + SERVER_SECRET_KEY + ")",
                 5000, String.class);
         return message;
     }
@@ -77,8 +76,7 @@ public String operation(String body,
             @QueryParam(MinioConstants.DESTINATION_BUCKET_NAME) String destinationBucketName) {
 
         String endpoint = "minio:mycamel?accessKey=" + SERVER_ACCESS_KEY
-                + "&secretKey=RAW(" + SERVER_SECRET_KEY + ")"
-                + "&minioClient=#minioClient";
+                + "&secretKey=RAW(" + SERVER_SECRET_KEY + ")";
 
         MinioOperations op = (operation != "" && !"".equals(operation) ? MinioOperations.valueOf(operation) : null);
 
@@ -135,8 +133,8 @@ public String getUsingPojo(String bucket,
 
         String endpoint = "minio:mycamel?accessKey=" + SERVER_ACCESS_KEY
                 + "&secretKey=RAW(" + SERVER_SECRET_KEY + ")"
-                + "&minioClient=#minioClient"
-                + "&pojoRequest=true";
+                + "&pojoRequest=true"
+                + "&minioClient=#minioClient";
 
         GetObjectArgs.Builder body = GetObjectArgs.builder()
                 .bucket(bucket)

diff --git a/...main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider b/...main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
diff --git a/...ts/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java b/...ts/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java
@@ -49,7 +49,7 @@ public Map<String, String> start() {
         String host = minioServer.getHost();
 
         return CollectionHelper.mapOf(
-                "quarkus.minio.url", String.format("http://%s:%s", host, port));
+                MinioClientProducer.MINIO_CLIENT_URL_PARAMETER, String.format("http://%s:%s", host, port));
     }
 
     @Override