Merge "Reorder modifiers"

[so.git] / mso-api-handlers / mso-api-handler-common / src / main / java / org / openecomp / mso / apihandler / camundabeans / CamundaResponse.java

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java
index 3c5c5ec..64b7d86 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaResponse.java
@@ -20,53 +20,41 @@
 
 package org.openecomp.mso.apihandler.camundabeans;
 
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+// This class must be 100% JSON-compatible with the BPMN WorkflowResponse class.
+// TODO: BPMN and the API-H should use a common class.
 
 /**
- * JavaBean JSON class for a "variables" which contains the xml payload that
- * will be passed to the Camunda process
- * 
+ * A synchronous response from a workflow.
  */
-
+@JsonRootName(value = "WorkflowResponse")
 public class CamundaResponse {
-       
-       @JsonProperty("response")
-       private String response;
+
+       @JsonProperty("processInstanceId")
+       private String processInstanceId;
+
        @JsonProperty("messageCode")
        private int messageCode;
+
        @JsonProperty("message")
        private String message;
-       @JsonProperty("processInstanceID")
-       private String processInstanceID;
-       @JsonProperty("variables")
-       private String variables;
 
-       public String getProcessInstanceID() {
-               return processInstanceID;
-       }
-
-       public void setProcessInstanceID(String processInstanceID) {
-               this.processInstanceID = processInstanceID;
-       }
-
-       public String getVariables() {
-               return variables;
-       }
-
-       public void setVariables(String variables) {
-               this.variables = variables;
-       }
+       @JsonProperty("variables")
+       private Map<String,String> variables;
 
-       public CamundaResponse() {
-       }
+       @JsonProperty("content")
+       private String content;
 
-       public String getResponse() {
-               return response;
+       public String getProcessInstanceId() {
+               return processInstanceId;
        }
 
-       public void setResponse(String response) {
-               this.response = response;
+       public void setProcessInstanceId(String processInstanceId) {
+               this.processInstanceId = processInstanceId;
        }
 
        public int getMessageCode() {
@@ -85,13 +73,30 @@ public class CamundaResponse {
                this.message = message;
        }
 
+       public Map<String,String> getVariables() {
+               return variables;
+       }
+
+       public void setVariables(Map<String,String> variables) {
+               this.variables = variables;
+       }
+
+       public String getContent() {
+               return content;
+       }
+
+       public void setContent(String content) {
+               this.content = content;
+       }
+
        @Override
        public String toString() {
-               return "CamundaResponse [response=" + response + ", messageCode="
-                               + messageCode + ", message=" + message + "]";
+               return getClass().getSimpleName() + "["
+                       + "processInstanceId=" + processInstanceId
+                       + ",messageCode=" + messageCode
+                       + ",message=" + message
+                       + ",variables=" + variables
+                       + ",content=" + content
+                       + "]";
        }
-
-       
-       
-       
-}
+}
\ No newline at end of file