Refactors

Author: Auri Munoz

extensions/smallrye-stork/deployment/src/main/java/io/quarkus/stork/deployment/SmallRyeStorkProcessor.java

@@ -111,24 +111,28 @@ void checkStorkConsulRegistrar(BuildProducer<StorkRegistrationBuildItem> registr
             BuildProducer<RunTimeConfigurationDefaultBuildItem> config,
             StorkRegistrarConfigRecorder registrarConfigRecorder, StorkConfiguration configuration, Capabilities capabilities,
             CombinedIndexBuildItem index) {
-        String smallryeHealthCheckDefaultUrl = "";
+        String smallryeHealthCheckDefaultPath = getDefaultHealthCheckPath(capabilities, ConfigProvider.getConfig());
         if (QuarkusClassLoader.isClassPresentAtRuntime(CONSUL_SERVICE_REGISTRAR_PROVIDER)) {
-            if (capabilities.isPresent(Capability.SMALLRYE_HEALTH)) {
-                Config quarkusConfig = ConfigProvider.getConfig();
-                smallryeHealthCheckDefaultUrl = quarkusConfig.getConfigValue("quarkus.management.root-path").getValue() + "/"
-                        + quarkusConfig.getConfigValue("quarkus.smallrye-health.root-path").getValue() + "/"
-                        + quarkusConfig.getConfigValue("quarkus.smallrye-health.liveness-path").getValue();
-            }
             registrarConfigRecorder.setupServiceRegistrarConfig(configuration, CONSUL_SERVICE_REGISTRAR_TYPE,
-                    smallryeHealthCheckDefaultUrl);
+                    smallryeHealthCheckDefaultPath);
         } else if (QuarkusClassLoader.isClassPresentAtRuntime(EUREKA_SERVICE_REGISTRAR_PROVIDER)) {
             registrarConfigRecorder.setupServiceRegistrarConfig(configuration, EUREKA_SERVICE_REGISTRAR_TYPE,
-                    smallryeHealthCheckDefaultUrl);
+                    smallryeHealthCheckDefaultPath);
         }
         registration.produce(new StorkRegistrationBuildItem());
 
     }
 
+    private static String getDefaultHealthCheckPath(Capabilities capabilities, Config quarkusConfig) {
+        String smallryeHealthCheckDefaultPath = "";
+        if (capabilities.isPresent(Capability.SMALLRYE_HEALTH)) {
+            smallryeHealthCheckDefaultPath = quarkusConfig.getConfigValue("quarkus.management.root-path").getValue() + "/"
+                    + quarkusConfig.getConfigValue("quarkus.smallrye-health.root-path").getValue() + "/"
+                    + quarkusConfig.getConfigValue("quarkus.smallrye-health.liveness-path").getValue();
+        }
+        return smallryeHealthCheckDefaultPath;
+    }
+
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     void registerServiceInstance(StorkInitializedBuildItem storkInitializedBuildItem, ShutdownContextBuildItem shutdown,

extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/SmallRyeStorkRegistrationRecorder.java

@@ -1,6 +1,5 @@
 package io.quarkus.stork;
 
-import java.net.InetAddress;
 import java.util.List;
 import java.util.Map;
 
@@ -28,14 +27,9 @@ public void registerServiceInstance(StorkConfiguration configuration) {
                 }
             }
             Map<String, String> parameters = serviceConfig.serviceRegistrar().parameters();
-            String host = parameters.containsKey("ip-address") ? parameters.get("ip-address")
-                    : quarkusConfig.getValue("quarkus.http.host", String.class);
-            int port = parameters.containsKey("port") ? Integer.parseInt(parameters.get("port"))
-                    : Integer.parseInt(quarkusConfig.getValue("quarkus.http.port", String.class));
-            if (host == null || host.isEmpty()) {
-                InetAddress inetAddress = StorkConfigUtil.detectAddress();
-                host = inetAddress != null ? inetAddress.getHostAddress() : host;
-            }
+            String host = StorkConfigUtil.getOrDefaultHost(parameters,
+                    quarkusConfig);
+            int port = StorkConfigUtil.getOrDefaultPort(parameters, quarkusConfig);
             Stork.getInstance().getService(serviceName).getServiceRegistrar().registerServiceInstance(serviceName, host,
                     port).await().indefinitely();
         }

extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/StorkConfigUtil.java

@@ -12,6 +12,8 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 
 import io.smallrye.stork.api.config.ServiceConfig;
@@ -20,6 +22,8 @@
 public class StorkConfigUtil {
 
     private static final Logger LOGGER = Logger.getLogger(StorkConfigUtil.class.getName());
+    public static final String HTTPS = "https://";
+    public static final String QUARKUS_HTTP_HOST = "quarkus.http.host";
 
     public static List<ServiceConfig> toStorkServiceConfig(StorkConfiguration storkConfiguration) {
         List<ServiceConfig> storkServicesConfigs = new ArrayList<>();
@@ -48,10 +52,14 @@ public static List<ServiceConfig> toStorkServiceConfig(StorkConfiguration storkC
         return storkServicesConfigs;
     }
 
-    public static ServiceConfiguration buildDefaultRegistrarConfiguration(String serviceRegistrarType, String healthCheckUrl) {
+    public static ServiceConfiguration buildDefaultRegistrarConfiguration(String serviceRegistrarType, String healthCheckPath) {
         Map<String, String> parameters = new HashMap<>();
-        if (healthCheckUrl != null && !healthCheckUrl.isBlank()) {
-            parameters.put("health-check-url", healthCheckUrl);
+        Config quarkusConfig = ConfigProvider.getConfig();
+        String defaultHost = quarkusConfig.getValue(QUARKUS_HTTP_HOST, String.class);
+        if (healthCheckPath != null && !healthCheckPath.isBlank()) {
+            healthCheckPath = HTTPS + getOrDefaultHost(parameters, quarkusConfig) + ":"
+                    + getOrDefaultPort(parameters, quarkusConfig) + healthCheckPath;
+            parameters.put("health-check-url", healthCheckPath);
         }
         return buildServiceConfigurationWithRegistrar(serviceRegistrarType, parameters);
     }
@@ -106,6 +114,22 @@ public Map<String, String> parameters() {
         };
     }
 
+    public static String getOrDefaultHost(Map<String, String> parameters, Config quarkusConfig) {
+        String customHost = parameters.containsKey("ip-address") ? parameters.get("ip-address")
+                : null;
+        String defaultHost = quarkusConfig.getValue("quarkus.http.host", String.class);
+        if (customHost == null || customHost.isEmpty()) {
+            InetAddress inetAddress = StorkConfigUtil.detectAddress();
+            customHost = inetAddress != null ? inetAddress.getHostAddress() : defaultHost;
+        }
+        return customHost;
+    }
+
+    public static int getOrDefaultPort(Map<String, String> parameters, Config quarkusConfig) {
+        String customPort =  parameters.getOrDefault("port", quarkusConfig.getValue("quarkus.http.port", String.class));
+        return Integer.parseInt(customPort);
+    }
+
     public static InetAddress detectAddress() {
         InetAddress result = null;
         try {