Author: darran.lofthouse(a)jboss.com Date: 2006-12-21 20:54:35 -0500 (Thu, 21 Dec 2006) New Revision: 1717 Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java Log: JBWS-1260 - Throw exceptions for not supported unwrapping. Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-22 01:54:35 UTC (rev 1717) @@ -253,12 +253,8 @@ if (j > 0) buf.append(","); WSDLInterfaceOperationInput in = ins[j]; - QName xmlName = in.getElement(); - QName xmlType = in.getXMLType(); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - appendParameters(buf, in, in.getElement().getLocalPart(), xmlType, xt); + appendParameters(buf, in, in.getElement().getLocalPart()); } //Check for out holder only @@ -394,7 +390,12 @@ StringBuilder tempBuf = new StringBuilder(); XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; - boolean appendedAttribute = appendParameters(tempBuf, wrapper.getAttributeUses()); + boolean hasAttributes = wrapper.getAttributeUses().getLength() > 0; + + if (hasAttributes) + throw new WSException("Can not unwrap, complex type contains attributes."); + // TODO DAL - Add same check for unwrapping response. + boolean unwrappedElement = false; XSParticle particle = wrapper.getParticle(); @@ -411,7 +412,7 @@ } } - if ((appendedAttribute && unwrappedElement) || unwrappedElement) + if (unwrappedElement) { buf.append(tempBuf); @@ -424,41 +425,28 @@ return false; } - private boolean appendParameters(StringBuilder buf, XSObjectList attributes) throws IOException + private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, String containingElement) throws IOException { - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - boolean appendedParameter = false; - for (int i = 0; i < attributes.getLength(); i++) - { - XSObject object = attributes.item(i); - if (object instanceof XSAttributeUse) - { - if (buf.length() > 0) - buf.append(", "); - - XSAttributeUse attribute = (XSAttributeUse)object; - XSAttributeDeclaration declaration = attribute.getAttrDeclaration(); - XSTypeDefinition type = declaration.getTypeDefinition(); - QName xmlType = new QName(type.getNamespace(), type.getName()); - generateParameter(buf, null, "", xmlType, xsmodel, type, false, true); - buf.append(" ").append(getMethodParam(declaration.getName())); - - appendedParameter = true; - } - } - - return appendedParameter; - } - - private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, String containingElement, QName xmlType, XSTypeDefinition xt) throws IOException - { + QName xmlType = in.getXMLType(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); boolean wrapped = isWrapped(); if (wrapped) { + int inputs = in.getWsdlOperation().getInputs().length; + if (inputs > 1) + throw new WSException("Can not unwrap parameters for operation with mutliple inputs. inputs=" + inputs); + + String operationName = in.getWsdlOperation().getName().toString(); + String elementName = in.getElement().getLocalPart(); + + if (elementName.equals(operationName) == false) + throw new WSException("Unable to unwrap parameters, wrapper element name must match operation name. operationName=" + operationName + " elementName=" + + elementName); + wrapped = unwrapElementParameters(buf, containingElement, xt); } @@ -582,7 +570,7 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(xt, isWrapped()); + ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(outs, xsmodel, isWrapped()); if (unwrapper.unwrap()) { // Need to generate wrapper class as well. Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-12-22 01:54:35 UTC (rev 1717) @@ -246,7 +246,7 @@ JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(xt, isWrapped()); + ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(wiopoutarr, schemaModel, isWrapped()); if (unwrapper.unwrap()) { if (unwrapper.unwrappedElement != null) Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2006-12-22 01:54:35 UTC (rev 1717) @@ -34,6 +34,9 @@ import org.apache.xerces.xs.XSTerm; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.ws.WSException; +import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; +import org.jboss.ws.metadata.wsdl.WSDLUtils; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; /** * A helper class to unwrap a return type is possible. @@ -44,16 +47,18 @@ public class ReturnTypeUnwrapper { - public XSTypeDefinition xt; + public WSDLInterfaceOperationOutput[] outputs; + public JBossXSModel xsmodel; public QName xmlType; public XSAttributeDeclaration unwrappedAttribute; public XSElementDeclaration unwrappedElement; public boolean array = false; private boolean wrapped; - public ReturnTypeUnwrapper(XSTypeDefinition xt, boolean wrapped) + public ReturnTypeUnwrapper(WSDLInterfaceOperationOutput[] outputs, JBossXSModel xsmodel, boolean wrapped) { - this.xt = xt; + this.outputs = outputs; + this.xsmodel = xsmodel; this.wrapped = wrapped; } @@ -62,6 +67,14 @@ if (wrapped == false) return false; + if (outputs.length > 1) + throw new WSException("Can not unwrap parameters for operation with mutliple outputs. outputs=" + outputs.length); + + WSDLInterfaceOperationOutput out = outputs[0]; + QName xmlType = out.getXMLType(); + + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + if (xt instanceof XSComplexTypeDefinition == false) throw new WSException("Tried to unwrap a non-complex type."); @@ -108,7 +121,7 @@ XSTypeDefinition type = unwrappedElement.getTypeDefinition(); if (type.getAnonymous() == false) xmlType = new QName(unwrappedElement.getTypeDefinition().getNamespace(), unwrappedElement.getTypeDefinition().getName()); - + this.array = array; } Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-22 01:54:35 UTC (rev 1717) @@ -817,6 +817,31 @@ generateScenario("AF"); } + /** + * Test scenario where unwrapping should not occur as the element for the request + * message does not match the name of the operation. + * + * <operation name='lookup'> + * <input message='tns:PhoneBook_lookup'/> + * <output message='tns:PhoneBook_lookupResponse'/> + * </operation> + * + * <message name='PhoneBook_lookup'> + * <part element='ns1:lookupPerson' name='parameters'/> + * </message> + */ + public void testScenario_AG() throws Exception + { + try + { + generateScenario("AG"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + protected void generateScenario(final String scenario) throws Exception { String tests = System.getProperty("client.scenario"); Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java 2006-12-22 01:54:35 UTC (rev 1717) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class Person { + protected java.lang.String surname; + + public Person() { + } + + public Person(java.lang.String surname) { + this.surname = surname; + } + + public java.lang.String getSurname() { + return surname; + } + + public void setSurname(java.lang.String surname) { + this.surname = surname; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java 2006-12-22 01:54:35 UTC (rev 1717) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java 2006-12-22 01:54:35 UTC (rev 1717) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class TelephoneNumber { + protected java.lang.String number; + + public TelephoneNumber() { + } + + public TelephoneNumber(java.lang.String number) { + this.number = number; + } + + public java.lang.String getNumber() { + return number; + } + + public void setNumber(java.lang.String number) { + this.number = number; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl 2006-12-22 01:54:35 UTC (rev 1717) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookupPerson' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookupPerson' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml 2006-12-22 01:54:35 UTC (rev 1717) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN... + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml 2006-12-22 00:07:33 UTC (rev 1716) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml 2006-12-22 01:54:35 UTC (rev 1717) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_AG/Wrapped.wsdl" parameter-style="wrapped"> + <mapping file="wrapped-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF