1 files changed, 54 insertions, 81 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);
-  }
 }