From 699653d2ae2df1cec6af2915c90a6a7137a1c077 Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 13 Dec 2011 14:12:38 +0000 Subject: 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 --- .../sca/assembly/xml/InterfaceContractProcessor.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/InterfaceContractProcessor.java') diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/InterfaceContractProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/InterfaceContractProcessor.java index d1da967c4d..e1d54f5b6e 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/InterfaceContractProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/InterfaceContractProcessor.java @@ -150,7 +150,8 @@ public class InterfaceContractProcessor extends BaseAssemblyProcessor implements operation.setName(getString(reader, "name")); operation.setDynamic(getBoolean(reader, "isDynamic")); operation.setNonBlocking(getBoolean(reader, "isNonBlocking")); - operation.setWrapperStyle(getBoolean(reader, "isWrapperStyle")); + operation.setInputWrapperStyle(getBoolean(reader, "isInputWrapperStyle")); + operation.setOutputWrapperStyle(getBoolean(reader, "isOutputWrapperStyle")); inputs = new ArrayList(); DataType inputType = new DataTypeImpl>(null, null); @@ -276,15 +277,18 @@ public class InterfaceContractProcessor extends BaseAssemblyProcessor implements writer.writeAttribute("name", operation.getName()); writer.writeAttribute("isDynamic", String.valueOf(operation.isDynamic())); writer.writeAttribute("isNonBlocking", String.valueOf(operation.isNonBlocking())); - writer.writeAttribute("isWrapperStyle", String.valueOf(operation.isWrapperStyle())); + writer.writeAttribute("isInputWrapperStyle", String.valueOf(operation.isInputWrapperStyle())); + writer.writeAttribute("isOutputWrapperStyle", String.valueOf(operation.isOutputWrapperStyle())); List outputTypes = operation.getOutputType().getLogical(); List inputTypes = operation.getInputType().getLogical(); List faultTypes = operation.getFaultTypes(); - if (operation.isWrapperStyle() && operation.getWrapper() != null) { - inputTypes = operation.getWrapper().getUnwrappedInputType().getLogical(); - outputTypes = operation.getWrapper().getUnwrappedOutputType().getLogical(); + if (operation.isInputWrapperStyle() && operation.getInputWrapper() != null) { + inputTypes = operation.getInputWrapper().getUnwrappedType().getLogical(); + } + if (operation.isOutputWrapperStyle() && operation.getOutputWrapper() != null) { + outputTypes = operation.getOutputWrapper().getUnwrappedType().getLogical(); } writer.writeStartElement(Constants.SCA11_TUSCANY_NS, INPUT); -- cgit v1.2.3