1 files changed, 72 insertions, 74 deletions
diff --git a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/JacksonJsonUtil.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/JacksonJsonUtil.java
index f61fd8a..1e2fe6d 100644
--- a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/JacksonJsonUtil.java
+++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/JacksonJsonUtil.java
@@ -1,17 +1,15 @@
 /*******************************************************************************
  * Copyright 2016-2017 ZTE, Inc. and others.
  * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  ******************************************************************************/
 package org.onap.msb.apiroute.wrapper.util;
 
@@ -25,84 +23,84 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 
 public class JacksonJsonUtil {
 
-  private static final Logger logger = LoggerFactory.getLogger(JacksonJsonUtil.class);
+    private static final Logger logger = LoggerFactory.getLogger(JacksonJsonUtil.class);
 
-  private volatile static ObjectMapper mapper = null;
+    private volatile static ObjectMapper mapper = null;
 
-  private static ObjectMapper getMapperInstance() {
-    if (mapper == null) {
-      synchronized (JacksonJsonUtil.class) {
+    private static ObjectMapper getMapperInstance() {
         if (mapper == null) {
-          mapper = new ObjectMapper();
+            synchronized (JacksonJsonUtil.class) {
+                if (mapper == null) {
+                    mapper = new ObjectMapper();
+                }
+            }
         }
-      }
+        return mapper;
     }
-    return mapper;
-  }
-
-  /**
-   * from java object to json
-   * 
-   * @param obj
-   * @return json
-   * @throws Exception
-   */
-  public static String beanToJson(Object obj) throws Exception {
-      String json = null;
-
-      ObjectMapper objectMapper = getMapperInstance();
-      objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-      json = objectMapper.writeValueAsString(obj);
-    
-      return json;
-  }
-
-
-
-  /**
-   * from json to java object
-   * 
-   * @param json
-   * @param cls
-   * @return
-   * @throws Exception
-   */
-  public static Object jsonToBean(String json, Class<?> cls) throws Exception {
-    Object vo = null;
-    try {
-      ObjectMapper objectMapper = getMapperInstance();
-      objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-      vo = objectMapper.readValue(json, cls);
-
-    } catch (Exception e) {
-      logger.error(cls + " JsonTobean faild");
-      throw new Exception(cls + " JsonTobean faild");
+
+    /**
+     * from java object to json
+     * 
+     * @param obj
+     * @return json
+     * @throws Exception
+     */
+    public static String beanToJson(Object obj) throws Exception {
+        String json = null;
+
+        ObjectMapper objectMapper = getMapperInstance();
+        objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        json = objectMapper.writeValueAsString(obj);
+
+        return json;
     }
-    return vo;
-  }
 
-  /**
-   * from json to java List
-   * 
-   * @param json
-   * @return
-   * @throws Exception
-   */
 
-  public static <T> T jsonToListBean(String json, TypeReference<T> valueTypeRef) {
-    try {
 
-      ObjectMapper objectMapper = getMapperInstance();
+    /**
+     * from json to java object
+     * 
+     * @param json
+     * @param cls
+     * @return
+     * @throws Exception
+     */
+    public static Object jsonToBean(String json, Class<?> cls) throws Exception {
+        Object vo = null;
+        try {
+            ObjectMapper objectMapper = getMapperInstance();
+            objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+            vo = objectMapper.readValue(json, cls);
+
+        } catch (Exception e) {
+            logger.error(cls + " JsonTobean faild");
+            throw new Exception(cls + " JsonTobean faild");
+        }
+        return vo;
+    }
+
+    /**
+     * from json to java List
+     * 
+     * @param json
+     * @return
+     * @throws Exception
+     */
 
+    public static <T> T jsonToListBean(String json, TypeReference<T> valueTypeRef) {
+        try {
 
-      return objectMapper.readValue(json, valueTypeRef);
+            ObjectMapper objectMapper = getMapperInstance();
 
-    } catch (Exception e) {
-      String errorMsg = " JsonTobean faild:" + e.getMessage();
-      logger.error(errorMsg);
+
+            return objectMapper.readValue(json, valueTypeRef);
+
+        } catch (Exception e) {
+            String errorMsg = " JsonTobean faild:" + e.getMessage();
+            logger.error(errorMsg);
+        }
+        return null;
     }
-    return null;
-  }