Fix empty attributes adding issue for namespaces

ballerina-platform · Feb 19, 2025 · ca6722c · ca6722c
1 parent 1f65499
commit ca6722c
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 2 deletions.
diff --git a/ballerina/tests/fromXml_test.bal b/ballerina/tests/fromXml_test.bal
@@ -3692,3 +3692,84 @@ function testXmlToRecordWithInvalidExpectedTypeForAttributes() {
     test:assertTrue(rec8 is Error);
     test:assertEquals((<error>rec8).message(), "unsupported input type");
 }
+
+xml xmlValueWithXmlnsNamespace = xml `
+    <A xmlns="http://abc.com">
+        <B>address 1</B>
+        <B>address 2</B>
+        <B>address 3</B>
+    </A>
+`;
+
+xml xmlValueWithXmlnsNamespace2 = xml `
+    <A xmlns="http://abc.com">
+        <B xmlns="http://def.com">
+            <C>address 1</C>
+            <C>address 2</C>
+            <C>address 3</C>
+        </B>
+        <B xmlns="http://def.com">
+            <C>address 1</C>
+            <C>address 2</C>
+            <C>address 3</C>
+        </B>
+    </A>
+`;
+
+xml xmlValueWithXmlnsNamespace3 = xml `
+    <A xmlns="http://abc.com">
+        <B xmlns="http://def.com">
+            <C>address 1</C>
+            <C>address 2</C>
+            <C>address 3</C>
+        </B>
+        <B id="1" xmlns="http://def.com">
+            <C id="1">address 1</C>
+            <C>address 3</C>
+            <C id="2" xmlns="http://def.com">address 3</C>
+            <C xmlns:a="http://def.com">address 3</C>
+            <C id="3" xmlns:a="http://def.com">address 3</C>
+            <C id="1" xmlns="http://def.com">address 1</C>
+        </B>
+    </A>
+`;
+
+xml xmlValueWithXmlnsNamespace4 = xml `
+    <A xmlns="http://abc.com">
+        <B id="2" xmlns="http://def.com">address 1</B>
+        <B>address 2</B>
+        <B xmlns="http://def.com">address 2</B>
+        <B xmlns:a="http://def.com">address 2</B>
+        <B id="3">address 3</B>
+    </A>
+`;
+
+@test:Config {
+    groups: ["fromXml"]
+}
+function testXmlArraysWithNamespaces() {
+    record {|json...;|}|Error result;
+
+    result = parseAsType(xmlValueWithXmlnsNamespace);
+    test:assertEquals(result, {B: ["address 1", "address 2", "address 3"]});
+
+    result = parseAsType(xmlValueWithXmlnsNamespace2);
+    test:assertEquals(result, {B: [{C: ["address 1", "address 2", "address 3"]}, {C: ["address 1", "address 2", "address 3"]}]});
+
+    result = parseAsType(xmlValueWithXmlnsNamespace3);
+    test:assertEquals(result, {B: [
+            {C: ["address 1", "address 2", "address 3"]},
+            {id: 1, C: [
+                {id: 1,"#content": "address 1"},
+                "address 3",
+                {"id":2, "#content":"address 3"},
+                "address 3",
+                {id: 3, "#content": "address 3"},
+                {"id": 1, "#content": "address 1"}
+            ]
+        }]
+    });
+
+    result = parseAsType(xmlValueWithXmlnsNamespace4);
+    test:assertEquals(result, {B: [{id: 2, "#content": "address 1"}, "address 2", "address 2", "address 2", {id: 3, "#content": "address 3"}]});
+}
diff --git a/native/src/main/java/io/ballerina/lib/data/xmldata/xml/XmlTraversal.java b/native/src/main/java/io/ballerina/lib/data/xmldata/xml/XmlTraversal.java
@@ -607,9 +607,9 @@ private void handleArrayValueForRestType(BXmlItem xmlItem, String elemName, Type
                     BMap<BString, Object> nextValue =
                             ValueCreator.createMapValue(DataUtils.getMapTypeFromConstraintType(restType));
                     handleAttributesRest(xmlItem, nextValue, restType, useSemanticEquality);
-                    arrayValue.append(nextValue);
 
                     if (!nextValue.isEmpty()) {
+                        arrayValue.append(nextValue);
                         analyzerData.currentField =
                                 TypeCreator.createField(restType, analyzerData.textFieldName, SymbolFlags.REQUIRED);
                         analyzerData.nodesStack.push(analyzerData.currentNode);
@@ -666,9 +666,9 @@ private void convertContentToRestType(BXmlItem xmlItem, BString bElementName, Ty
                 BMap<BString, Object> nextValue =
                         ValueCreator.createMapValue(DataUtils.getMapTypeFromConstraintType(restType));
                 handleAttributesRest(xmlItem, nextValue, restType, analyzerData.useSemanticEquality);
-                mapValue.put(bElementName, nextValue);
 
                 if (!nextValue.isEmpty()) {
+                    mapValue.put(bElementName, nextValue);
                     analyzerData.currentField =
                             TypeCreator.createField(restType, analyzerData.textFieldName, SymbolFlags.REQUIRED);
                     analyzerData.nodesStack.push(analyzerData.currentNode);