TUSCANY-3890 - separate the request wrapper model from the response wrapper model as per the change in 1.x under TUSCANY-2931.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1213702 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JsonRpcServlet.java b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JsonRpcServlet.java
index 2febbf5dc3..4261f5bffc 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JsonRpcServlet.java
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JsonRpcServlet.java
@@ -188,7 +188,7 @@ public class JsonRpcServlet extends HttpServlet {
 
         requestMessage.getHeaders().put("RequestMessage", request);
 
-        if (jsonOperation.getWrapper().getDataBinding().equals(JSONDataBinding.NAME)) {
+        if (jsonOperation.getInputWrapper().getDataBinding().equals(JSONDataBinding.NAME)) {
             requestMessage.setBody(new Object[] {JacksonHelper.toString(request.getJsonNode())});
         } else {
             requestMessage.setBody(params);
@@ -210,7 +210,7 @@ public class JsonRpcServlet extends HttpServlet {
         }
 
         if (!responseMessage.isFault()) {
-            if (jsonOperation.getWrapper().getDataBinding().equals(JSONDataBinding.NAME)) {
+            if (jsonOperation.getOutputWrapper().getDataBinding().equals(JSONDataBinding.NAME)) {
                 result = responseMessage.getBody();
                 return new JsonRpc20Response((ObjectNode)JacksonHelper.MAPPER.readTree(result.toString()));
             } else {
@@ -262,7 +262,7 @@ public class JsonRpcServlet extends HttpServlet {
         requestMessage.setOperation(jsonOperation);
 
         requestMessage.getHeaders().put("RequestMessage", request);
-        if (jsonOperation.getWrapper().getDataBinding().equals(JSONDataBinding.NAME)) {
+        if (jsonOperation.getInputWrapper().getDataBinding().equals(JSONDataBinding.NAME)) {
             requestMessage.setBody(new Object[] {JacksonHelper.toString(request.getJsonNode())});
         } else {
             requestMessage.setBody(params);
@@ -283,7 +283,7 @@ public class JsonRpcServlet extends HttpServlet {
         }
 
         if (!responseMessage.isFault()) {
-            if (jsonOperation.getWrapper().getDataBinding().equals(JSONDataBinding.NAME)) {
+            if (jsonOperation.getOutputWrapper().getDataBinding().equals(JSONDataBinding.NAME)) {
                 result = responseMessage.getBody();
                 return new JsonRpc10Response((ObjectNode)JacksonHelper.MAPPER.readTree(result.toString()));
             } else {