Support merge JSON to SvcLogicContext

Add support for merging JSON into SvcLogicContext

Change-Id: If13fd6328a36ccff6393d0829319bbd99cd2a1f0
Issue-ID: CCSDK-2096
Signed-off-by: Dan Timoney <dtimoney@att.com>

2 files changed, 18 insertions, 40 deletions

diff --git a/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiController.java b/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiController.java
index 7c4717da..2da5490a 100644
--- a/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiController.java
+++ b/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiController.java
@@ -85,8 +85,9 @@ public class RestconfApiController implements RestconfApi {
 
 		try {
 			log.info("Calling SLI-API:healthcheck DG");
-			Properties inputProps = new Properties();
-			Properties respProps = svc.execute("sli", "healthcheck", null, "sync", inputProps);
+			SvcLogicContext ctxIn = new SvcLogicContext();
+			SvcLogicContext ctxOut = svc.execute("sli", "healthcheck", null, "sync", ctxIn);
+			Properties respProps = ctxOut.toProperties();
 
 			resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
 			resp.setResponseCode(respProps.getProperty("error-code", "200"));
@@ -110,9 +111,9 @@ public class RestconfApiController implements RestconfApi {
 
 		try {
 			log.info("Calling SLI-API:vlbcheck DG");
-			Properties inputProps = new Properties();
-			Properties respProps = svc.execute("sli", "vlbcheck", null, "sync", inputProps);
-
+			SvcLogicContext ctxIn = new SvcLogicContext();
+			SvcLogicContext ctxOut = svc.execute("sli", "vlbcheck", null, "sync", ctxIn);
+			Properties respProps = ctxOut.toProperties();
 			resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
 			resp.setResponseCode(respProps.getProperty("error-code", "200"));
 			resp.setResponseMessage(respProps.getProperty("error-message", "Success"));
@@ -142,7 +143,7 @@ public class RestconfApiController implements RestconfApi {
 
 	@Override
 	public ResponseEntity<ResponseFields> executeGraph(@Valid ExecuteGraphInput executeGraphInput) {
-		Properties parms = new Properties();
+		SvcLogicContext ctxIn = new SvcLogicContext();
 		ResponseFields resp = new ResponseFields();
 		String executeGraphInputJson = null;
 
@@ -161,8 +162,7 @@ public class RestconfApiController implements RestconfApi {
 		JsonObject jsonInput = new Gson().fromJson(executeGraphInputJson, JsonObject.class);
 		JsonObject passthroughObj = jsonInput.get("input").getAsJsonObject();
 
-		writeResponseToCtx(passthroughObj.toString(), parms, "input");
-
+		ctxIn.mergeJson("input", passthroughObj.toString());
 
 		try {
 			// Any of these can throw a nullpointer exception
@@ -170,7 +170,8 @@ public class RestconfApiController implements RestconfApi {
 			String calledRpc = executeGraphInput.getInput().getRpcName();
 			String modeStr = executeGraphInput.getInput().getMode();
 			// execute should only throw a SvcLogicException
-			Properties respProps = svc.execute(calledModule, calledRpc, null, modeStr, parms);
+			SvcLogicContext ctxOut = svc.execute(calledModule, calledRpc, null, modeStr, ctxIn);
+			Properties respProps = ctxOut.toProperties();
 
 			resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
 			resp.setResponseCode(respProps.getProperty("error-code", "200"));
@@ -193,37 +194,6 @@ public class RestconfApiController implements RestconfApi {
 		}
 	}
 
-	public static void writeResponseToCtx(String resp, Properties ctx, String prefix) {
-		JsonParser jp = new JsonParser();
-		JsonElement element = jp.parse(resp);
-		writeJsonObject(element.getAsJsonObject(), ctx, prefix + ".");
-	}
-
-	public static void writeJsonObject(JsonObject obj, Properties ctx, String root) {
-		for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
-			if (entry.getValue().isJsonObject()) {
-				writeJsonObject(entry.getValue().getAsJsonObject(), ctx, root + entry.getKey() + ".");
-			} else if (entry.getValue().isJsonArray()) {
-				JsonArray array = entry.getValue().getAsJsonArray();
-				ctx.put(root + entry.getKey() + "_length", String.valueOf(array.size()));
-				Integer arrayIdx = 0;
-				for (JsonElement element : array) {
-					if (element.isJsonObject()) {
-						writeJsonObject(element.getAsJsonObject(), ctx, root + entry.getKey() + "[" + arrayIdx + "].");
-					}
-					arrayIdx++;
-				}
-			} else {
-				if (entry.getValue() instanceof JsonNull) {
-					log.info("Skipping parameter "+entry.getKey()+" with null value");
-
-				} else {
-					ctx.put(root + entry.getKey(), entry.getValue().getAsString());
-				}
-			}
-		}
-	}
-
 	public static String propsToJson(Properties props, String root)
 	{
 		StringBuffer sbuff = new StringBuffer();
diff --git a/sliapi/springboot/src/test/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiControllerTest.java b/sliapi/springboot/src/test/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiControllerTest.java
index 701cb3eb..13f5939c 100644
--- a/sliapi/springboot/src/test/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiControllerTest.java
+++ b/sliapi/springboot/src/test/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiControllerTest.java
@@ -7,6 +7,8 @@ import org.junit.runner.RunWith;
 import org.onap.ccsdk.sli.core.sliapi.model.ExecuteGraphInput;
 import org.onap.ccsdk.sli.core.sliapi.model.ExecutegraphinputInput;
 import org.onap.ccsdk.sli.core.sliapi.model.ResponseFields;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.http.MediaType;
@@ -21,6 +23,9 @@ import static org.junit.Assert.assertEquals;
 @WebMvcTest(RestconfApiController.class)
 public class RestconfApiControllerTest {
 
+
+    private static final Logger log = LoggerFactory.getLogger(RestconfApiControllerTest.class);
+
     @Autowired
     private MockMvc mvc;
 
@@ -56,6 +61,7 @@ public class RestconfApiControllerTest {
         executeGraphInput.setInput(executeGraphData);
 
         String jsonString = mapToJson(executeGraphInput);
+        log.error("jsonString is {}", jsonString);
 
         MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.post(url).contentType(MediaType.APPLICATION_JSON_VALUE).content(jsonString)).andReturn();
 
@@ -77,6 +83,8 @@ public class RestconfApiControllerTest {
 
         String jsonString = mapToJson(executeGraphInput);
 
+        log.error("jsonString is {}", jsonString);
+
         MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.post(url).contentType(MediaType.APPLICATION_JSON_VALUE).content(jsonString)).andReturn();
 
         assertEquals(401, mvcResult.getResponse().getStatus());