Remove Class: HttpsUtils & MicroserviceBusRest

[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 7566fa1..43fef11 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
@@ -27,6 +27,9 @@ import javax.ws.rs.client.ClientBuilder;
 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 CONSUL_ADDR_SUF = ":8500/v1/catalog/service/";\r
@@ -38,19 +41,11 @@ public class MicroServiceConfig {
     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 Pattern IP_REG = Pattern.compile("(http(s)?://)?(\\d+\\.\\d+\\.\\d+\\.\\d+)(:(\\d+))?");\r
+\r
     final static public String AAI_HOSTNAME = "aai.onap";\r
 \r
     final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class);\r
 \r
-    public static String getEnv(String name) {\r
-        String value = System.getenv(name);\r
-        if (value == null) {\r
-            value = System.getProperty(name);\r
-        }\r
-        return value;\r
-    }\r
-\r
     public static String getConsulAddrInfo() {\r
         return "http://" + getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;\r
     }\r
@@ -129,9 +124,7 @@ public class MicroServiceConfig {
         return serviceAddrInfo;\r
     }\r
 \r
-    public static boolean isIpAddress(String info) {\r
-        return IP_REG.matcher(info).matches();\r
-    }\r
+\r
 \r
     private static String[] split(String addr) {\r
         String ip;\r