Xml util should only deal in maps

Signed-off-by: sezen.leblay <[email protected]>

Author: sezen-datadog

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/XmlDomUtils.java

@@ -56,14 +56,7 @@ public static Object convertDocument(Document document, int maxRecursion) {
       return null;
     }
 
-    Element documentElement = document.getDocumentElement();
-    if (documentElement == null) {
-      return null;
-    }
-
-    Object converted = convertW3cNode(documentElement, maxRecursion);
-    // Wrap in a list for consistency with other XML processing patterns
-    return converted != null ? Collections.singletonList(converted) : null;
+    return convertW3cNode(document.getDocumentElement(), maxRecursion);
   }
 
   /**
@@ -89,9 +82,7 @@ public static Object convertElement(Element element, int maxRecursion) {
       return null;
     }
 
-    Object converted = convertW3cNode(element, maxRecursion);
-    // Wrap in a list for consistency with other XML processing patterns
-    return converted != null ? Collections.singletonList(converted) : null;
+    return convertW3cNode(element, maxRecursion);
   }
 
   /**
@@ -270,8 +261,8 @@ public static Object processXmlForWaf(Object xmlObj, int maxRecursion) {
     }
 
     if (xmlObj instanceof Node) {
-      Object converted = convertW3cNode((Node) xmlObj, maxRecursion);
-      return converted != null ? Collections.singletonList(converted) : null;
+      // Return the converted node directly
+      return convertW3cNode((Node) xmlObj, maxRecursion);
     }
 
     // Handle XML strings by parsing them first

dd-java-agent/agent-bootstrap/src/test/java/datadog/trace/bootstrap/instrumentation/XmlDomUtilsTest.java

@@ -161,12 +161,11 @@ void testConvertDocument() throws Exception {
     Object result = XmlDomUtils.convertDocument(doc, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
 
     @SuppressWarnings("unchecked")
-    List<Object> resultList = (List<Object>) result;
-    assertEquals(1, resultList.size());
-    assertTrue(resultList.get(0) instanceof Map);
+    Map<String, Object> resultMap = (Map<String, Object>) result;
+    assertTrue(resultMap.containsKey("children"));
   }
 
   @Test
@@ -184,12 +183,11 @@ void testConvertElement() throws Exception {
     Object result = XmlDomUtils.convertElement(element, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
 
     @SuppressWarnings("unchecked")
-    List<Object> resultList = (List<Object>) result;
-    assertEquals(1, resultList.size());
-    assertTrue(resultList.get(0) instanceof Map);
+    Map<String, Object> resultMap = (Map<String, Object>) result;
+    assertTrue(resultMap.containsKey("children"));
   }
 
   @Test
@@ -206,7 +204,7 @@ void testProcessXmlForWaf_withDocument() throws Exception {
     Object result = XmlDomUtils.processXmlForWaf(doc, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
   }
 
   @Test
@@ -218,7 +216,7 @@ void testProcessXmlForWaf_withElement() throws Exception {
     Object result = XmlDomUtils.processXmlForWaf(element, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
   }
 
   @Test
@@ -228,12 +226,11 @@ void testProcessXmlForWaf_withXmlString() {
     Object result = XmlDomUtils.processXmlForWaf(xmlContent, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
 
     @SuppressWarnings("unchecked")
-    List<Object> resultList = (List<Object>) result;
-    assertEquals(1, resultList.size());
-    assertTrue(resultList.get(0) instanceof Map);
+    Map<String, Object> resultMap = (Map<String, Object>) result;
+    assertTrue(resultMap.containsKey("children"));
   }
 
   @Test
@@ -258,12 +255,11 @@ void testParseXmlStringToWafFormat_validXml() throws Exception {
     Object result = XmlDomUtils.parseXmlStringToWafFormat(xmlContent, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
 
     @SuppressWarnings("unchecked")
-    List<Object> resultList = (List<Object>) result;
-    assertEquals(1, resultList.size());
-    assertTrue(resultList.get(0) instanceof Map);
+    Map<String, Object> resultMap = (Map<String, Object>) result;
+    assertTrue(resultMap.containsKey("children"));
 
     @SuppressWarnings("unchecked")
     Map<String, Object> rootMap = (Map<String, Object>) resultList.get(0);
@@ -301,7 +297,7 @@ void testHandleXmlString_validXml() {
     Object result = XmlDomUtils.handleXmlString(xmlContent, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
   }
 
   @Test
@@ -332,7 +328,7 @@ void testXmlWithNamespaces() throws Exception {
     Object result = XmlDomUtils.processXmlForWaf(xmlContent, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
   }
 
   @Test
@@ -342,7 +338,7 @@ void testXmlWithCDATA() throws Exception {
     Object result = XmlDomUtils.processXmlForWaf(xmlContent, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
   }
 
   @Test
@@ -371,12 +367,11 @@ void testComplexXmlStructure() throws Exception {
     Object result = XmlDomUtils.processXmlForWaf(xmlContent, MAX_RECURSION);
 
     assertNotNull(result);
-    assertTrue(result instanceof List);
+    assertTrue(result instanceof Map);
 
     @SuppressWarnings("unchecked")
-    List<Object> resultList = (List<Object>) result;
-    assertEquals(1, resultList.size());
-    assertTrue(resultList.get(0) instanceof Map);
+    Map<String, Object> resultMap = (Map<String, Object>) result;
+    assertTrue(resultMap.containsKey("children"));
 
     @SuppressWarnings("unchecked")
     Map<String, Object> rootMap = (Map<String, Object>) resultList.get(0);