X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fconfig%2FMicroServiceConfig.java;h=f74d1b2978198faba803b91510b1a30f9104b3b2;hb=bbf13d0f5335ec70948baf84d2289dc431b12734;hp=2be8824ebb8e1fd634f581a5cb49840c615c91d0;hpb=1be6bdd6b55219294a9ce6f708433fef3737cc13;p=holmes%2Fcommon.git

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