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 9a1b0ea..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,12 +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.onap.holmes.common.constant.AlarmConst;\r
 \r
 @Slf4j\r
@@ -50,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