diff options
Diffstat (limited to 'vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/VTPResource.java')
-rw-r--r-- | vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/VTPResource.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/VTPResource.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/VTPResource.java index f6139066..254cc6ad 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/VTPResource.java +++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/VTPResource.java @@ -35,12 +35,15 @@ import org.open.infc.grpc.client.OpenRemoteCli; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import com.google.gson.reflect.TypeToken; public class VTPResource { protected static final Logger LOG = LoggerFactory.getLogger(VTPResource.class); + private static Gson gson = new Gson(); protected static String VTP_TEST_CENTER_IP; // NOSONAR protected static int VTP_TEST_CENTER_PORT; // NOSONAR @@ -100,24 +103,23 @@ public class VTPResource { return VTP_ARTIFACT_STORE; } - protected JsonNode makeRpcAndGetJson(List<String> args) throws VTPException, IOException { + protected JsonElement makeRpcAndGetJson(List<String> args) throws VTPException, IOException { return this.makeRpcAndGetJson(args, VTP_EXECUTION_GRPC_TIMEOUT); } - protected JsonNode makeRpcAndGetJson(List<String> args, int timeout) throws VTPException, IOException { + protected JsonElement makeRpcAndGetJson(List<String> args, int timeout) throws VTPException, IOException { Result result = this.makeRpc(args, timeout); - ObjectMapper mapper = new ObjectMapper(); - return mapper.readTree(result.getOutput()); + JsonParser jsonParser = new JsonParser(); + return jsonParser.parse(result.getOutput()); } - protected Output makeRpc(String scenario, String requestId, String profile, String testCase, JsonNode argsJsonNode) throws VTPException { + protected Output makeRpc(String scenario, String requestId, String profile, String testCase, JsonElement argsJsonNode) throws VTPException { return this.makeRpc(scenario, requestId, profile, testCase, argsJsonNode, VTP_EXECUTION_GRPC_TIMEOUT); } - protected Output makeRpc(String scenario, String requestId, String profile, String testCase, JsonNode argsJsonNode, int timeout) throws VTPException { + protected Output makeRpc(String scenario, String requestId, String profile, String testCase, JsonElement argsJsonNode, int timeout) throws VTPException { Output output = null; - ObjectMapper mapper = new ObjectMapper(); - Map <String, String> args = mapper.convertValue(argsJsonNode, Map.class); + Map <String, String> args = gson.fromJson(argsJsonNode, new TypeToken<Map<String,String>>(){}.getType()); try { output = new OpenRemoteCli( VTP_TEST_CENTER_IP, |