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=d86f56ce55c32acd344710f8a73fa3240bbc1bb2;hpb=d30677e80b8756048f9633ecba4c26360e3f644c;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 d86f56c..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);
@@ -43,48 +42,47 @@ public class MicroServiceConfig {
     }
 
     public static String getConsulAddrInfo() {
-        return getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;
+        return "http://" + getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;
     }
 
-    public static String getConfigBindingServiceAddrInfo() {
+    public static String getServiceAddrInfoFromDcaeConsulByHostName(String hostname) {
         String ret = null;
-        String queryString = getConsulAddrInfo() + CONFIG_BINDING_SERVICE;
-        log.info("Query the CBS address using the URL: " + queryString);
+        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 = 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);
         }
-        log.info("The CBS address is " + ret);
+        log.info("The " + hostname + " address is " + ret);
         return ret;
     }
 
     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);
     }
 
-    public static String getServiceAddrInfoFromCBS(String serviceName) {
+    public static String getServiceConfigInfoFromCBS(String hostname) {
         String ret = null;
-        String url = getConfigBindingServiceAddrInfo() + "/service_component/" +serviceName;
+        String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname;
         try {
-            JSONObject jsonObject = JSONObject.fromObject(execQuery(url));
-            log.info("The origin configurations (" + url + ") returned by DCAE is: " + jsonObject.toString());
-            if (jsonObject.has(serviceName)) {
-                ret = (String) jsonObject.getJSONArray(serviceName).get(0);
-            }
+            ret = execQuery(url);
         } catch (Exception e) {
             log.warn(e.getMessage(), e);
         }
+        log.info("The query url is: " + url + ". The corresponding configurations are " + ret);
         return ret;
     }
 
-    public static String getMsbServerAddr() {
-        String[] addrInfo = getMsbAddrInfo();
+    public static String getMsbServerAddrWithHttpPrefix() {
+        String[] addrInfo = getMsbIpAndPort();
         String ret = addrInfo[0] + ":" + addrInfo[1];
         if (!ret.startsWith(AlarmConst.HTTP) || !ret.startsWith(AlarmConst.HTTPS)){
             ret = AlarmConst.HTTP + ret;
@@ -92,33 +90,15 @@ public class MicroServiceConfig {
         return ret;
     }
 
-    public static String[] getMsbAddrInfo() {
-        String[] msbServerInfo = null;
-
-        //String info = getServiceAddrInfoFromCBS(MSB_ADDR);
-        String info = getServiceAddrInfoFromCBS(getEnv(HOSTNAME));
-        log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from CBS. The response is " + info + ".");
-
-        if (info != null){
-            JSONObject infoObj = JSONObject.fromObject(info);
-            String msbInfoTmp = infoObj.has("msb.hostname") ? infoObj.getString("msb.hostname") : null;
-            if (msbInfoTmp != null) {
-                msbServerInfo = split(msbInfoTmp);
-            } else {
-                msbServerInfo = split(getEnv(MSB_ADDR));
-            }
-        } else {
-            msbServerInfo = split(getEnv(MSB_ADDR));
-        }
-
-        return msbServerInfo;
+    public static String[] getMsbIpAndPort() {
+        return split(getEnv(MSB_ADDR));
     }
 
-    public static String[] getServiceAddrInfo() {
+    public static String[] getMicroServiceIpAndPort() {
         String[] serviceAddrInfo = null;
-        String info = getServiceAddrInfoFromCBS(getEnv(HOSTNAME));
-        log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from CBS. The response is " + info + ".");
-        if (info != null){
+        String info = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(HOSTNAME));
+        log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from Consul. The response is " + info + ".");
+        if (info != null && !info.isEmpty()){
             serviceAddrInfo = split(info);
         } else {
             serviceAddrInfo = split(getEnv(HOSTNAME));