diff options
Diffstat (limited to 'sandbox')
3 files changed, 5 insertions, 5 deletions
diff --git a/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java index 2efc3578bd..5e83e1b9d8 100644 --- a/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java +++ b/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java @@ -143,7 +143,7 @@ public class Input2InputTransformer extends BaseTransformer<Object[], Object[]> String targetDataBinding = getDataBinding(targetOp); targetWrapperHandler = getWrapperHandler(targetDataBinding, targetWrapped); - if ((!sourceWrapped && !sourceBare) && targetWrapped) { + if (!sourceWrapped && targetWrapped) { // Unwrapped --> Wrapped WrapperInfo wrapper = targetOp.getWrapper(); // ElementInfo wrapperElement = wrapper.getInputWrapperElement(); @@ -200,7 +200,7 @@ public class Input2InputTransformer extends BaseTransformer<Object[], Object[]> true); return new Object[] {targetWrapper}; - } else if (sourceWrapped && (!targetWrapped && !targetBare)) { + } else if (sourceWrapped && !targetWrapped) { // Wrapped to Unwrapped Object sourceWrapper = source[0]; Object[] target = null; diff --git a/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java index d02a98bfbe..ce3a58415d 100644 --- a/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java +++ b/sandbox/sebastien/java/wrapped/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java @@ -165,7 +165,7 @@ public class Output2OutputTransformer extends BaseTransformer<Object, Object> im String targetDataBinding = getDataBinding(targetOp); targetWrapperHandler = getWrapperHandler(targetDataBinding, targetWrapped); - if ((!sourceWrapped &&!sourceBare) && targetWrapped) { + if (!sourceWrapped && targetWrapped) { // Unwrapped --> Wrapped WrapperInfo wrapper = targetOp.getWrapper(); ElementInfo wrapperElement = wrapper.getOutputWrapperElement(); @@ -225,7 +225,7 @@ public class Output2OutputTransformer extends BaseTransformer<Object, Object> im targetWrapperHandler.setChildren(targetWrapper, children.toArray(), targetOp, false); return targetWrapper; } - } else if (sourceWrapped && (!targetWrapped && !targetBare)) { + } else if (sourceWrapped && !targetWrapped) { // Wrapped to Unwrapped Object sourceWrapper = response; List<ElementInfo> childElements = sourceOp.getWrapper().getOutputChildElements(); diff --git a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl index 81dd82bf12..fc0c7a4f06 100644 --- a/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl +++ b/sandbox/sebastien/java/wrapped/samples/extending-tuscany/implementation-sample/src/test/resources/UpperService.wsdl @@ -31,7 +31,7 @@ <xs:element name="upper"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="param0" nillable="true" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> |