aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/onap/msb/sdk/discovery/MSBService.java109
-rw-r--r--src/main/java/org/onap/msb/sdk/discovery/util/HttpClientUtil.java21
-rw-r--r--src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java6
-rw-r--r--src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java34
-rw-r--r--src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java3
5 files changed, 60 insertions, 113 deletions
diff --git a/src/main/java/org/onap/msb/sdk/discovery/MSBService.java b/src/main/java/org/onap/msb/sdk/discovery/MSBService.java
index e0b8596..4048bbd 100644
--- a/src/main/java/org/onap/msb/sdk/discovery/MSBService.java
+++ b/src/main/java/org/onap/msb/sdk/discovery/MSBService.java
@@ -22,6 +22,7 @@ import org.onap.msb.sdk.discovery.entity.NodeAddress;
import org.onap.msb.sdk.discovery.entity.RouteResult;
import org.onap.msb.sdk.discovery.util.HttpClientUtil;
import org.onap.msb.sdk.discovery.util.JacksonJsonUtil;
+import org.onap.msb.sdk.discovery.util.MsbUtil;
import org.onap.msb.sdk.discovery.util.RegExpTestUtil;
@@ -40,19 +41,8 @@ public class MSBService {
public MicroServiceFullInfo queryMicroServiceInfo(String msbAddress, String serviceName,
String version) throws RouteException {
- // 服务名空值检查
- if (StringUtils.isBlank(serviceName)) {
- throw new RouteException("ServiceName can't be empty", "DATA_FORMAT_ERROR");
- }
-
- // 版本号格式检查
- if (StringUtils.isNotBlank(version)) {
- if (!RegExpTestUtil.versionRegExpTest(version)) {
- throw new RouteException("version is not a valid format", "DATA_FORMAT_ERROR");
- }
- } else {
- version = "null";
- }
+ MsbUtil.checkServiceName(serviceName);
+ version=MsbUtil.checkVersion(version);
MicroServiceFullInfo microServiceInfo = null;
@@ -100,9 +90,7 @@ public class MSBService {
|| StringUtils.isBlank(microServiceInfo.getProtocol())
|| microServiceInfo.getNodes().size() == 0) {
- throw new RouteException(
- "register MicroServiceInfo FAIL: Some MicroServiceInfo's required fields are empty",
- "DATA_FORMAT_ERROR");
+ throw new RouteException("register MicroServiceInfo FAIL: Some MicroServiceInfo's required fields are empty","DATA_FORMAT_ERROR");
}
@@ -110,9 +98,7 @@ public class MSBService {
// 版本号格式检查
if (StringUtils.isNotBlank(microServiceInfo.getVersion())) {
if (!RegExpTestUtil.versionRegExpTest(microServiceInfo.getVersion())) {
- throw new RouteException("register MicroServiceInfo FAIL:version is not a valid format",
- "DATA_FORMAT_ERROR");
-
+ throw new RouteException("register MicroServiceInfo FAIL:version is not a valid format","DATA_FORMAT_ERROR");
}
}
@@ -120,8 +106,7 @@ public class MSBService {
// 服务协议取值范围检查
if (!RouteConst.checkExistProtocol(microServiceInfo.getProtocol().trim())) {
- throw new RouteException("register MicroServiceInfo FAIL:Protocol is wrong,value range:("
- + RouteConst.listProtocol() + ")", "DATA_FORMAT_ERROR");
+ throw new RouteException("register MicroServiceInfo FAIL:Protocol is wrong,value range:("+ RouteConst.listProtocol() + ")", "DATA_FORMAT_ERROR");
}
@@ -154,23 +139,9 @@ public class MSBService {
throws RouteException {
RouteResult result = new RouteResult();
- // 服务名空值检查
- if (StringUtils.isBlank(serviceName)) {
- throw new RouteException("cancel MicroServiceInfo FAIL:ServiceName can't be empty",
- "DATA_FORMAT_ERROR");
-
- }
-
- // 版本号格式检查
- if (StringUtils.isNotBlank(version)) {
- if (!RegExpTestUtil.versionRegExpTest(version)) {
- throw new RouteException("cancel MicroServiceInfo FAIL:version is not a valid format",
- "DATA_FORMAT_ERROR");
-
- }
- } else {
- version = "null";
- }
+ MsbUtil.checkServiceName(serviceName);
+ version=MsbUtil.checkVersion(version);
+
String url =
@@ -203,35 +174,12 @@ public class MSBService {
RouteResult result = new RouteResult();
- // 服务名空值检查
- if (StringUtils.isBlank(serviceName)) {
- throw new RouteException("cancel MicroServiceInfo FAIL:ServiceName can't be empty",
- "DATA_FORMAT_ERROR");
-
- }
+ MsbUtil.checkServiceName(serviceName);
+ version=MsbUtil.checkVersion(version);
+
+ MsbUtil.checkHost(ip,port);
-
- // HOST空值和格式检查
- if (StringUtils.isBlank(ip)) {
- throw new RouteException("cancel MicroServiceInfo FAIL:ip can't be empty",
- "DATA_FORMAT_ERROR");
- }
-
- if (StringUtils.isBlank(port)) {
- throw new RouteException("cancel MicroServiceInfo FAIL:port can't be empty",
- "DATA_FORMAT_ERROR");
-
- }
-
- // 版本号格式检查
- if (StringUtils.isNotBlank(version)) {
- if (!RegExpTestUtil.versionRegExpTest(version)) {
- throw new RouteException("cancel MicroServiceInfo FAIL:version is not a valid format",
- "DATA_FORMAT_ERROR");
- }
- } else {
- version = "null";
- }
+
String url =
@@ -263,32 +211,9 @@ public class MSBService {
public NodeAddress healthCheckbyTTL(String msbAddress, String serviceName, String version,
String ip, String port) throws RouteException {
- // 服务名空值检查
- if (StringUtils.isBlank(serviceName)) {
- throw new RouteException("ServiceName can't be empty", "DATA_FORMAT_ERROR");
- }
-
- // 版本号格式检查
- if (StringUtils.isNotBlank(version)) {
- if (!RegExpTestUtil.versionRegExpTest(version)) {
- throw new RouteException("version is not a valid format", "DATA_FORMAT_ERROR");
- }
- } else {
- version = "null";
- }
-
-
- // HOST空值和格式检查
- if (StringUtils.isBlank(ip)) {
- throw new RouteException("healthCheck by TTL FAIL:ip can't be empty", "DATA_FORMAT_ERROR");
-
- }
-
- if (StringUtils.isBlank(port)) {
- throw new RouteException("healthCheck by TTL FAIL:port can't be empty", "DATA_FORMAT_ERROR");
-
- }
-
+ MsbUtil.checkServiceName(serviceName);
+ version=MsbUtil.checkVersion(version);
+ MsbUtil.checkHost(ip,port);
NodeAddress checkNode = new NodeAddress(ip, port);
diff --git a/src/main/java/org/onap/msb/sdk/discovery/util/HttpClientUtil.java b/src/main/java/org/onap/msb/sdk/discovery/util/HttpClientUtil.java
index b3bcf0b..25f8526 100644
--- a/src/main/java/org/onap/msb/sdk/discovery/util/HttpClientUtil.java
+++ b/src/main/java/org/onap/msb/sdk/discovery/util/HttpClientUtil.java
@@ -55,14 +55,12 @@ public class HttpClientUtil {
}
res.close();
} catch (IOException e) {
- String errorMsg = url + ":httpPostWithJSON connect faild";
- throwsRouteException(errorMsg, e, "POST_CONNECT_FAILD");
+ throwsRouteException(url + ":httpPostWithJSON connect faild", e, "POST_CONNECT_FAILD");
} finally {
try {
httpClient.close();
} catch (IOException e) {
- String errorMsg = url + ":close httpClient faild";
- throwsRouteException(errorMsg, e, "CLOSE_CONNECT_FAILD");
+ throwsRouteException(url + ":close httpClient faild", e, "CLOSE_CONNECT_FAILD");
}
}
@@ -93,14 +91,12 @@ public class HttpClientUtil {
res.close();
} catch (IOException e) {
- String errorMsg = baseUrl + ":delete connect faild";
- throwsRouteException(errorMsg, e, "DELETE_CONNECT_FAILD");
+ throwsRouteException(baseUrl + ":delete connect faild", e, "DELETE_CONNECT_FAILD");
} finally {
try {
httpClient.close();
} catch (IOException e) {
- String errorMsg = baseUrl + ":close httpClient faild";
- throwsRouteException(errorMsg, e, "CLOSE_CONNECT_FAILD");
+ throwsRouteException(baseUrl + ":close httpClient faild", e, "CLOSE_CONNECT_FAILD");
}
}
@@ -121,17 +117,14 @@ public class HttpClientUtil {
}
res.close();
} catch (ClientProtocolException e) {
- String errorMsg = url + ":httpGetWithJSON connect faild";
- throwsRouteException(errorMsg, e, "GET_CONNECT_FAILD");
+ throwsRouteException(url + ":httpGetWithJSON connect faild", e, "GET_CONNECT_FAILD");
} catch (IOException e) {
- String errorMsg = url + ":httpGetWithJSON connect faild";
- throwsRouteException(errorMsg, e, "GET_CONNECT_FAILD");
+ throwsRouteException(url + ":httpGetWithJSON connect faild", e, "GET_CONNECT_FAILD");
} finally {
try {
httpClient.close();
} catch (IOException e) {
- String errorMsg = url + ":close httpClient faild";
- throwsRouteException(errorMsg, e, "CLOSE_CONNECT_FAILD");
+ throwsRouteException(url + ":close httpClient faild", e, "CLOSE_CONNECT_FAILD");
}
}
diff --git a/src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java b/src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java
index 7f9037c..aac256a 100644
--- a/src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java
+++ b/src/main/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtil.java
@@ -65,8 +65,7 @@ public class JacksonJsonUtil {
ObjectMapper objectMapper = getMapperInstance();
json = objectMapper.writeValueAsString(obj);
} catch (Exception e) {
- String errorMsg = "Class beanToJson faild";
- throwsRouteException(errorMsg, e, "BEAN_TO_JSON_FAILD");
+ throwsRouteException("Class beanToJson faild", e, "BEAN_TO_JSON_FAILD");
}
return json;
}
@@ -90,8 +89,7 @@ public class JacksonJsonUtil {
vo = objectMapper.readValue(json, cls);
} catch (Exception e) {
- String errorMsg = cls + " JsonTobean faild:" + e.getMessage();
- throwsRouteException(errorMsg, e, "JSON_TO_BEAN_FAILD");
+ throwsRouteException(cls + " JsonTobean faild:" + e.getMessage(), e, "JSON_TO_BEAN_FAILD");
}
return vo;
}
diff --git a/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java b/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java
index 2361d9f..c54a51c 100644
--- a/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java
+++ b/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java
@@ -17,6 +17,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
+import org.onap.msb.sdk.discovery.common.RouteException;
import org.onap.msb.sdk.discovery.entity.Node;
import org.onap.msb.sdk.discovery.entity.NodeInfo;
@@ -54,5 +55,38 @@ public class MsbUtil {
return nodes;
}
+
+ public static void checkServiceName(String serviceName) throws RouteException{
+
+ if (StringUtils.isBlank(serviceName)) {
+ throw new RouteException("ServiceName can't be empty", "DATA_FORMAT_ERROR");
+ }
+ }
+
+ public static String checkVersion(String version) throws RouteException{
+ // 版本号格式检查
+ if (StringUtils.isNotBlank(version)) {
+ if (!RegExpTestUtil.versionRegExpTest(version)) {
+ throw new RouteException("version is not a valid format", "DATA_FORMAT_ERROR");
+ }
+ } else {
+ version = "null";
+ }
+
+ return version;
+ }
+
+ public static void checkHost(String ip,String port) throws RouteException{
+ // HOST空值和格式检查
+ if (StringUtils.isBlank(ip)) {
+ throw new RouteException("ip can't be empty", "DATA_FORMAT_ERROR");
+
+ }
+
+ if (StringUtils.isBlank(port)) {
+ throw new RouteException("port can't be empty", "DATA_FORMAT_ERROR");
+
+ }
+ }
}
diff --git a/src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java b/src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java
index 363c8c4..4ebd6a8 100644
--- a/src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java
+++ b/src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java
@@ -74,7 +74,4 @@ public class RegExpTestUtil {
- public static void main(String[] args) {
- System.out.println(urlRegExpTest("/"));
- }
}