X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fcommon.git;a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fconfig%2FMicroServiceConfig.java;h=33bd1d2e7c763a5cdddc5e162345397e0eb7a7d6;hp=3d94325c7e15c1173f7537ec4192384d25b705c7;hb=490fc3c1fafe50d5fb0e23db5cfd10730be96866;hpb=3e5ddaee6984869b67dda89b7f8e1932a2b27045

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 3d94325..33bd1d2 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
@@ -1,5 +1,5 @@
 /**
- * Copyright  2017 ZTE Corporation.
+ * Copyright  2017-2020 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,17 @@
  */
 package org.onap.holmes.common.config;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.onap.holmes.common.constant.AlarmConst;
+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 lombok.extern.slf4j.Slf4j;
-import org.onap.holmes.common.constant.AlarmConst;
-
 import java.util.regex.Pattern;
 
-@Slf4j
 public class MicroServiceConfig {
 
     final static public String CONSUL_ADDR_SUF = ":8500/v1/catalog/service/";
@@ -40,6 +38,8 @@ public class MicroServiceConfig {
     final static public Pattern IP_REG = Pattern.compile("(http(s)?://)?(\\d+\\.\\d+\\.\\d+\\.\\d+)(:(\\d+))?");
     final static public String AAI_HOSTNAME = "aai.onap";
 
+    final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class);
+
     public static String getEnv(String name) {
         String value = System.getenv(name);
         if (value == null) {
@@ -57,11 +57,14 @@ public class MicroServiceConfig {
         String queryString = getConsulAddrInfo() + hostname;
         log.info("Query the " + hostname + " address using the URL: " + queryString);
         try {
-            JSONObject addrJson = (JSONObject) JSON.parseArray(execQuery(queryString)).get(0);
+            JsonObject addrJson = JsonParser.parseString(execQuery(queryString))
+                    .getAsJsonArray()
+                    .get(0)
+                    .getAsJsonObject();
             if (addrJson != null && addrJson.get("ServiceAddress") != null
                     && addrJson.get("ServicePort") != null) {
-                ret = "http://" + addrJson.getString("ServiceAddress") + ":" + addrJson
-                        .getString("ServicePort");
+                ret = "http://" + addrJson.get("ServiceAddress").getAsString() + ":" + addrJson
+                        .get("ServicePort").getAsString();
             }
         } catch (Exception e) {
             log.warn(e.getMessage(), e);