From 137d56d16021cfe58facf30697ee54a1c0461e0f Mon Sep 17 00:00:00 2001
From: Maxime Morand <mmorand.ext@orange.com>
Date: Thu, 28 Jan 2021 18:24:06 +0100
Subject: [PATCH] Add native support for short deserialization

---
 src/wsdl/index.ts                             |  2 +-
 .../common.xsd                                | 28 +++++++++++++
 .../name.xsd                                  | 25 +++++++++++
 .../request.json                              |  3 ++
 .../request.xml                               |  8 ++++
 .../response.json                             |  9 ++++
 .../response.xml                              | 14 +++++++
 .../soap.wsdl                                 | 42 +++++++++++++++++++
 8 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 test/request-response-samples/Dummy__should_deserialize_basic_types/common.xsd
 create mode 100644 test/request-response-samples/Dummy__should_deserialize_basic_types/name.xsd
 create mode 100644 test/request-response-samples/Dummy__should_deserialize_basic_types/request.json
 create mode 100644 test/request-response-samples/Dummy__should_deserialize_basic_types/request.xml
 create mode 100644 test/request-response-samples/Dummy__should_deserialize_basic_types/response.json
 create mode 100644 test/request-response-samples/Dummy__should_deserialize_basic_types/response.xml
 create mode 100644 test/request-response-samples/Dummy__should_deserialize_basic_types/soap.wsdl

diff --git a/src/wsdl/index.ts b/src/wsdl/index.ts
index 3ece11b29..0cc4a993f 100644
--- a/src/wsdl/index.ts
+++ b/src/wsdl/index.ts
@@ -436,7 +436,7 @@ export class WSDL {
       if (this.options && this.options.customDeserializer && this.options.customDeserializer[name]) {
         value = this.options.customDeserializer[name](text, top);
       } else {
-        if (name === 'int' || name === 'integer') {
+        if (name === 'int' || name === 'integer' || name === 'short') {
           value = parseInt(text, 10);
         } else if (name === 'double' || name === 'float' || name === 'decimal') {
           value = Number(text);
diff --git a/test/request-response-samples/Dummy__should_deserialize_basic_types/common.xsd b/test/request-response-samples/Dummy__should_deserialize_basic_types/common.xsd
new file mode 100644
index 000000000..e04c0710b
--- /dev/null
+++ b/test/request-response-samples/Dummy__should_deserialize_basic_types/common.xsd
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:tns="http://www.Dummy.com/Common/Types" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.Dummy.com/Common/Types" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:complexType name="DummyResult">
+		<xs:sequence>
+			<xs:element name="DummyList" type="tns:DummyList" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="code" type="xs:string" use="optional"/>
+	</xs:complexType>
+	<xs:complexType name="Dummy">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="language" type="xs:language" use="optional"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:complexType name="DummyList">
+		<xs:sequence>
+			<xs:element name="DummyElement" type="tns:Dummy" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+    <xs:complexType name="DummyFilter">
+        <xs:sequence>
+            <xs:element name="DummyIntFilter" type="xs:string" minOccurs="0"/>
+            <xs:element name="DummyStringFilter" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
+
diff --git a/test/request-response-samples/Dummy__should_deserialize_basic_types/name.xsd b/test/request-response-samples/Dummy__should_deserialize_basic_types/name.xsd
new file mode 100644
index 000000000..bdc6168c2
--- /dev/null
+++ b/test/request-response-samples/Dummy__should_deserialize_basic_types/name.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.Dummy.com/Name/Types" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="DummyRequest">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="DummyField1" type="xs:string" minOccurs="0"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="DummyResponse">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="boolean" nillable="true" type="xs:boolean"/>
+				<xs:element name="byte" nillable="true" type="xs:byte"/>
+				<xs:element name="dateTime" nillable="true" type="xs:dateTime"/>
+				<xs:element name="decimal" nillable="true" type="xs:decimal"/>
+				<xs:element name="double" nillable="true" type="xs:double"/>
+				<xs:element name="float" nillable="true" type="xs:float"/>
+				<xs:element name="int" nillable="true" type="xs:int"/>
+				<xs:element name="short" nillable="true" type="xs:short"/>
+				<xs:element name="string" nillable="true" type="xs:string"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/test/request-response-samples/Dummy__should_deserialize_basic_types/request.json b/test/request-response-samples/Dummy__should_deserialize_basic_types/request.json
new file mode 100644
index 000000000..62dec993f
--- /dev/null
+++ b/test/request-response-samples/Dummy__should_deserialize_basic_types/request.json
@@ -0,0 +1,3 @@
+{
+  "DummyField1": "foo & bar"
+}
\ No newline at end of file
diff --git a/test/request-response-samples/Dummy__should_deserialize_basic_types/request.xml b/test/request-response-samples/Dummy__should_deserialize_basic_types/request.xml
new file mode 100644
index 000000000..8f783b787
--- /dev/null
+++ b/test/request-response-samples/Dummy__should_deserialize_basic_types/request.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xmlns:tns="http://www.Dummy.com" xmlns:n="http://www.Dummy.com/Name/Types">
+  <soap:Body>
+    <n:DummyRequest xmlns:n="http://www.Dummy.com/Name/Types" xmlns="http://www.Dummy.com/Name/Types">
+      <n:DummyField1>foo &amp; bar</n:DummyField1>
+    </n:DummyRequest>
+  </soap:Body>
+</soap:Envelope>
diff --git a/test/request-response-samples/Dummy__should_deserialize_basic_types/response.json b/test/request-response-samples/Dummy__should_deserialize_basic_types/response.json
new file mode 100644
index 000000000..45df4ced1
--- /dev/null
+++ b/test/request-response-samples/Dummy__should_deserialize_basic_types/response.json
@@ -0,0 +1,9 @@
+{
+  "boolean": true,
+  "decimal": 1.1,
+  "double": 1.21,
+  "float": 1.321,
+  "int": 1,
+  "short": 3,
+  "string": "foo"
+}
\ No newline at end of file
diff --git a/test/request-response-samples/Dummy__should_deserialize_basic_types/response.xml b/test/request-response-samples/Dummy__should_deserialize_basic_types/response.xml
new file mode 100644
index 000000000..ec0ca898f
--- /dev/null
+++ b/test/request-response-samples/Dummy__should_deserialize_basic_types/response.xml
@@ -0,0 +1,14 @@
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tns="http://www.Dummy.com" xmlns:n="http://www.Dummy.com/Name/Types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <soap:Header></soap:Header>
+    <soap:Body>
+       <n:DummyResponse>
+			<n:boolean>true</n:boolean>
+			<n:decimal>1.1</n:decimal>
+			<n:double>1.21</n:double>
+			<n:float>1.321</n:float>
+			<n:int>1</n:int>
+			<n:short>3</n:short>
+			<n:string>foo</n:string>
+       </n:DummyResponse>
+    </soap:Body>
+</soap:Envelope>
diff --git a/test/request-response-samples/Dummy__should_deserialize_basic_types/soap.wsdl b/test/request-response-samples/Dummy__should_deserialize_basic_types/soap.wsdl
new file mode 100644
index 000000000..814ba1bf5
--- /dev/null
+++ b/test/request-response-samples/Dummy__should_deserialize_basic_types/soap.wsdl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+xmlns:tns="http://www.Dummy.com"  xmlns:n="http://www.Dummy.com/Name/Types"  xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/" targetNamespace="http://www.Dummy.com">
+	<wsdl:types>
+		<xs:schema>
+			<xs:import namespace="http://www.Dummy.com/Common/Types" schemaLocation="common.xsd"/>
+			<xs:import namespace="http://www.Dummy.com/Name/Types" schemaLocation="name.xsd"/>
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="DummyRequest">
+		<wsdl:part name="DummyRequest" element="n:DummyRequest"/>
+	</wsdl:message>
+	<wsdl:message name="DummyResponse">
+		<wsdl:part name="DummyResponse" element="n:DummyResponse"/>
+	</wsdl:message>
+	<wsdl:portType name="DummyPortType">
+		<wsdl:operation name="Dummy">
+			<wsdl:input message="tns:DummyRequest"/>
+			<wsdl:output message="tns:DummyResponse"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="DummyBinding" type="tns:DummyPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="Dummy">
+			<soap:operation soapAction="http://www.Dummy.com#Dummy" style="document"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="DummyService">
+		<wsdl:port name="DummyPortType" binding="tns:DummyBinding">
+			<soap:address location="http://www.Dummy.com/"/>
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>
+