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

3 files changed, 17 insertions, 16 deletions

diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java b/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java
index daa0bebd81..672c01a0b9 100644
--- a/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java
+++ b/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java
@@ -118,9 +118,9 @@ public class JAXWSAsyncInterfaceProcessor implements JavaInterfaceVisitor {
                     asyncActualReturnTypeClass = (Class<?>)asyncReturnType.getActualTypeArguments()[0];
                 }
 
-                if (operation.getWrapper() != null) {
+                if (operation.getOutputWrapper() != null) {
                     // The return type could be the wrapper type per JAX-WS spec 
-                    Class<?> wrapperClass = operation.getWrapper().getOutputWrapperClass();
+                    Class<?> wrapperClass = operation.getOutputWrapper().getWrapperClass();
                     if (wrapperClass == asyncActualReturnTypeClass) {
                         return true;
                     }
@@ -182,9 +182,9 @@ public class JAXWSAsyncInterfaceProcessor implements JavaInterfaceVisitor {
                 asyncActualLastParameterTypeClass = (Class<?>)asyncLastParameterType.getActualTypeArguments()[0];
             }
 
-            if (operation.getWrapper() != null) {
+            if (operation.getOutputWrapper() != null) {
                 // The return type could be the wrapper type per JAX-WS spec 
-                Class<?> wrapperClass = operation.getWrapper().getOutputWrapperClass();
+                Class<?> wrapperClass = operation.getOutputWrapper().getWrapperClass();
                 if (wrapperClass == asyncActualLastParameterTypeClass) {
                     return true;
                 }
diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index e8faa88de3..223f879570 100644
--- a/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-2.x/trunk/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
@@ -142,7 +142,8 @@ public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor {
                 if(bare) {
                     // For BARE parameter style, the data won't be unwrapped
                     // The wrapper should be null
-                    operation.setWrapperStyle(false);
+                    operation.setInputWrapperStyle(false);
+                    operation.setOutputWrapperStyle(false);
                 }
                 documentStyle = methodSOAPBinding.style() == Style.DOCUMENT;
             }
@@ -338,14 +339,14 @@ public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor {
                 }                                  
                     
                 String db = inputWrapperDT != null ? inputWrapperDT.getDataBinding() : JAXB_DATABINDING;
-                WrapperInfo wrapperInfo =
-                    new WrapperInfo(db, new ElementInfo(inputWrapper, null), new ElementInfo(outputWrapper, null),
-                                    inputElements, outputElements);
+                WrapperInfo inputWrapperInfo = new WrapperInfo(db, new ElementInfo(inputWrapper, null), inputElements);
+                WrapperInfo outputWrapperInfo = new WrapperInfo(db, new ElementInfo(outputWrapper, null), outputElements);                  
 
-                wrapperInfo.setInputWrapperType(inputWrapperDT);
-                wrapperInfo.setOutputWrapperType(outputWrapperDT);
+                inputWrapperInfo.setWrapperType(inputWrapperDT);
+                outputWrapperInfo.setWrapperType(outputWrapperDT);
 
-                operation.setWrapper(wrapperInfo);
+                operation.setInputWrapper(inputWrapperInfo);
+                operation.setOutputWrapper(outputWrapperInfo);
             }
             
             // In both bare and wrapped cases, remove OUT-only parameters from input DataType.
diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-2.x/trunk/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
index 5f3114a67c..517f922a54 100644
--- a/sca-java-2.x/trunk/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
@@ -61,9 +61,9 @@ public class JAXWSJavaInterfaceProcessorTestCase {
 
         // interfaceProcessor.visitInterface(contract);
         Operation op = contract.getOperations().get(0);
-        Assert.assertTrue(!op.isWrapperStyle());
-        Assert.assertEquals(new QName("http://www.example.com/stock", "stockQuoteOffer"), op.getWrapper().getInputWrapperElement().getQName());
-        Assert.assertEquals(new QName("http://www.example.com/stock", "stockQuoteOfferResponse"), op.getWrapper().getOutputWrapperElement().getQName());
+        Assert.assertTrue(!op.isInputWrapperStyle());
+        Assert.assertEquals(new QName("http://www.example.com/stock", "stockQuoteOffer"), op.getInputWrapper().getWrapperElement().getQName());
+        Assert.assertEquals(new QName("http://www.example.com/stock", "stockQuoteOfferResponse"), op.getOutputWrapper().getWrapperElement().getQName());
     }
 
     /**
@@ -92,14 +92,14 @@ public class JAXWSJavaInterfaceProcessorTestCase {
             op = op2;
         }
 
-        assertTrue(!op.isWrapperStyle() && op.getWrapper() == null);
+        assertTrue(!op.isInputWrapperStyle() && op.getInputWrapper() == null);
 
         if ("M2".equals(op2.getName())) {
             op = op2;
         } else {
             op = op1;
         }
-        assertTrue(!op.isWrapperStyle() && op.getWrapper() != null);
+        assertTrue(!op.isInputWrapperStyle() && op.getInputWrapper() != null);
 
     }