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=97c7141d1f53137bd0cfbf85abe1cea95656713c;hb=6f99775bd30cea7a2471ba37b875067a40bd5aeb;hp=43fef116acfd41d7b8b9b681677398b79ab4995c;hpb=c08c42c56caaa197f950f6479944bf95593063bc;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 43fef11..97c7141 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
@@ -19,14 +19,10 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.onap.holmes.common.constant.AlarmConst;
+import org.onap.holmes.common.utils.JerseyClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
-import java.util.regex.Pattern;
-
 import static org.onap.holmes.common.utils.CommonUtils.getEnv;
 import static org.onap.holmes.common.utils.CommonUtils.isIpAddress;
 
@@ -37,7 +33,6 @@ public class MicroServiceConfig {
     final static public String HOSTNAME = "HOSTNAME";
     final static public String POD_IP = "POD_IP";
     final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE";
-    final static public String DOCKER_HOST = "DOCKER_HOST";
     final static public String MSB_ADDR = "MSB_ADDR";
     final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST";
     final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT";
@@ -74,19 +69,12 @@ public class MicroServiceConfig {
     }
 
     private static String execQuery(String queryString) {
-        Client client = ClientBuilder.newBuilder().build();
-        Response response = client.target(queryString).request().get();
-        return response.readEntity(String.class);
+        return JerseyClient.newInstance().get(queryString);
     }
 
     public static String getServiceConfigInfoFromCBS(String hostname) {
-        String ret = null;
         String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname;
-        try {
-            ret = execQuery(url);
-        } catch (Exception e) {
-            log.warn(e.getMessage(), e);
-        }
+        String ret = execQuery(url);
         log.info("The query url is: " + url + ". The corresponding configurations are " + ret);
         return ret;
     }
@@ -125,7 +113,6 @@ public class MicroServiceConfig {
     }
 
 
-
     private static String[] split(String addr) {
         String ip;
         String port = "80";