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/util/JacksonJsonUtil.java135
-rw-r--r--src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java75
2 files changed, 94 insertions, 116 deletions
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 382dc64..7f9037c 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
@@ -35,98 +35,71 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class JacksonJsonUtil {
- private static final Logger logger = LoggerFactory.getLogger(JacksonJsonUtil.class);
-
- private static ObjectMapper mapper;
-
- /**
- * 获取ObjectMapper实例
- *
- * @param createNew 方式：true，新实例；false,存在的mapper实例
- * @return
- */
- public static synchronized ObjectMapper getMapperInstance() {
- if (mapper == null) {
- mapper = new ObjectMapper();
+ private static final Logger logger = LoggerFactory.getLogger(JacksonJsonUtil.class);
+
+ private static ObjectMapper mapper;
+
+ /**
+ * 获取ObjectMapper实例
+ *
+ * @param createNew 方式：true，新实例；false,存在的mapper实例
+ * @return
+ */
+ public static synchronized ObjectMapper getMapperInstance() {
+ if (mapper == null) {
+ mapper = new ObjectMapper();
+ }
+ return mapper;
}
- return mapper;
- }
- /**
- * 将java对象转换成json字符串
- *
- * @param obj 准备转换的对象
- * @return json字符串
- * @throws Exception
- */
- public static String beanToJson(Object obj) throws RouteException {
- String json = null;
- try {
- ObjectMapper objectMapper = getMapperInstance();
- json = objectMapper.writeValueAsString(obj);
- } catch (Exception e) {
- String errorMsg = "Class beanToJson faild";
- throwsRouteException(errorMsg, e, "BEAN_TO_JSON_FAILD");
+ /**
+ * 将java对象转换成json字符串
+ *
+ * @param obj 准备转换的对象
+ * @return json字符串
+ * @throws Exception
+ */
+ public static String beanToJson(Object obj) throws RouteException {
+ String json = null;
+ try {
+ ObjectMapper objectMapper = getMapperInstance();
+ json = objectMapper.writeValueAsString(obj);
+ } catch (Exception e) {
+ String errorMsg = "Class beanToJson faild";
+ throwsRouteException(errorMsg, e, "BEAN_TO_JSON_FAILD");
+ }
+ return json;
}
- return json;
- }
- /**
- * 将json字符串转换成java对象
- *
- * @param json 准备转换的json字符串
- * @param cls 准备转换的类
- * @return
- * @throws Exception
- */
- public static Object jsonToBean(String json, Class<?> cls) throws RouteException {
- Object vo = null;
- try {
- ObjectMapper objectMapper = getMapperInstance();
+ /**
+ * 将json字符串转换成java对象
+ *
+ * @param json 准备转换的json字符串
+ * @param cls 准备转换的类
+ * @return
+ * @throws Exception
+ */
+ public static Object jsonToBean(String json, Class<?> cls) throws RouteException {
+ Object vo = null;
+ try {
+ ObjectMapper objectMapper = getMapperInstance();
- vo = objectMapper.readValue(json, cls);
+ vo = objectMapper.readValue(json, cls);
- } catch (Exception e) {
- String errorMsg = cls + " JsonTobean faild:" + e.getMessage();
- throwsRouteException(errorMsg, e, "JSON_TO_BEAN_FAILD");
+ } catch (Exception e) {
+ String errorMsg = cls + " JsonTobean faild:" + e.getMessage();
+ throwsRouteException(errorMsg, e, "JSON_TO_BEAN_FAILD");
+ }
+ return vo;
}
- return vo;
- }
-
-
- /**
- * 将json字符串转换成java集合对象
- *
- * @param json 准备转换的json字符串
- * @param cls 准备转换的类
- * @return
- * @throws Exception
- */
-
- public static <T> T jsonToListBean(String json, TypeReference<T> valueTypeRef) {
- try {
- ObjectMapper objectMapper = getMapperInstance();
-
- return objectMapper.readValue(json, valueTypeRef);
-
- } catch (Exception e) {
- String errorMsg = " JsonTobean faild:" + e.getMessage();
- logger.error(errorMsg);
+ private static void throwsRouteException(String errorMsg, Exception e, String errorCode) throws RouteException {
+ String msg = errorMsg + ".errorMsg:" + e.getMessage();
+ logger.error(msg);
+ throw new RouteException(errorMsg, errorCode);
}
- return null;
- }
-
-
-
- private static void throwsRouteException(String errorMsg, Exception e, String errorCode)
- throws RouteException {
- String msg = errorMsg + ".errorMsg:" + e.getMessage();
- logger.error(msg);
- throw new RouteException(errorMsg, errorCode);
- }
}
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 9afeb7c..363c8c4 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
@@ -17,59 +17,64 @@ import java.util.regex.Pattern;
public class RegExpTestUtil {
- public static boolean serviceNameRegExpTest(String serviceName) {
+ public static boolean serviceNameRegExpTest(String serviceName) {
- String serviceNameReg = "^([0-9a-zA-Z]|-|_)*$";
- return Pattern.matches(serviceNameReg, serviceName);
+ String serviceNameReg = "^([0-9a-zA-Z]|-|_)*$";
+ return Pattern.matches(serviceNameReg, serviceName);
- }
+ }
- public static boolean hostRegExpTest(String host) {
+ public static boolean hostRegExpTest(String host) {
- String hostReg = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
- + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
- + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
- + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)" + ":(\\d{1,5})$";
- return Pattern.matches(hostReg, host);
+ String hostReg = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
+ + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+ + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+ + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)" + ":(\\d{1,5})$";
+ return Pattern.matches(hostReg, host);
- }
+ }
- public static boolean ipRegExpTest(String ip) {
+ public static boolean ipRegExpTest(String ip) {
- String hostReg = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
- + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
- + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
- + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
- return Pattern.matches(hostReg, ip);
+ String hostReg = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
+ + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+ + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+ + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
+ return Pattern.matches(hostReg, ip);
- }
+ }
- public static boolean portRegExpTest(String port) {
+ public static boolean portRegExpTest(String port) {
+ String hostReg = "^\\d{1,5}$";
+ if (Pattern.matches(hostReg, port)) {
+ int iport = Integer.parseInt(port);
+ if (iport >= 1 && iport <= 65535)
+ return true;
+ }
- String hostReg = "^\\d{1,5}$";
- return Pattern.matches(hostReg, port);
+ return false;
- }
+ }
- public static boolean versionRegExpTest(String version) {
+ public static boolean versionRegExpTest(String version) {
- String versionReg = "^v\\d+(\\.\\d+)?$";
- return Pattern.matches(versionReg, version);
+ String versionReg = "^v\\d+(\\.\\d+)?$";
+ return Pattern.matches(versionReg, version);
- }
+ }
- public static boolean urlRegExpTest(String url) {
- if (url.equals("/"))
- return true;
- String urlReg = "^\\/.*((?!\\/).)$";
- return Pattern.matches(urlReg, url);
+ public static boolean urlRegExpTest(String url) {
+ if (url.equals("/"))
+ return true;
+ String urlReg = "^\\/.*((?!\\/).)$";
+ return Pattern.matches(urlReg, url);
- }
+ }
- public static void main(String[] args) {
- System.out.println(urlRegExpTest("/"));
- }
+ public static void main(String[] args) {
+ System.out.println(urlRegExpTest("/"));
+ }
}