(daffodil-sbt) branch main updated: Support namespaces and whitespace in Daffodil config files

[slawrence]

This is an automated email from the ASF dual-hosted git repository.

slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-sbt.git


The following commit(s) were added to refs/heads/main by this push:
     new 64e2ad9  Support namespaces and whitespace in Daffodil config files
64e2ad9 is described below

commit 64e2ad9e484a7d08adb861d35c5c981b293b427a
Author: Steve Lawrence <slawre...@apache.org>
AuthorDate: Mon Jun 30 09:03:46 2025 -0400

    Support namespaces and whitespace in Daffodil config files
    
    Commit dfe5e05259 rewrote DaffodilSaver in java, but the switch from
    Scala XML to Java DOM was not done correctly. The Java logic is not
    namespace aware and does not properly ignore whitespace, so config files
    using namespace prefixes or have extra whitespace can lead to ignored
    tunables or thrown exceptions.
    
    To fix this, this changes the Java config parsing to be namespace-aware,
    specify the namespace when querying for the "tunables" element,
    ignore whitespace nodes, and trim tuanble values to strip
    leading/trailing whitespace.
    
    Fixes #109
---
 src/main/java/org/apache/daffodil/DaffodilSaver.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/daffodil/DaffodilSaver.java 
b/src/main/java/org/apache/daffodil/DaffodilSaver.java
index bfb0ee7..ccb9d51 100644
--- a/src/main/java/org/apache/daffodil/DaffodilSaver.java
+++ b/src/main/java/org/apache/daffodil/DaffodilSaver.java
@@ -121,15 +121,20 @@ public class DaffodilSaver {
     // compiler = compiler.withTunable(...)
     if (config != null) {
       DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+      factory.setNamespaceAware(true);
       DocumentBuilder builder = factory.newDocumentBuilder();
       Document document = builder.parse(config);
-      NodeList tunables = document.getElementsByTagName("tunables");
+      NodeList tunables = 
document.getElementsByTagNameNS("urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext",
 "tunables");
       for (int i = 0; i < tunables.getLength(); i++) {
         Node tunablesNode = tunables.item(i);
         NodeList children = tunablesNode.getChildNodes();
         for (int j = 0; j < children.getLength(); j++) {
           Node node = children.item(j);
-          compiler = compilerWithTunable.invoke(compiler, node.getNodeName(), 
node.getTextContent());
+          if (node.getNodeType() != Node.ELEMENT_NODE) {
+            // ignore text nodes
+            continue;
+          }
+          compiler = compilerWithTunable.invoke(compiler, node.getLocalName(), 
node.getTextContent().trim());
         }
       }
     }