From 471d10938b8886d695bd9c50b88ad210a61b5a8c Mon Sep 17 00:00:00 2001 From: "priyanka.akhade" Date: Fri, 13 Mar 2020 10:52:03 +0000 Subject: Migrate to gson Issue-ID: VNFSDK-553 Signed-off-by: priyanka.akhade Change-Id: Ideb0e20ebe09945f221cc31560922aae9e375dde --- .../src/main/java/org/onap/cvc/csar/CSARArchive.java | 8 ++++---- .../src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'csarvalidation/src/main') diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java index 2055cf2..1c05948 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java @@ -15,8 +15,7 @@ */ package org.onap.cvc.csar; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.tuple.Pair; import org.onap.cvc.csar.parser.SourcesParser; @@ -43,6 +42,7 @@ import java.util.Optional; */ public class CSARArchive implements AutoCloseable { + private static Gson gson = new Gson(); public static final String SOL0004_2_4_1 = "V2.4.1 (2018-02)"; public static final String TEMP_DIR = "/tmp"; @@ -156,8 +156,8 @@ public class CSARArchive implements AutoCloseable { public String toString() { try { - return new ObjectMapper().writeValueAsString(this); - } catch (JsonProcessingException e) { + return gson.toJson(this); + } catch (Exception e) { //NOSONAR //never occurs return "{}"; } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java b/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java index 20700ac..043d4dc 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java @@ -21,7 +21,6 @@ import java.util.Date; import java.util.List; import java.util.Properties; -import com.fasterxml.jackson.core.JsonProcessingException; import org.onap.cli.fw.cmd.OnapCommand; import org.onap.cli.fw.error.OnapCommandException; import org.onap.cli.fw.error.OnapCommandExecutionFailed; @@ -34,13 +33,14 @@ import org.onap.cvc.csar.CSARArchive.CSARError; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; /** * Validates CSAR */ @OnapCommandSchema(schema = "vtp-validate-csar.yaml") public class VTPValidateCSAR extends OnapCommand { + private static Gson gson = new Gson(); private static final Logger LOG = LoggerFactory.getLogger(VTPValidateCSAR.class); public static final String PNF_ATTRIBUTE_NAME = "pnf"; @@ -268,15 +268,15 @@ public class VTPValidateCSAR extends OnapCommand { return validation; } - private void setOperationResult(CSARValidation validation) throws JsonProcessingException { + private void setOperationResult(CSARValidation validation) throws Exception { //NOSONAR this.getResult().getRecordsMap().get("vnf").getValues().add( - new ObjectMapper().writeValueAsString(validation.getVnf())); + gson.toJson(validation.getVnf())); this.getResult().getRecordsMap().get("date").getValues().add(validation.getDate()); this.getResult().getRecordsMap().get("criteria").getValues().add(validation.getCriteria()); this.getResult().getRecordsMap().get("results").getValues().add( - new ObjectMapper().writeValueAsString(validation.getResults())); + gson.toJson(validation.getResults())); - this.getResult().setOutput(new ObjectMapper().writeValueAsString(validation)); + this.getResult().setOutput(gson.toJson(validation)); this.getResult().setType(OnapCommandResultType.TEXT); } -- cgit 1.2.3-korg