Resolved JsonElement issue for grpc server and other classes

Issue-ID: CLI-247

Signed-off-by: priyanka.akhade <priyanka.akhade@huawei.com>
Change-Id: Ifcfba782ec6454f58d1df11e6ab7db3e1a04d17b

2 files changed, 3 insertions, 7 deletions

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 c4be02e3..8d707906 100644
--- 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
@@ -31,8 +31,7 @@ import org.apache.commons.csv.CSVPrinter;
 import org.onap.cli.fw.error.OnapCommandOutputPrintingFailed;
 import org.onap.cli.fw.output.OnapCommandPrintDirection;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParser;
 
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
@@ -43,7 +42,6 @@ import net.minidev.json.JSONValue;
  */
 public class OnapCommandPrint {
 
-    private static Gson gson = new GsonBuilder().serializeNulls().create();
 
     public static final int MAX_COLUMN_LENGTH = 50;
 
@@ -273,7 +271,7 @@ public class OnapCommandPrint {
                 array.add(rowO);
             }
             try {
-                return gson.toJson(array.toJSONString()).toString();
+                return new JsonParser().parse(array.toJSONString()).toString();
             } catch (Exception e) { // NOSONAR
                 // TODO Auto-generated catch block
                 return array.toJSONString();
diff --git a/framework/src/test/java/org/onap/cli/fw/output/OnapCommandResultTest.java b/framework/src/test/java/org/onap/cli/fw/output/OnapCommandResultTest.java
index 97fc9e01..d5d04888 100644
--- a/framework/src/test/java/org/onap/cli/fw/output/OnapCommandResultTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/output/OnapCommandResultTest.java
@@ -32,7 +32,6 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 public class OnapCommandResultTest {
-    private static Gson gson = new GsonBuilder().serializeNulls().create();
 
     @Test
     @Ignore
@@ -230,10 +229,9 @@ public class OnapCommandResultTest {
         res.setRecords(list);
         res.setScope(OnapCommandResultAttributeScope.LONG);
         res.setType(OnapCommandResultType.JSON);
-
         String result = res.print();
         String expRes="[{\"param\":{\"id\":\"0001\",\"value\":\"result\"}}]";
-        assertEquals(gson.toJson(expRes),result);
+        assertEquals(expRes,result);
 
     }
 }