Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Populate xsi:type attribute on toXML(...) #518

Merged
merged 2 commits into from Oct 29, 2019
Merged

Populate xsi:type attribute on toXML(...) #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14bdff8
Handling of typeAttribute for traits
Oct 29, 2019
b2cd674
Add test
Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/src/main/scala/scalaxb/compiler/xsd/GenSource.scala
View file
Open in desktop
Expand Up @@ -176,7 +176,7 @@ class GenSource(val schema: SchemaDecl,
cases.mkString(newline + indent(2 + compDepth))
}
{ if (!decl.abstractValue) "case x: " + defaultType + " => " +
buildToXML(defaultType, "x, __namespace, __elementLabel, __scope, false")
buildToXML(defaultType, "x, __namespace, __elementLabel, __scope, __typeAttribute")
else """case _ => sys.error("Unknown type: " + __obj)"""
}
}}
Expand Down
70 changes: 70 additions & 0 deletions integration/src/test/resources/traitsTypeAttribute.wsdl
View file
Open in desktop
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="Test"
targetNamespace="http://tempuri.org/"
xmlns:tns="http://tempuri.org/"
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" elementFormDefault="unqualified">
<xs:complexType name="ServiceRequest">
<xs:sequence>
<xs:element name="IP" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:element name="ServiceRequest" nillable="true" type="ServiceRequest"/>

<xs:complexType name="ServiceRequestResponse">
<xs:sequence>
<xs:element name="IP" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:element name="ServiceRequestResponse" nillable="true" type="ServiceRequestResponse"/>

<xs:complexType name="MyRequest">
<xs:complexContent mixed="false">
<xs:extension base="ServiceRequest">
<xs:sequence>
<xs:element name="ID" type="xs:int"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:element name="MyRequest" nillable="true" type="MyRequest"/>

<xs:complexType name="MySubRequest">
<xs:complexContent mixed="false">
<xs:extension base="MyRequest">
<xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:element name="MySubRequest" nillable="true" type="MySubRequest"/>
</xs:schema>
</wsdl:types>

<wsdl:message name="DynamicDataServiceRequestInputMessage">
<wsdl:part name="parameters" element="tns:ServiceRequest"/>
</wsdl:message>
<wsdl:message name="DynamicDataServiceRequestOutputMessage">
<wsdl:part name="parameters" element="tns:ServiceRequestResponse"/>
</wsdl:message>

<wsdl:message name="DynamicDataMyRequestInputMessage">
<wsdl:part name="parameters" element="tns:MyRequest"/>
</wsdl:message>
<wsdl:message name="DynamicDataMyRequestOutputMessage">
<wsdl:part name="parameters" element="tns:ServiceRequestResponse"/>
</wsdl:message>

<wsdl:portType name="IDynamicDataService">
<wsdl:operation name="ServiceRequest">
<wsdl:input wsaw:Action="http://tempuri.org/DynamicDataService/ServiceRequest" message="tns:DynamicDataServiceRequestInputMessage"/>
<wsdl:output wsaw:Action="http://tempuri.org/DynamicDataService/ServiceRequestResponse" message="tns:DynamicDataServiceRequestOutputMessage"/>
</wsdl:operation>
<wsdl:operation name="MyRequest">
<wsdl:input wsaw:Action="http://tempuri.org/DynamicDataService/MyRequest" message="tns:DynamicDataMyRequestInputMessage"/>
<wsdl:output wsaw:Action="http://tempuri.org/DynamicDataService/ServiceRequestResponse" message="tns:DynamicDataMyRequestOutputMessage"/>
</wsdl:operation>
</wsdl:portType>
</wsdl:definitions>
17 changes: 17 additions & 0 deletions integration/src/test/scala/TypeAttributeTest.scala
View file
Open in desktop
@@ -0,0 +1,17 @@
import java.io.File

class TypeAttributeTest extends TestBase {
val inFile = new File("integration/src/test/resources/traitsTypeAttribute.wsdl")
lazy val generated = module.process(inFile, "typeattribute", tmp)

"traitsTypeAttribute.scala must properly add type attribute" in {
(List("import scalaxb._",
"import typeattribute._",
"""val request: ServiceRequestable = MyRequest(IP = Some("127.0.0.1"), ID = 123)""",
"""toXML(request, "request", defaultScope).toString"""
),
generated) must evaluateTo(
"""<request xsi:type="MyRequest" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><IP>127.0.0.1</IP><ID>123</ID></request>""",
outdir = "./tmp")
}
}