Merge "Reorder modifiers"

[so.git] / bpmn / MSOCoreBPMN / src / main / java / org / openecomp / mso / bpmn / core / json / JsonWrapper.java

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java
index 967b1df..1efcf5f 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/json/JsonWrapper.java
@@ -77,24 +77,18 @@ public abstract class JsonWrapper implements Serializable  {
        public JSONObject toJsonObject() {\r
 \r
         ObjectMapper mapper = new ObjectMapper();\r
-       // mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true);\r
+       // mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);\r
         //mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);\r
 \r
         mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);\r
-       // mapper.enable(org.codehaus.jackson.map.DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);\r
+       // mapper.enable(com.fasterxml.jackson.map.DeserializationFeature.UNWRAP_ROOT_VALUE);\r
         JSONObject json = new JSONObject();\r
          try {\r
                        json = new JSONObject(mapper.writeValueAsString(this));\r
-               } catch (JsonGenerationException e) {\r
+               } catch (JSONException | IOException e) {\r
                        LOGGER.debug("Exception :",e);\r
-               } catch (JsonMappingException e) {\r
-                       LOGGER.debug("Exception :",e);\r
-               } catch (JSONException e) {\r
-                       LOGGER.debug("Exception :",e);\r
-               } catch (IOException e) {\r
-                       LOGGER.debug("Exception :",e);\r
-               }               \r
-         return json; \r
+               }\r
+        return json;\r
        }\r
        \r
        public String listToJson(List list)  {\r
@@ -104,10 +98,6 @@ public abstract class JsonWrapper implements Serializable  {
                String jsonString = "";\r
                try {\r
                        jsonString = mapper.writeValueAsString(list);\r
-               } catch (JsonGenerationException e) {\r
-                       LOGGER.debug("Exception :",e);\r
-               } catch (JsonMappingException e) {\r
-                       LOGGER.debug("Exception :",e);\r
                } catch (IOException e) {\r
                        LOGGER.debug("Exception :",e);\r
                }\r
@@ -138,4 +128,4 @@ public abstract class JsonWrapper implements Serializable  {
        public String toString() {\r
                return this.toJsonString();\r
        }\r
-}
\ No newline at end of file
+}\r