import com.google.gson.JsonObject;\r
import com.google.gson.JsonParser;\r
import org.onap.holmes.common.constant.AlarmConst;\r
+import org.onap.holmes.common.utils.JerseyClient;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-import javax.ws.rs.client.Client;\r
-import javax.ws.rs.client.ClientBuilder;\r
-import javax.ws.rs.core.Response;\r
-import java.util.regex.Pattern;\r
-\r
import static org.onap.holmes.common.utils.CommonUtils.getEnv;\r
-import static org.onap.holmes.common.utils.CommonUtils.isIpAddress;\r
\r
public class MicroServiceConfig {\r
\r
final static public String HOSTNAME = "HOSTNAME";\r
final static public String POD_IP = "POD_IP";\r
final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE";\r
- final static public String DOCKER_HOST = "DOCKER_HOST";\r
final static public String MSB_ADDR = "MSB_ADDR";\r
final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST";\r
final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT";\r
}\r
\r
private static String execQuery(String queryString) {\r
- Client client = ClientBuilder.newBuilder().build();\r
- Response response = client.target(queryString).request().get();\r
- return response.readEntity(String.class);\r
+ return JerseyClient.newInstance().get(queryString);\r
}\r
\r
public static String getServiceConfigInfoFromCBS(String hostname) {\r
- String ret = null;\r
String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname;\r
- try {\r
- ret = execQuery(url);\r
- } catch (Exception e) {\r
- log.warn(e.getMessage(), e);\r
- }\r
+ String ret = execQuery(url);\r
log.info("The query url is: " + url + ". The corresponding configurations are " + ret);\r
return ret;\r
}\r
}\r
\r
public static String[] getMicroServiceIpAndPort() {\r
- String[] serviceAddrInfo = null;\r
- String info = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(HOSTNAME));\r
- log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from Consul. The response is " + info + ".");\r
-\r
- if (info != null && !info.isEmpty()) {\r
- if (!isIpAddress(info)) {\r
- info = getEnv(POD_IP);\r
- }\r
- serviceAddrInfo = split(info);\r
+ String info = getEnv(POD_IP);\r
+ if (info != null) {\r
+ return split(info);\r
} else {\r
- serviceAddrInfo = split(getEnv(HOSTNAME));\r
+ return split(getEnv(HOSTNAME));\r
}\r
- return serviceAddrInfo;\r
}\r
\r
-\r
-\r
private static String[] split(String addr) {\r
String ip;\r
String port = "80";\r