Fixed Minor Code Smells issues "Deprecated JsonParser"

Issue-ID: CLI-439

Signed-off-by: sharath reddy <bs.reddy@huawei.com>
Change-Id: I49fdc2fe1aa48ae78317aba94fdd7f0232334860
Signed-off-by: sharath reddy <bs.reddy@huawei.com>

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 6850fe3..d2bc98b 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
@@ -270,7 +270,7 @@ public class OnapCommandPrint {
                 array.add(rowO);
             }
             try {
-                return new JsonParser().parse(array.toJSONString()).toString();
+                return JsonParser.parseString(array.toJSONString()).toString();
             } catch (Exception e) { // NOSONAR
                 return array.toJSONString();
             }

diff --git a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
index ba9920c..7b00c16 100644 (file)
--- a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
+++ b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
@@ -277,7 +277,7 @@ public class OpenInterfaceGrpcServer {
 
         public static void setOutputAttr(Builder reply, String printOut){
             try {
-                reply.putAttrs(OnapCommandConstants.RESULTS, new JsonParser().parse(printOut).toString());
+                reply.putAttrs(OnapCommandConstants.RESULTS, JsonParser.parseString(printOut).toString());
             } catch (Exception e) { // NOSONAR
                 reply.putAttrs(OnapCommandConstants.RESULTS, printOut);
             }

diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java b/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java
index dcc3082..7780701 100644 (file)
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java
@@ -304,10 +304,9 @@ public class OnapCommandHttpUtils {
     }
 
     public static String normalizeJson(String json) throws OnapCommandHttpInvalidRequestBody {
-        JsonParser jsonParser = new JsonParser();
         JsonElement node;
         try {
-            node = jsonParser.parse(json);
+            node = JsonParser.parseString(json);
             normalizeJson(node);
             return gson.toJson(node);
         } catch (Exception e) {  //NOSONAR

diff --git a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockRequest.java b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockRequest.java
index 7b3e573..1a70be3 100644 (file)
--- a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockRequest.java
+++ b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockRequest.java
@@ -61,10 +61,9 @@ public class MockRequest {
     public void setJson(String json) throws IOException { //NOSONAR
         if (!json.isEmpty()) {
             try {
-                JsonParser parser = new JsonParser();
-                this.json = parser.parse(json);
+                this.json = JsonParser.parseString(json);
             } catch (Exception e) {
-                this.json = new JsonParser().parse("{}");
+                this.json = JsonParser.parseString("{}");
             }
         }
 

diff --git a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
index 7f605c3..fedfb02 100644 (file)
--- a/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
+++ b/validate/sample-mock-generator/src/main/java/org/onap/cli/http/mock/MockResponse.java
@@ -39,10 +39,9 @@ public class MockResponse {
     public void setJson(String json) throws IOException { //NOSONAR
         if (json != null && !json.isEmpty()) {
             try {
-                JsonParser parser = new JsonParser();
-                this.json = parser.parse(json);
+                this.json = JsonParser.parseString(json);
             } catch (Exception e) {
-                this.json = new JsonParser().parse("{}");
+                this.json = JsonParser.parseString("{}");
             }
         }
     }