Code Review
/
holmes
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactored AaiQuery4Ccvpn and related classes
[holmes/common.git]
/
holmes-actions
/
src
/
main
/
java
/
org
/
onap
/
holmes
/
common
/
config
/
MicroServiceConfig.java
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
(file)
--- 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;
\r
import com.google.gson.JsonParser;
\r
import org.onap.holmes.common.constant.AlarmConst;
\r
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 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
import static org.onap.holmes.common.utils.CommonUtils.getEnv;
\r
import static org.onap.holmes.common.utils.CommonUtils.isIpAddress;
\r
\r
@@
-37,7
+33,6
@@
public class MicroServiceConfig {
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 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
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
@@
-74,19
+69,12
@@
public class MicroServiceConfig {
}
\r
\r
private static String execQuery(String queryString) {
\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
}
\r
\r
public static String getServiceConfigInfoFromCBS(String hostname) {
\r
- String ret = null;
\r
String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname;
\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
log.info("The query url is: " + url + ". The corresponding configurations are " + ret);
\r
return ret;
\r
}
\r
@@
-125,7
+113,6
@@
public class MicroServiceConfig {
}
\r
\r
\r
}
\r
\r
\r
-
\r
private static String[] split(String addr) {
\r
String ip;
\r
String port = "80";
\r
private static String[] split(String addr) {
\r
String ip;
\r
String port = "80";
\r