Test Replace Jackson with GSON

[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / config / MicroServiceConfig.java

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index 2be8824..f74d1b2 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -15,13 +15,12 @@
  */\r
 package org.onap.holmes.common.config;\r
 \r
+import com.alibaba.fastjson.JSON;\r
+import com.alibaba.fastjson.JSONObject;\r
 import javax.ws.rs.client.Client;\r
 import javax.ws.rs.client.ClientBuilder;\r
 import javax.ws.rs.core.Response;\r
 import lombok.extern.slf4j.Slf4j;\r
-import net.sf.json.JSONArray;\r
-import net.sf.json.JSONObject;\r
-import org.glassfish.jersey.client.ClientConfig;\r
 import org.onap.holmes.common.constant.AlarmConst;\r
 \r
 @Slf4j\r
@@ -34,7 +33,7 @@ public class MicroServiceConfig {
     final static public String DOCKER_HOST = "DOCKER_HOST";\r
     final static public String MSB_ADDR = "MSB_ADDR";\r
 \r
-    private static String getEnv(String name) {\r
+    public static String getEnv(String name) {\r
         String value = System.getenv(name);\r
         if (value == null) {\r
             value = System.getProperty(name);\r
@@ -51,9 +50,11 @@ public class MicroServiceConfig {
         String queryString = getConsulAddrInfo() + hostname;\r
         log.info("Query the " + hostname + " address using the URL: " + queryString);\r
         try {\r
-            JSONObject addrJson = (JSONObject) JSONArray.fromObject(execQuery(queryString)).get(0);\r
-            if (addrJson.has("ServiceAddress") && addrJson.has("ServicePort")) {\r
-                ret = "http://" + addrJson.getString("ServiceAddress") + ":" + addrJson.getString("ServicePort");\r
+            JSONObject addrJson = (JSONObject) JSON.parseArray(execQuery(queryString)).get(0);\r
+            if (addrJson != null && addrJson.get("ServiceAddress") != null\r
+                    && addrJson.get("ServicePort") != null) {\r
+                ret = "http://" + addrJson.getString("ServiceAddress") + ":" + addrJson\r
+                        .getString("ServicePort");\r
             }\r
         } catch (Exception e) {\r
             log.warn(e.getMessage(), e);\r
@@ -63,7 +64,7 @@ public class MicroServiceConfig {
     }\r
 \r
     private static String execQuery(String queryString) {\r
-        Client client = ClientBuilder.newClient(new ClientConfig());\r
+        Client client = ClientBuilder.newBuilder().build();\r
         Response response = client.target(queryString).request().get();\r
         return response.readEntity(String.class);\r
     }\r