Implement support for v10 model entities.

[aai/model-loader.git] / src / main / java / org / openecomp / modelloader / util / JsonXmlConverter.java

diff --git a/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java b/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java
index ca63b23..621f704 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java
+++ b/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java
@@ -1,79 +1,81 @@
-/*-
- * ============LICENSE_START=======================================================
- * MODEL LOADER SERVICE
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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
- * 
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.modelloader.util;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.XML;
-
-public class JsonXmlConverter {
-
-  /**
-   * Determines whether or not the supplied text string represents a valid
-   * JSON structure or not.
-   * 
-   * @param text - The text to be evaluated.
-   * 
-   * @return - true if the string represents a valid JSON object,
-   *           false, otherwise.
-   */
-  public static boolean isValidJson(String text) {
-    try {
-      new JSONObject(text);
-    } catch (JSONException ex) {
-      try {
-        new JSONArray(text);
-      } catch (JSONException ex1) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Takes a text string representing a valid JSON structure and converts it to
-   * an equivalent XML string.
-   * 
-   * @param jsonText - The JSON string to convert to XML.
-   * 
-   * @return - An XML string representation of the supplied JSON string.
-   */
-  public static String convertJsonToXml(String jsonText) {
-    JSONObject jsonObj = new JSONObject(jsonText);
-    String xmlText = XML.toString(jsonObj);
-    return xmlText;
-  }
-
-  /**
-   * Takes a text string representing a valid XML structure and converts it to
-   * an equivalent JSON string.
-   * 
-   * @param xmlText - The XML string to convert to JSON.
-   * 
-   * @return - A JSON string representation of the supplied XML string.
-   */
-  public static String convertXmlToJson(String xmlText) {
-    JSONObject jsonObj = XML.toJSONObject(xmlText);
-    return jsonObj.toString();
-  }
-}
+/**\r
+ * ============LICENSE_START=======================================================\r
+ * Model Loader\r
+ * ================================================================================\r
+ * Copyright © 2017 AT&T Intellectual Property.\r
+ * Copyright © 2017 Amdocs\r
+ * All rights reserved.\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
+ *\r
+ * ECOMP and OpenECOMP are trademarks\r
+ * and service marks of AT&T Intellectual Property.\r
+ */\r
+package org.openecomp.modelloader.util;\r
+\r
+import org.json.JSONArray;\r
+import org.json.JSONException;\r
+import org.json.JSONObject;\r
+import org.json.XML;\r
+\r
+public class JsonXmlConverter {\r
+\r
+  /**\r
+   * Determines whether or not the supplied text string represents a valid\r
+   * JSON structure or not.\r
+   * \r
+   * @param text - The text to be evaluated.\r
+   * \r
+   * @return - true if the string represents a valid JSON object,\r
+   *           false, otherwise.\r
+   */\r
+  public static boolean isValidJson(String text) {\r
+    try {\r
+      new JSONObject(text);\r
+    } catch (JSONException ex) {\r
+      try {\r
+        new JSONArray(text);\r
+      } catch (JSONException ex1) {\r
+        return false;\r
+      }\r
+    }\r
+\r
+    return true;\r
+  }\r
+\r
+  /**\r
+   * Takes a text string representing a valid JSON structure and converts it to\r
+   * an equivalent XML string.\r
+   * \r
+   * @param jsonText - The JSON string to convert to XML.\r
+   * \r
+   * @return - An XML string representation of the supplied JSON string.\r
+   */\r
+  public static String convertJsonToXml(String jsonText) {\r
+    JSONObject jsonObj = new JSONObject(jsonText);\r
+    String xmlText = XML.toString(jsonObj);\r
+    return xmlText;\r
+  }\r
+\r
+  /**\r
+   * Takes a text string representing a valid XML structure and converts it to\r
+   * an equivalent JSON string.\r
+   * \r
+   * @param xmlText - The XML string to convert to JSON.\r
+   * \r
+   * @return - A JSON string representation of the supplied XML string.\r
+   */\r
+  public static String convertXmlToJson(String xmlText) {\r
+    JSONObject jsonObj = XML.toJSONObject(xmlText);\r
+    return jsonObj.toString();\r
+  }\r
+}\r