WorkflowResponse json issues

This commit adds some robustness to the interface between the
API-H and BPMN, specifically, in how the response is handled.

I don't have proof, but there appears to be some randomness to
the json provider behavior when used with the jax-rs. Sometimes,
the serializer is adding the root element, and sometimes it
is not.  Maybe there's something wrong with the configuration.
Maybe we have competing json providers.  I couldn't pin this
down.

I'm almost certain it is the presence of the root element in
the content that causes the API-H code to fail parsing of the
BPMN response.  This doesn't kill the request, as you might
expect, but rather, the API-H passes the BPMN response through
to the client (VID, or policy, or whatever).

The original problem (SO-586) was "fixed" by "removing the
wrapper".  This "wrapper" is a needed feature of the interface
between BPMN and the API-H.  We shouldn't have removed it.
The fact that the "fix" appeared to work is due to the
behavior I described in the previous paragraph.  The API-H
chokes on the message, and it passes it through unchanged.
Not really what we want.

So, I don't know why the jackson/json behavior is flaky and
different now, but I can (and did) modify the API-H so it can
parse a json message whether or not it has a root element.

Note that WorkflowResponse.java (in BPMN) and CamundaResponse.java
(in the API-H) are basically the same bean representing the
message format.  Seems less than ideal to have two different
classes.

Also note that I changed the name of the "response" attribute
of the WorkflowResponse and CamundaResponse classes to "content".
Got tired of seeing this nonsense everywhere in the code:
	response.getResponse()

Change-Id: Icaf70f8457de99e493cf882170fe778c620308c9
Issue-ID: SO-586
Issue-ID: SO-618
Signed-off-by: Rob Daugherty <rd472p@att.com>

5 files changed, 23 insertions, 23 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
index ccaf954aa1..23adafd08e 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
@@ -985,7 +985,7 @@ public class E2EServiceInstances {
 			HashMap<String, String> instanceIdMap) {
 		// BPMN accepted the request, the request is in progress
 		if (bpelStatus == HttpStatus.SC_ACCEPTED) {
-			String camundaJSONResponseBody = respHandler.getResponseBody();
+			String camundaJSONResponseBody = respHandler.getContent();
 			msoLogger.debug("Received from Camunda: " + camundaJSONResponseBody);
 			msoLogger.recordAuditEvent(startTime,
 					MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc,
@@ -996,7 +996,7 @@ public class E2EServiceInstances {
 		} else {
 			List<String> variables = new ArrayList<>();
 			variables.add(bpelStatus + "");
-			String camundaJSONResponseBody = respHandler.getResponseBody();
+			String camundaJSONResponseBody = respHandler.getContent();
 			if (camundaJSONResponseBody != null
 					&& !camundaJSONResponseBody.isEmpty()) {
 				Response resp = msoRequest.buildServiceErrorResponse(
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
index 7c3a3df0e2..9cba623642 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
@@ -798,7 +798,7 @@ public class ServiceInstances {
 
 		// BPEL accepted the request, the request is in progress
 		if (bpelStatus == HttpStatus.SC_ACCEPTED) {
-			String camundaJSONResponseBody = respHandler.getResponseBody ();
+			String camundaJSONResponseBody = respHandler.getContent();
 			msoLogger.debug ("Received from Camunda: " + camundaJSONResponseBody);
 			msoRequest.setStatus (org.openecomp.mso.apihandlerinfra.vnfbeans.RequestStatusType.IN_PROGRESS);
 			(RequestsDatabase.getInstance()).updateInfraStatus (msoRequest.getRequestId (),
@@ -811,7 +811,7 @@ public class ServiceInstances {
 		} else {
 			List<String> variables = new ArrayList<>();
 			variables.add(bpelStatus + "");
-			String camundaJSONResponseBody = respHandler.getResponseBody ();
+			String camundaJSONResponseBody = respHandler.getContent();
 			if (camundaJSONResponseBody != null && !camundaJSONResponseBody.isEmpty ()) {
 				msoRequest.setStatus (org.openecomp.mso.apihandlerinfra.vnfbeans.RequestStatusType.FAILED);
 				Response resp =  msoRequest.buildServiceErrorResponse(bpelStatus,
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/TasksHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/TasksHandler.java
index 368807f9c9..9aac16aa4c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/TasksHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/TasksHandler.java
@@ -176,7 +176,7 @@ public class TasksHandler {
 			msoLogger.debug ("Received good response from Camunda");
 						
 			msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "BPMN completed the request");
-			String respBody = respHandler.getResponseBody();		
+			String respBody = respHandler.getContent();		
 			if (respBody != null) {				
 				JSONArray data = new JSONArray(respBody);
 				
@@ -276,7 +276,7 @@ public class TasksHandler {
 			msoLogger.debug ("Received good response from Camunda");
 						
 			msoLogger.recordAuditEvent (subStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "BPMN completed the request");
-			String respBody = respHandler.getResponseBody();		
+			String respBody = respHandler.getContent();		
 			if (respBody != null) {
 				taskList = buildTaskList(taskId, respBody);				
 			}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
index f8caa54846..60ac6b98c9 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
@@ -204,7 +204,7 @@ public class E2EServiceInstancesTest {
 				HttpResponse resp = new BasicHttpResponse(pv, 202,
 						"test response");
 				BasicHttpEntity entity = new BasicHttpEntity();
-				String body = "{\"response\":\"success\",\"message\":\"success\"}";
+				String body = "{\"content\":\"success\",\"message\":\"success\"}";
 				InputStream instream = new ByteArrayInputStream(body.getBytes());
 				entity.setContent(instream);
 				resp.setEntity(entity);
@@ -268,7 +268,7 @@ public class E2EServiceInstancesTest {
 				HttpResponse resp = new BasicHttpResponse(pv, 500,
 						"test response");
 				BasicHttpEntity entity = new BasicHttpEntity();
-				String body = "{\"response\":\"success\",\"message\":\"success\"}";
+				String body = "{\"content\":\"success\",\"message\":\"success\"}";
 				InputStream instream = new ByteArrayInputStream(body.getBytes());
 				entity.setContent(instream);
 				resp.setEntity(entity);
@@ -333,7 +333,7 @@ public class E2EServiceInstancesTest {
 				HttpResponse resp = new BasicHttpResponse(pv, 500,
 						"test response");
 				BasicHttpEntity entity = new BasicHttpEntity();
-				String body = "{\"response\":\"\",\"message\":\"success\"}";
+				String body = "{\"content\":\"\",\"message\":\"success\"}";
 				InputStream instream = new ByteArrayInputStream(body.getBytes());
 				entity.setContent(instream);
 				resp.setEntity(entity);
@@ -634,7 +634,7 @@ public class E2EServiceInstancesTest {
                 ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
                 HttpResponse resp = new BasicHttpResponse(pv, 200, "test response");
                 BasicHttpEntity entity = new BasicHttpEntity();
-                String body = "{\"response\":\"success\",\"message\":\"success\"}";
+                String body = "{\"content\":\"success\",\"message\":\"success\"}";
                 InputStream instream = new ByteArrayInputStream(body.getBytes());
                 entity.setContent(instream);
                 resp.setEntity(entity);
@@ -832,7 +832,7 @@ public class E2EServiceInstancesTest {
 				HttpResponse resp = new BasicHttpResponse(pv, 202,
 						"test response");
 				BasicHttpEntity entity = new BasicHttpEntity();
-				String body = "{\"response\":\"success\",\"message\":\"success\"}";
+				String body = "{\"content\":\"success\",\"message\":\"success\"}";
 				InputStream instream = new ByteArrayInputStream(body.getBytes());
 				entity.setContent(instream);
 				resp.setEntity(entity);
@@ -898,7 +898,7 @@ public class E2EServiceInstancesTest {
 				HttpResponse resp = new BasicHttpResponse(pv, 202,
 						"test response");
 				BasicHttpEntity entity = new BasicHttpEntity();
-				String body = "{\"response\":\"success\",\"message\":\"success\"}";
+				String body = "{\"content\":\"success\",\"message\":\"success\"}";
 				InputStream instream = new ByteArrayInputStream(body.getBytes());
 				entity.setContent(instream);
 				resp.setEntity(entity);
@@ -965,7 +965,7 @@ public class E2EServiceInstancesTest {
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "test response");
                 BasicHttpEntity entity = new BasicHttpEntity();
-                String body = "{\"response\":\"success\",\"message\":\"success\"}";
+                String body = "{\"content\":\"success\",\"message\":\"success\"}";
                 InputStream instream = new ByteArrayInputStream(body.getBytes());
                 entity.setContent(instream);
                 resp.setEntity(entity);
@@ -1037,7 +1037,7 @@ public class E2EServiceInstancesTest {
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "test response");
                 BasicHttpEntity entity = new BasicHttpEntity();
-                String body = "{\"response\":\"success\",\"message\":\"success\"}";
+                String body = "{\"content\":\"success\",\"message\":\"success\"}";
                 InputStream instream = new ByteArrayInputStream(body.getBytes());
                 entity.setContent(instream);
                 resp.setEntity(entity);
@@ -1103,7 +1103,7 @@ public class E2EServiceInstancesTest {
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "test response");
                 BasicHttpEntity entity = new BasicHttpEntity();
-                String body = "{\"response\":\"success\",\"message\":\"success\"}";
+                String body = "{\"content\":\"success\",\"message\":\"success\"}";
                 InputStream instream = new ByteArrayInputStream(body.getBytes());
                 entity.setContent(instream);
                 resp.setEntity(entity);
@@ -1227,7 +1227,7 @@ public class E2EServiceInstancesTest {
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "compareModelwithTargetVersion, test response");
                 BasicHttpEntity entity = new BasicHttpEntity();
-                String body = "{\"response\":\"success\",\"message\":\"success\"}";
+                String body = "{\"content\":\"success\",\"message\":\"success\"}";
                 InputStream instream = new ByteArrayInputStream(body.getBytes());
                 entity.setContent(instream);
                 resp.setEntity(entity);
@@ -1301,7 +1301,7 @@ public class E2EServiceInstancesTest {
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "test response");
                 BasicHttpEntity entity = new BasicHttpEntity();
-                String body = "{\"response\":\"success\",\"message\":\"success\"}";
+                String body = "{\"content\":\"success\",\"message\":\"success\"}";
                 InputStream instream = new ByteArrayInputStream(body.getBytes());
                 entity.setContent(instream);
                 resp.setEntity(entity);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
index 28cb51aa70..50f00ef6a4 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
@@ -233,7 +233,7 @@ public class ServiceInstanceTest {
             	ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

             	HttpResponse resp = new BasicHttpResponse(pv,200, "test response");

             	BasicHttpEntity entity = new BasicHttpEntity();

-            	String body = "{\"response\":\"success\",\"message\":\"success\"}";

+            	String body = "{\"content\":\"success\",\"message\":\"success\"}";

             	InputStream instream = new ByteArrayInputStream(body.getBytes());

             	entity.setContent(instream);

             	resp.setEntity(entity);

@@ -303,7 +303,7 @@ public class ServiceInstanceTest {
             	ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

             	HttpResponse resp = new BasicHttpResponse(pv,500, "test response");

             	BasicHttpEntity entity = new BasicHttpEntity();

-            	String body = "{\"response\":\"success\",\"message\":\"success\"}";

+            	String body = "{\"content\":\"success\",\"message\":\"success\"}";

             	InputStream instream = new ByteArrayInputStream(body.getBytes());

             	entity.setContent(instream);

             	resp.setEntity(entity);

@@ -374,7 +374,7 @@ public class ServiceInstanceTest {
             	ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

             	HttpResponse resp = new BasicHttpResponse(pv,500, "test response");

             	BasicHttpEntity entity = new BasicHttpEntity();

-            	String body = "{\"response\":\"success\",\"message\":\"success\"}";

+            	String body = "{\"content\":\"success\",\"message\":\"success\"}";

             	InputStream instream = new ByteArrayInputStream(body.getBytes());

             	entity.setContent(instream);

             	resp.setEntity(entity);

@@ -932,7 +932,7 @@ public class ServiceInstanceTest {
 				HttpResponse resp = new BasicHttpResponse(pv,200, "test response");

 				BasicHttpEntity entity = new BasicHttpEntity();

 

-				final String body = "{\"response\":\"success\",\"message\":\"success\"}";

+				final String body = "{\"content\":\"success\",\"message\":\"success\"}";

 				InputStream instream = new ByteArrayInputStream(body.getBytes());

 				entity.setContent(instream);

 				resp.setEntity(entity);

@@ -1101,7 +1101,7 @@ public class ServiceInstanceTest {
 				HttpResponse resp = new BasicHttpResponse(pv,200, "test response");

 				BasicHttpEntity entity = new BasicHttpEntity();

 

-				final String body = "{\"response\":\"success\",\"message\":\"success\"}";

+				final String body = "{\"content\":\"success\",\"message\":\"success\"}";

 				InputStream instream = new ByteArrayInputStream(body.getBytes());

 				entity.setContent(instream);

 				resp.setEntity(entity);

@@ -1152,7 +1152,7 @@ public class ServiceInstanceTest {
 				HttpResponse resp = new BasicHttpResponse(pv,200, "test response");

 				BasicHttpEntity entity = new BasicHttpEntity();

 

-				final String body = "{\"response\":\"success\",\"message\":\"success\"}";

+				final String body = "{\"content\":\"success\",\"message\":\"success\"}";

 				InputStream instream = new ByteArrayInputStream(body.getBytes());

 				entity.setContent(instream);

 				resp.setEntity(entity);