Merge "Migrate to gson"

1 files changed, 8 insertions, 9 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/model/VTPTestExecution.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/model/VTPTestExecution.java
index e56333be..b5dc7399 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/model/VTPTestExecution.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/model/VTPTestExecution.java
@@ -22,9 +22,8 @@ import java.util.List;
 
 import org.onap.vtp.VTPModelBase;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 public class VTPTestExecution extends VTPModelBase{
     private String scenario;
@@ -33,8 +32,8 @@ public class VTPTestExecution extends VTPModelBase{
     private String executionId;
     private String requestId;
     private String profile;
-    private JsonNode parameters = JsonNodeFactory.instance.objectNode();
-    private JsonNode results = JsonNodeFactory.instance.objectNode();
+    private JsonElement parameters = new JsonObject();
+    private JsonElement results = new JsonObject();
     public enum Status {
         IN_PROGRESS, COMPLETED, FAILED;
     }
@@ -76,10 +75,10 @@ public class VTPTestExecution extends VTPModelBase{
         return this;
     }
 
-    public JsonNode getResults() {
+    public JsonElement getResults() {
         return results;
     }
-    public VTPTestExecution setResults(JsonNode results) {
+    public VTPTestExecution setResults(JsonElement results) {
         this.results = results;
         return this;
     }
@@ -125,10 +124,10 @@ public class VTPTestExecution extends VTPModelBase{
         this.requestId = requestId;
     }
 
-    public JsonNode getParameters() {
+    public JsonElement getParameters() {
         return parameters;
     }
-    public void setParameters(JsonNode parameters) {
+    public void setParameters(JsonElement parameters) {
         this.parameters = parameters;
     }