Accept URI

Author: FrogDevelopper

consul-populate-core/src/main/java/com/frogdevelopment/consul/populate/config/ConsulFactory.java

@@ -1,5 +1,7 @@
 package com.frogdevelopment.consul.populate.config;
 
+import java.net.URI;
+
 import jakarta.inject.Singleton;
 
 import io.micronaut.context.annotation.Bean;
@@ -17,6 +19,8 @@
 @Factory
 public class ConsulFactory {
 
+    static final int DEFAULT_HTTP_PORT = 80;
+
     @Singleton
     @Bean(preDestroy = "close")
     Vertx vertx() {
@@ -26,13 +30,28 @@ Vertx vertx() {
     @Singleton
     @Bean(preDestroy = "close")
     ConsulClient consulClient(final Vertx vertx, final GlobalProperties properties) {
-        final var consulClientOptions = new ConsulClientOptions()
-                .setHost(properties.getHost())
-                .setPort(properties.getPort())
-                .setSsl(properties.isSecured());
+        final ConsulClientOptions consulClientOptions;
+        if (properties.getUri().isPresent()) {
+            final var uri = URI.create(properties.getUri().get());
+            consulClientOptions = new ConsulClientOptions()
+                    .setHost(uri.getHost())
+                    .setSsl("https".equalsIgnoreCase(uri.getScheme()));
+            final var port = uri.getPort();
+            if (port >= 0) {
+                consulClientOptions.setPort(port);
+            } else {
+                consulClientOptions.setPort(DEFAULT_HTTP_PORT); // default port when providing a URI without port
+            }
+        } else {
+            consulClientOptions = new ConsulClientOptions()
+                    .setHost(properties.getHost())
+                    .setPort(properties.getPort())
+                    .setSsl(properties.isSecured());
+        }
         properties.getDc().ifPresent(consulClientOptions::setDc);
         properties.getAclToken().ifPresent(consulClientOptions::setAclToken);
         properties.getTimeout().ifPresent(consulClientOptions::setTimeout);
+//        properties.getConnectTimeout().ifPresent(consulClientOptions::setConnectTimeout);
 
         return ConsulClient.create(vertx, consulClientOptions);
     }

consul-populate-core/src/main/java/com/frogdevelopment/consul/populate/config/GlobalProperties.java

@@ -5,6 +5,7 @@
 
 import java.util.Optional;
 import java.util.OptionalLong;
+
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
@@ -23,6 +24,8 @@
 @ConfigurationProperties("consul")
 public class GlobalProperties {
 
+    private Optional<String> uri = Optional.of("http://localhost:8500");
+
     /**
      * Consul host. Defaults to {@code localhost}
      */