Refactor code and add more info logs

Author: tadayosi

src/main/java/com/github/tadayosi/torchserve/client/Configuration.java

@@ -25,26 +25,28 @@ public class Configuration {
     public static final String METRICS_ADDRESS = "metrics.address";
     public static final String METRICS_PORT = "metrics.port";
 
-    private Optional<String> inferenceKey;
-    private Optional<String> inferenceAddress;
-    private Optional<Integer> inferencePort;
+    private final Optional<String> inferenceKey;
+    private final Optional<String> inferenceAddress;
+    private final Optional<Integer> inferencePort;
 
-    private Optional<String> managementKey;
-    private Optional<String> managementAddress;
-    private Optional<Integer> managementPort;
+    private final Optional<String> managementKey;
+    private final Optional<String> managementAddress;
+    private final Optional<Integer> managementPort;
 
-    private Optional<String> metricsAddress;
-    private Optional<Integer> metricsPort;
+    private final Optional<String> metricsAddress;
+    private final Optional<Integer> metricsPort;
 
     private Configuration() {
         Properties props = loadProperties();
 
         this.inferenceKey = loadProperty(INFERENCE_KEY, props);
         this.inferenceAddress = loadProperty(INFERENCE_ADDRESS, props);
         this.inferencePort = loadProperty(INFERENCE_PORT, props).map(Integer::parseInt);
+
         this.managementKey = loadProperty(MANAGEMENT_KEY, props);
         this.managementAddress = loadProperty(MANAGEMENT_ADDRESS, props);
         this.managementPort = loadProperty(MANAGEMENT_PORT, props).map(Integer::parseInt);
+
         this.metricsAddress = loadProperty(METRICS_ADDRESS, props);
         this.metricsPort = loadProperty(METRICS_PORT, props).map(Integer::parseInt);
     }
@@ -66,9 +68,11 @@ static Properties loadProperties() {
      */
     static Optional<String> loadProperty(String key, Properties properties) {
         String tsc4jKey = TSC4J_PREFIX + key;
-        return Optional.ofNullable(System.getProperty(tsc4jKey))
+        Optional<String> value = Optional.ofNullable(System.getProperty(tsc4jKey))
             .or(() -> Optional.ofNullable(System.getenv(tsc4jKey.toUpperCase().replace(".", "_"))))
             .or(() -> Optional.ofNullable(properties.getProperty(key)));
+        LOG.debug("Loaded property {}: {}", key, value.orElse(null));
+        return value;
     }
 
     public static Configuration load() {

src/main/java/com/github/tadayosi/torchserve/client/TorchServeClient.java

@@ -12,10 +12,6 @@ public class TorchServeClient {
     private final Management management;
     private final Metrics metrics;
 
-    private TorchServeClient() {
-        this(new DefaultInference(), new DefaultManagement(), new DefaultMetrics());
-    }
-
     private TorchServeClient(Inference inference, Management management, Metrics metrics) {
         this.inference = inference;
         this.management = management;
@@ -98,19 +94,20 @@ public Builder metricsPort(Integer port) {
         }
 
         public TorchServeClient build() {
+            System.out.println(inferencePort.get());
             DefaultInference inference = inferenceAddress.map(DefaultInference::new)
-                .orElse(inferencePort.map(DefaultInference::new)
-                    .orElse(new DefaultInference()));
+                .or(() -> inferencePort.map(DefaultInference::new))
+                .orElse(new DefaultInference());
             inferenceKey.ifPresent(inference::setAuthToken);
 
             DefaultManagement management = managementAddress.map(DefaultManagement::new)
-                .orElse(managementPort.map(DefaultManagement::new)
-                    .orElse(new DefaultManagement()));
+                .or(() -> managementPort.map(DefaultManagement::new))
+                .orElse(new DefaultManagement());
             managementKey.ifPresent(management::setAuthToken);
 
             DefaultMetrics metrics = metricsAddress.map(DefaultMetrics::new)
-                .orElse(metricsPort.map(DefaultMetrics::new)
-                    .orElse(new DefaultMetrics()));
+                .or(() -> metricsPort.map(DefaultMetrics::new))
+                .orElse(new DefaultMetrics());
             return new TorchServeClient(inference, management, metrics);
         }
     }

src/main/java/com/github/tadayosi/torchserve/client/impl/DefaultInference.java

@@ -6,9 +6,13 @@
 import com.github.tadayosi.torchserve.client.model.Api;
 import com.github.tadayosi.torchserve.client.model.ApiException;
 import com.github.tadayosi.torchserve.client.model.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultInference implements Inference {
 
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultInference.class);
+
     private final DefaultApi api;
 
     public DefaultInference() {
@@ -22,6 +26,7 @@ public DefaultInference(int port) {
     public DefaultInference(String address) {
         ApiClient client = new ApiClient().setBasePath(address);
         this.api = new DefaultApi(client);
+        LOG.info("Inference API address: {}", address);
     }
 
     public void setAuthToken(String token) {

src/main/java/com/github/tadayosi/torchserve/client/impl/DefaultManagement.java

@@ -13,9 +13,13 @@
 import com.github.tadayosi.torchserve.client.model.Response;
 import com.github.tadayosi.torchserve.client.model.SetAutoScaleOptions;
 import com.github.tadayosi.torchserve.client.model.UnregisterModelOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultManagement implements Management {
 
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultManagement.class);
+
     private final DefaultApi api;
 
     public DefaultManagement() {
@@ -29,6 +33,7 @@ public DefaultManagement(int port) {
     public DefaultManagement(String address) {
         ApiClient client = new ApiClient().setBasePath(address);
         this.api = new DefaultApi(client);
+        LOG.info("Management API address: {}", address);
     }
 
     public void setAuthToken(String token) {

src/main/java/com/github/tadayosi/torchserve/client/impl/DefaultMetrics.java

@@ -4,9 +4,13 @@
 import com.github.tadayosi.torchserve.client.metrics.api.DefaultApi;
 import com.github.tadayosi.torchserve.client.metrics.invoker.ApiClient;
 import com.github.tadayosi.torchserve.client.model.ApiException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultMetrics implements Metrics {
 
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultMetrics.class);
+
     private final DefaultApi api;
 
     public DefaultMetrics() {
@@ -20,6 +24,7 @@ public DefaultMetrics(int port) {
     public DefaultMetrics(String address) {
         ApiClient client = new ApiClient().setBasePath(address);
         this.api = new DefaultApi(client);
+        LOG.info("Metrics API address: {}", address);
     }
 
     @Override

src/test/java/com/github/tadayosi/torchserve/client/ConfigurationTest.java

@@ -1,6 +1,5 @@
 package com.github.tadayosi.torchserve.client;
 
-import com.github.tadayosi.torchserve.client.model.ApiException;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;