Fixed Sonar Cloud Critical Issues

[cli.git] / framework / src / main / java / org / onap / cli / fw / output / print / OnapCommandPrint.java

diff --git a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
index 8d70790..14e37c3 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
+++ b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
@@ -32,6 +32,8 @@ import org.onap.cli.fw.error.OnapCommandOutputPrintingFailed;
 import org.onap.cli.fw.output.OnapCommandPrintDirection;
 
 import com.google.gson.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
@@ -71,10 +73,7 @@ public class OnapCommandPrint {
      * @return list
      */
     public List<String> getColumn(String header) {
-        if (this.data.get(header) == null) {
-            this.data.put(header, new ArrayList<String>());
-        }
-        return this.data.get(header);
+       return this.data.computeIfAbsent(header, k -> new ArrayList<String>());
     }
 
     public boolean isPrintTitle() {
@@ -99,6 +98,21 @@ public class OnapCommandPrint {
         return max;
     }
 
+    public List<List<Object>>  addTitle(List<List<Object>> rows, boolean isNormalize){
+        if (this.isPrintTitle()) {
+            List<Object> list = new ArrayList<>();
+            for (String key : this.data.keySet()) {
+                if (isNormalize && key != null && key.length() > MAX_COLUMN_LENGTH) {
+                    list.add(splitIntoList(key, MAX_COLUMN_LENGTH));
+                } else {
+                    list.add(key);
+                }
+            }
+            rows.add(list);
+        }
+        return  rows;
+    }
+
     /**
      * Helps to form the rows from columns.
      *
@@ -113,17 +127,7 @@ public class OnapCommandPrint {
         List<List<Object>> rows = new ArrayList<>();
 
         // add title
-        if (this.isPrintTitle()) {
-            List<Object> list = new ArrayList<>();
-            for (String key : this.data.keySet()) {
-                if (isNormalize && key != null && key.length() > MAX_COLUMN_LENGTH) {
-                    list.add(splitIntoList(key, MAX_COLUMN_LENGTH));
-                } else {
-                    list.add(key);
-                }
-            }
-            rows.add(list);
-        }
+        rows = addTitle(rows, isNormalize);
 
         // form row
         for (int i = 0; i < this.findMaxRows(); i++) {
@@ -167,7 +171,7 @@ public class OnapCommandPrint {
         }
         // new line is converted to space char
         if (inp.contains("\n")) {
-            inp = inp.replaceAll("\n", "");
+            inp = inp.replace("\n", "");
         }
 
         StringTokenizer tok = new StringTokenizer(inp, " ");
@@ -238,21 +242,26 @@ public class OnapCommandPrint {
 
     public Object getJsonNodeOrString(String value) {
         try {
-            return (JSONObject) JSONValue.parse(value);
+            return JSONValue.parse(value);
         } catch (Exception e) {
             return value;
         }
     }
 
+    public JSONObject printPortrait(List<List<Object>> rows){
+        JSONObject result = new JSONObject();
+        for (int i=1; i<rows.size(); i++) {
+            if (rows.get(i).get(1) != null)
+                result.put(rows.get(i).get(0).toString(), this.getJsonNodeOrString(rows.get(i).get(1).toString()));
+        }
+        return result;
+    }
+
     public String printJson() {
         List<List<Object>> rows = this.formRows(false);
 
         if (this.direction.equals(OnapCommandPrintDirection.PORTRAIT)) {
-            JSONObject result = new JSONObject();
-            for (int i=1; i<rows.size(); i++) {
-                if (rows.get(i).get(1) != null)
-                    result.put(rows.get(i).get(0).toString(), this.getJsonNodeOrString(rows.get(i).get(1).toString()));
-            }
+            JSONObject result = printPortrait(rows);
             return result.toJSONString();
         } else {
             JSONArray array = new JSONArray();
@@ -271,28 +280,20 @@ public class OnapCommandPrint {
                 array.add(rowO);
             }
             try {
-                return new JsonParser().parse(array.toJSONString()).toString();
+                return JsonParser.parseString(array.toJSONString()).toString();
             } catch (Exception e) { // NOSONAR
-                // TODO Auto-generated catch block
                 return array.toJSONString();
             }
 
         }
     }
-
-    /*
-        required vulnerable fix
-        jackson-dataformat-yaml:YAMLMapper is a sub component of jackson-databind
-        jackson-databind is replaced with gson
-        JIRA: CLI-251
-     */
+    
     public String printYaml() throws OnapCommandOutputPrintingFailed {
-     /*   try {
+        try {
             return new YAMLMapper().writeValueAsString(new ObjectMapper().readTree(this.printJson()));
         } catch (IOException  e) {
             throw new OnapCommandOutputPrintingFailed(e);  // NOSONAR
         }
-     */
-     return "";
+
     }
 }