Remove logging passwords in clear text

[ccsdk/sli/plugins.git] / restapi-call-node / provider / src / main / java / org / onap / ccsdk / sli / plugins / restapicall / JsonParser.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
index f22aa0b..189ddde 100644 (file)
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/JsonParser.java
@@ -21,6 +21,8 @@
 
 package org.onap.ccsdk.sli.plugins.restapicall;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -29,57 +31,76 @@ import java.util.Map;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class JsonParser {
-
-       private static final Logger log = LoggerFactory.getLogger(JsonParser.class);
-
-       @SuppressWarnings("unchecked")
-       public static Map<String, String> convertToProperties(String s) throws JSONException {
-               JSONObject json = new JSONObject(s);
-
-               Map<String, Object> wm = new HashMap<String, Object>();
-               Iterator<String> ii = json.keys();
-               while (ii.hasNext()) {
-                       String key1 = ii.next();
-                       wm.put(key1, json.get(key1));
-               }
-
-               Map<String, String> mm = new HashMap<String, String>();
-
-               while (!wm.isEmpty())
-                       for (String key : new ArrayList<>(wm.keySet())) {
-                               Object o = wm.get(key);
-                               wm.remove(key);
-
-                               if (o instanceof Boolean || o instanceof Number || o instanceof String) {
-                                       mm.put(key, o.toString());
-
-                                       log.info("Added property: " + key + ": " + o.toString());
-                               }
-
-                               else if (o instanceof JSONObject) {
-                                       JSONObject jo = (JSONObject) o;
-                                       Iterator<String> i = jo.keys();
-                                       while (i.hasNext()) {
-                                               String key1 = i.next();
-                                               wm.put(key + "." + key1, jo.get(key1));
-                                       }
-                               }
-
-                               else if (o instanceof JSONArray) {
-                                       JSONArray ja = (JSONArray) o;
-                                       mm.put(key + "_length", String.valueOf(ja.length()));
-
-                                       log.info("Added property: " + key + "_length" + ": " + String.valueOf(ja.length()));
-
-                                       for (int i = 0; i < ja.length(); i++)
-                                               wm.put(key + '[' + i + ']', ja.get(i));
-                               }
-                       }
-
-               return mm;
-       }
+public final class JsonParser {
+
+    private static final Logger log = LoggerFactory.getLogger(JsonParser.class);
+
+    private JsonParser() {
+        // Preventing instantiation of the same.
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Map<String, String> convertToProperties(String s)
+        throws SvcLogicException {
+
+        checkNotNull(s, "Input should not be null.");
+
+        try {
+            JSONObject json = new JSONObject(s);
+            Map<String, Object> wm = new HashMap<>();
+            Iterator<String> ii = json.keys();
+            while (ii.hasNext()) {
+                String key1 = ii.next();
+                String[] subKey = key1.split(":");
+                if (subKey.length == 2) {
+                    wm.put(subKey[1], json.get(key1));
+                } else {
+                    wm.put(key1, json.get(key1));
+                }
+            }
+
+            Map<String, String> mm = new HashMap<>();
+
+            while (!wm.isEmpty()) {
+                for (String key : new ArrayList<>(wm.keySet())) {
+                    Object o = wm.get(key);
+                    wm.remove(key);
+
+                    if (o instanceof Boolean || o instanceof Number || o instanceof String) {
+                        mm.put(key, o.toString());
+
+                        log.info("Added property: {} : {}", key, o.toString());
+                    } else if (o instanceof JSONObject) {
+                        JSONObject jo = (JSONObject) o;
+                        Iterator<String> i = jo.keys();
+                        while (i.hasNext()) {
+                            String key1 = i.next();
+                            String[] subKey = key1.split(":");
+                            if (subKey.length == 2) {
+                                wm.put(key + "." + subKey[1], jo.get(key1));
+                            } else {
+                                wm.put(key + "." + key1, jo.get(key1));
+                            }
+                        }
+                    } else if (o instanceof JSONArray) {
+                        JSONArray ja = (JSONArray) o;
+                        mm.put(key + "_length", String.valueOf(ja.length()));
+
+                        log.info("Added property: {}_length: {}", key, String.valueOf(ja.length()));
+
+                        for (int i = 0; i < ja.length(); i++) {
+                            wm.put(key + '[' + i + ']', ja.get(i));
+                        }
+                    }
+                }
+            }
+            return mm;
+        } catch (JSONException e) {
+            throw new SvcLogicException("Unable to convert JSON to properties" + e.getLocalizedMessage(), e);
+        }
+    }
 }