Fix missing namespace declaration on array if the namespace is alread…

…y declared with another prefix. (#923)
vpulim · Mar 15, 2017 · 3a1c6e9 · 3a1c6e9
1 parent bc6992a
commit 3a1c6e9
Show file tree

Hide file tree

Showing 11 changed files with 205 additions and 4 deletions.
diff --git a/lib/wsdl.js b/lib/wsdl.js
@@ -1817,10 +1817,13 @@ WSDL.prototype.objectToXML = function(obj, name, nsPrefix, nsURI, isFirst, xmlns
                   current: childNsPrefix,
                   parent: ns
                 };
+              } else {
+                //parent (array) already got the namespace
+                childXmlnsAttrib = null;
               }
 
               value = self.objectToXML(child, name, childNsPrefix, childNsURI,
-                false, null, resolvedChildSchemaObject, nsContext);
+                false, childXmlnsAttrib, resolvedChildSchemaObject, nsContext);
             } else if (obj[self.options.attributesKey] && obj[self.options.attributesKey].xsi_type) {
               //if parent object has complex type defined and child not found in parent
               var completeChildParamTypeObject = self.findChildSchemaObject(

diff --git a/...est-response-samples/UpdateProfile__correct_namespaces_for_elements_with_base/request.xml b/...est-response-samples/UpdateProfile__correct_namespaces_for_elements_with_base/request.xml
@@ -1 +1 @@
-<?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.bigdatacollect.or" xmlns:c="http://www.bigdatacollect.or/Common/Types" xmlns:n="http://www.bigdatacollect.or/Name/Types"><soap:Body><n:UpdateProfileRequest xmlns:n="http://www.bigdatacollect.or/Name/Types" xmlns="http://www.bigdatacollect.or/Name/Types"><n:Profile><n:IDs><c:UniqueID source="TESTSOURCE">100</c:UniqueID></n:IDs><n:Addresses><n:NameAddress><c:AddressLine xmlns:c="http://www.bigdatacollect.or/Common/Types">Another Address</c:AddressLine></n:NameAddress><n:NameAddress><c:AddressLine xmlns:c="http://www.bigdatacollect.or/Common/Types">My Address</c:AddressLine></n:NameAddress></n:Addresses><n:Phones><n:NamePhone primary="true"><c:PhoneData xmlns:c="http://www.bigdatacollect.or/Common/Types"><c:PhoneNumber>123</c:PhoneNumber></c:PhoneData></n:NamePhone><n:NamePhone primary="false"><c:PhoneData xmlns:c="http://www.bigdatacollect.or/Common/Types"><c:PhoneNumber>456</c:PhoneNumber></c:PhoneData></n:NamePhone></n:Phones></n:Profile></n:UpdateProfileRequest></soap:Body></soap:Envelope>
+<?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.bigdatacollect.or" xmlns:c="http://www.bigdatacollect.or/Common/Types" xmlns:n="http://www.bigdatacollect.or/Name/Types"><soap:Body><n:UpdateProfileRequest xmlns:n="http://www.bigdatacollect.or/Name/Types" xmlns="http://www.bigdatacollect.or/Name/Types"><n:Profile><n:IDs><c:UniqueID source="TESTSOURCE" xmlns:c="http://www.bigdatacollect.or/Common/Types">100</c:UniqueID></n:IDs><n:Addresses><n:NameAddress><c:AddressLine xmlns:c="http://www.bigdatacollect.or/Common/Types">Another Address</c:AddressLine></n:NameAddress><n:NameAddress><c:AddressLine xmlns:c="http://www.bigdatacollect.or/Common/Types">My Address</c:AddressLine></n:NameAddress></n:Addresses><n:Phones><n:NamePhone primary="true"><c:PhoneData xmlns:c="http://www.bigdatacollect.or/Common/Types"><c:PhoneNumber>123</c:PhoneNumber></c:PhoneData></n:NamePhone><n:NamePhone primary="false"><c:PhoneData xmlns:c="http://www.bigdatacollect.or/Common/Types"><c:PhoneNumber>456</c:PhoneNumber></c:PhoneData></n:NamePhone></n:Phones></n:Profile></n:UpdateProfileRequest></soap:Body></soap:Envelope>
diff --git a/...t-response-samples/UpdateProfile__correct_namespaces_in_sequence_with_imports/request.xml b/...t-response-samples/UpdateProfile__correct_namespaces_in_sequence_with_imports/request.xml
@@ -1 +1 @@
-<?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.bigdatacollect.or" xmlns:c="http://www.bigdatacollect.or/Common/Types" xmlns:n="http://www.bigdatacollect.or/Name/Types"><soap:Body><n:UpdateProfileRequest xmlns:n="http://www.bigdatacollect.or/Name/Types" xmlns="http://www.bigdatacollect.or/Name/Types"><n:Profile><n:IDs><c:UniqueID source="TESTSOURCE">100</c:UniqueID></n:IDs><n:Phones><n:NamePhone primary="true"><n:IDs><c:UniqueID source="TEST">1</c:UniqueID></n:IDs></n:NamePhone><n:NamePhone primary="false"><n:IDs><c:UniqueID source="TEST">2</c:UniqueID></n:IDs></n:NamePhone></n:Phones></n:Profile></n:UpdateProfileRequest></soap:Body></soap:Envelope>
+<?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.bigdatacollect.or" xmlns:c="http://www.bigdatacollect.or/Common/Types" xmlns:n="http://www.bigdatacollect.or/Name/Types"><soap:Body><n:UpdateProfileRequest xmlns:n="http://www.bigdatacollect.or/Name/Types" xmlns="http://www.bigdatacollect.or/Name/Types"><n:Profile><n:IDs><c:UniqueID source="TESTSOURCE" xmlns:c="http://www.bigdatacollect.or/Common/Types">100</c:UniqueID></n:IDs><n:Phones><n:NamePhone primary="true"><n:IDs><c:UniqueID source="TEST" xmlns:c="http://www.bigdatacollect.or/Common/Types">1</c:UniqueID></n:IDs></n:NamePhone><n:NamePhone primary="false"><n:IDs><c:UniqueID source="TEST" xmlns:c="http://www.bigdatacollect.or/Common/Types">2</c:UniqueID></n:IDs></n:NamePhone></n:Phones></n:Profile></n:UpdateProfileRequest></soap:Body></soap:Envelope>
diff --git a/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/Common.xsd b/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/Common.xsd
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:tns="http://www.bigdatacollect.or/Common/Types" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.bigdatacollect.or/Common/Types" elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+    <xs:complexType name="Phone">
+        <xs:sequence>
+            <xs:element name="PhoneData">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="PhoneNumber" type="xs:string"/>
+                        <xs:element name="Comment" type="xs:string" minOccurs="0"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="phoneType" type="xs:string"/>
+        <xs:attribute name="phoneRole" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="ResultStatus">
+        <xs:sequence>
+            <xs:element name="IDs" type="tns:UniqueIDList" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="resultStatusFlag" type="tns:ResultStatusFlag"/>
+    </xs:complexType>
+    <xs:complexType name="UniqueID">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="source" type="xs:string"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="UniqueIDList">
+        <xs:sequence>
+            <xs:element name="UniqueID" type="tns:UniqueID" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="ResultStatusFlag">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="FAIL"/>
+            <xs:enumeration value="SUCCESS"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/Name.xsd b/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/Name.xsd
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:common="http://www.bigdatacollect.or/Common/Types" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://www.bigdatacollect.or/Name/Types"
+           targetNamespace="http://www.bigdatacollect.or/Name/Types" elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+    <xs:import namespace="http://www.bigdatacollect.or/Common/Types" schemaLocation="Common.xsd"/>
+    <xs:element name="Profile"/>
+    <xs:complexType name="NamePhone">
+        <xs:complexContent>
+            <xs:extension base="common:Phone">
+                <xs:sequence>
+                    <xs:element name="IDs" type="common:UniqueIDList" minOccurs="0"/>
+                </xs:sequence>
+                <xs:attribute name="primary" type="xs:boolean"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="NamePhoneList">
+        <xs:annotation>
+            <xs:documentation>Collection of NamePhone</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="NamePhone" type="tns:NamePhone" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="Profile">
+        <xs:sequence>
+            <xs:element name="IDs" type="common:UniqueIDList" minOccurs="0"/>
+            <xs:element name="Phones" type="tns:NamePhoneList" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:element name="UpdateProfileRequest">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="Profile" type="tns:Profile"/>
+                <xs:element name="ResortId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="UpdateProfileResponse">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="Result" type="common:ResultStatus"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/request.json b/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/request.json
@@ -0,0 +1,48 @@
+{
+  "Profile": {
+    "IDs": {
+      "UniqueID": [
+        {
+          "attributes": {
+            "source": "TESTSOURCE"
+          },
+          "$value": 100
+        }
+      ]
+    },
+    "Phones": {
+      "NamePhone": [
+        {
+          "attributes": {
+            "primary": true
+          },
+          "IDs": {
+            "UniqueID": [
+              {
+                "attributes": {
+                  "source": "TEST"
+                },
+                "$value": 1
+              }
+            ]
+          }
+        },
+        {
+          "attributes": {
+            "primary": false
+          },
+          "IDs": {
+            "UniqueID": [
+              {
+                "attributes": {
+                  "source": "TEST"
+                },
+                "$value": 2
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/request.xml b/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/request.xml
@@ -0,0 +1 @@
+<?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.bigdatacollect.or" xmlns:c="http://www.bigdatacollect.or/Common/Types" xmlns:n="http://www.bigdatacollect.or/Name/Types"><soap:Body><n:UpdateProfileRequest xmlns:n="http://www.bigdatacollect.or/Name/Types" xmlns="http://www.bigdatacollect.or/Name/Types"><n:Profile><n:IDs><common:UniqueID source="TESTSOURCE" xmlns:common="http://www.bigdatacollect.or/Common/Types">100</common:UniqueID></n:IDs><n:Phones><n:NamePhone primary="true"><n:IDs><common:UniqueID source="TEST" xmlns:common="http://www.bigdatacollect.or/Common/Types">1</common:UniqueID></n:IDs></n:NamePhone><n:NamePhone primary="false"><n:IDs><common:UniqueID source="TEST" xmlns:common="http://www.bigdatacollect.or/Common/Types">2</common:UniqueID></n:IDs></n:NamePhone></n:Phones></n:Profile></n:UpdateProfileRequest></soap:Body></soap:Envelope>
diff --git a/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/response.json b/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/response.json
@@ -0,0 +1,15 @@
+{
+  "Result":{
+    "attributes": {
+      "resultStatusFlag": "SUCCESS"
+    },
+    "IDs": {
+      "UniqueID": {
+        "attributes": {
+          "source": "TESTSOURCE"
+        },
+        "$value": "100"
+      }
+    }
+  }
+}
diff --git a/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/response.xml b/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/response.xml
@@ -0,0 +1 @@
+<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/"><S:Body><ns3:UpdateProfileResponse xmlns:ns3="http://www.bigdatacollect.or/Name/Types" xmlns="http://www.bigdatacollect.or/Common/Types"><ns3:Result resultStatusFlag="SUCCESS"><IDs><UniqueID source="TESTSOURCE">100</UniqueID></IDs></ns3:Result></ns3:UpdateProfileResponse></S:Body></S:Envelope>
diff --git a/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/soap.wsdl b/test/request-response-samples/UpdateProfile__correct_namespaces_other_prefixes/soap.wsdl
@@ -0,0 +1,43 @@
+<?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.bigdatacollect.or"
+                  xmlns:c="http://www.bigdatacollect.or/Common/Types"
+                  xmlns:n="http://www.bigdatacollect.or/Name/Types"
+                  xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/"
+                  targetNamespace="http://www.bigdatacollect.or">
+    <wsdl:types>
+        <xs:schema>
+            <xs:import namespace="http://www.bigdatacollect.or/Common/Types" schemaLocation="Common.xsd"/>
+            <xs:import namespace="http://www.bigdatacollect.or/Name/Types" schemaLocation="Name.xsd"/>
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="UpdateProfileRequest">
+        <wsdl:part name="UpdateProfileRequest" element="n:UpdateProfileRequest"/>
+    </wsdl:message>
+    <wsdl:message name="UpdateProfileResponse">
+        <wsdl:part name="UpdateProfileResponse" element="n:UpdateProfileResponse"/>
+    </wsdl:message>
+    <wsdl:portType name="NamePortType">
+        <wsdl:operation name="UpdateProfile">
+            <wsdl:input message="tns:UpdateProfileRequest"/>
+            <wsdl:output message="tns:UpdateProfileResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="NameBinding" type="tns:NamePortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="UpdateProfile">
+            <soap:operation soapAction="http://www.bigdatacollect.or#UpdateProfile" 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="BigDataCollectorService">
+        <wsdl:port name="NamePortType" binding="tns:NameBinding">
+            <soap:address location="http://www.bigdatacollect.or/"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/test/request-response-samples/UpdateProfile__correct_ns_context/request.xml b/test/request-response-samples/UpdateProfile__correct_ns_context/request.xml
@@ -1 +1 @@
-<?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.bigdatacollect.or" xmlns:c="http://www.bigdatacollect.or/Common/Types" xmlns:n="http://www.bigdatacollect.or/Name/Types"><soap:Body><n:UpdateProfileRequest xmlns:n="http://www.bigdatacollect.or/Name/Types" xmlns="http://www.bigdatacollect.or/Name/Types"><n:Profile><n:IDs><c:UniqueID source="TESTSOURCE">100</c:UniqueID><c:UniqueID source="TESTSOURCE2">100</c:UniqueID><c:UniqueID source="TESTSOURCE3">100</c:UniqueID></n:IDs><n:Addresses><n:NameAddress><c:AddressLine xmlns:c="http://www.bigdatacollect.or/Common/Types">Another Address</c:AddressLine></n:NameAddress><n:NameAddress><c:AddressLine xmlns:c="http://www.bigdatacollect.or/Common/Types">My Address</c:AddressLine></n:NameAddress></n:Addresses><n:Phones><n:NamePhone primary="true"><c:PhoneData xmlns:c="http://www.bigdatacollect.or/Common/Types"><c:PhoneNumber>123</c:PhoneNumber></c:PhoneData></n:NamePhone><n:NamePhone primary="false"><c:PhoneData xmlns:c="http://www.bigdatacollect.or/Common/Types"><c:PhoneNumber>456</c:PhoneNumber></c:PhoneData></n:NamePhone></n:Phones></n:Profile></n:UpdateProfileRequest></soap:Body></soap:Envelope>
+<?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.bigdatacollect.or" xmlns:c="http://www.bigdatacollect.or/Common/Types" xmlns:n="http://www.bigdatacollect.or/Name/Types"><soap:Body><n:UpdateProfileRequest xmlns:n="http://www.bigdatacollect.or/Name/Types" xmlns="http://www.bigdatacollect.or/Name/Types"><n:Profile><n:IDs><c:UniqueID source="TESTSOURCE" xmlns:c="http://www.bigdatacollect.or/Common/Types">100</c:UniqueID><c:UniqueID source="TESTSOURCE2" xmlns:c="http://www.bigdatacollect.or/Common/Types">100</c:UniqueID><c:UniqueID source="TESTSOURCE3" xmlns:c="http://www.bigdatacollect.or/Common/Types">100</c:UniqueID></n:IDs><n:Addresses><n:NameAddress><c:AddressLine xmlns:c="http://www.bigdatacollect.or/Common/Types">Another Address</c:AddressLine></n:NameAddress><n:NameAddress><c:AddressLine xmlns:c="http://www.bigdatacollect.or/Common/Types">My Address</c:AddressLine></n:NameAddress></n:Addresses><n:Phones><n:NamePhone primary="true"><c:PhoneData xmlns:c="http://www.bigdatacollect.or/Common/Types"><c:PhoneNumber>123</c:PhoneNumber></c:PhoneData></n:NamePhone><n:NamePhone primary="false"><c:PhoneData xmlns:c="http://www.bigdatacollect.or/Common/Types"><c:PhoneNumber>456</c:PhoneNumber></c:PhoneData></n:NamePhone></n:Phones></n:Profile></n:UpdateProfileRequest></soap:Body></soap:Envelope>