Merge pull request #67 from ericglau/master

Fix imports, use of static method

Author: gkwan-ibm

Diff for: finish/src/main/java/io/openliberty/guides/config/CustomConfigSource.java

@@ -14,14 +14,18 @@
 // tag::customConfig[]
 package io.openliberty.guides.config;
 
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
-import javax.json.Json;
-import java.math.BigDecimal;
-import java.util.*;
-import java.io.StringReader;
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.json.Json;
+import javax.json.stream.JsonParser;
+import javax.json.stream.JsonParser.Event;
+
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
 public class CustomConfigSource implements ConfigSource {

Diff for: finish/src/main/java/io/openliberty/guides/inventory/InventoryHealth.java

@@ -19,7 +19,6 @@
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import io.openliberty.guides.inventory.client.SystemClient;
 import org.eclipse.microprofile.health.Health;
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
@@ -30,14 +29,12 @@ public class InventoryHealth implements HealthCheck {
   @Inject
   InventoryConfig config;
 
-  private InventoryUtils invUtils = new InventoryUtils();
-
   public boolean isHealthy() {
     if (config.isInMaintenance()) {
       return false;
     }
     try {
-      String url = invUtils.buildUrl("http", "localhost",
+      String url = InventoryUtils.buildUrl("http", "localhost",
           Integer.parseInt(System.getProperty("default.http.port")),
           "/system/properties");
       Client client = ClientBuilder.newClient();

Diff for: finish/src/main/java/io/openliberty/guides/inventory/model/SystemData.java

@@ -12,8 +12,6 @@
 // end::copyright[]
 package io.openliberty.guides.inventory.model;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
 public class SystemData {

Diff for: start/src/main/java/io/openliberty/guides/config/CustomConfigSource.java

@@ -14,14 +14,18 @@
 // tag::customConfig[]
 package io.openliberty.guides.config;
 
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
-import javax.json.Json;
-import java.math.BigDecimal;
-import java.util.*;
-import java.io.StringReader;
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.json.Json;
+import javax.json.stream.JsonParser;
+import javax.json.stream.JsonParser.Event;
+
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
 public class CustomConfigSource implements ConfigSource {

Diff for: start/src/main/java/io/openliberty/guides/inventory/model/SystemData.java

@@ -12,8 +12,6 @@
 // end::copyright[]
 package io.openliberty.guides.inventory.model;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
 public class SystemData {

Diff for: start/src/test/java/it/io/openliberty/guides/health/HealthTestUtil.java

@@ -18,7 +18,6 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
-import java.io.IOException;
 import javax.json.JsonArray;
 import javax.json.JsonObject;
 import javax.ws.rs.client.Client;