[bugfix] Fix an issue with naming of namespace names from the in-memory DOM

Author: adamretter

exist-core/src/main/java/org/exist/dom/memtree/AttrImpl.java

@@ -76,7 +76,7 @@ public NodeId getNodeId() {
 
     @Override
     public String getName() {
-        return getQName().getStringValue();
+        return getNodeName();
     }
 
     @Override

exist-core/src/main/java/org/exist/dom/memtree/NamespaceNode.java

@@ -90,7 +90,7 @@ public boolean getSpecified() {
 
     @Override
     public String getName() {
-        return getQName().getStringValue();
+        return getNodeName();
     }
 
     @Override

exist-core/src/main/java/org/exist/dom/memtree/NodeImpl.java

@@ -161,24 +161,57 @@ public final void setQName(final QName qname) {
 
     @Override
     public final String getNodeName() {
-        return switch (getNodeType()) {
-            case Node.DOCUMENT_NODE -> "#document";
-            case Node.DOCUMENT_FRAGMENT_NODE -> "#document-fragment";
-            case Node.ELEMENT_NODE, Node.ATTRIBUTE_NODE, NAMESPACE_NODE -> getQName().getStringValue();
-            case Node.PROCESSING_INSTRUCTION_NODE -> ((ProcessingInstructionImpl) this).getTarget();
-            case Node.TEXT_NODE -> "#text";
-            case Node.COMMENT_NODE -> "#comment";
-            case Node.CDATA_SECTION_NODE -> "#cdata-section";
-            default -> "#unknown";
-        };
+        switch(getNodeType()) {
+            case Node.DOCUMENT_NODE:
+                return "#document";
+
+            case Node.DOCUMENT_FRAGMENT_NODE:
+                return "#document-fragment";
+
+            case Node.ELEMENT_NODE:
+            case Node.ATTRIBUTE_NODE:
+                return getQName().getStringValue();
+
+            case NAMESPACE_NODE:
+                if (XMLConstants.XMLNS_ATTRIBUTE.equals(getQName().getPrefix()) && XMLConstants.DEFAULT_NS_PREFIX.equals(getQName().getLocalPart())) {
+                    return XMLConstants.XMLNS_ATTRIBUTE;
+                } else {
+                    return getQName().getStringValue();
+                }
+
+            case Node.PROCESSING_INSTRUCTION_NODE:
+                return ((ProcessingInstructionImpl)this).getTarget();
+
+            case Node.TEXT_NODE:
+                return "#text";
+
+            case Node.COMMENT_NODE:
+                return "#comment";
+
+            case Node.CDATA_SECTION_NODE:
+                return "#cdata-section";
+
+            default:
+                return "#unknown";
+        }
     }
 
     @Override
     public String getLocalName() {
-        return switch (getNodeType()) {
-            case Node.ELEMENT_NODE, Node.ATTRIBUTE_NODE, NAMESPACE_NODE -> getQName().getLocalPart();
-            default -> null;
-        };
+        switch(getNodeType()) {
+            case Node.ELEMENT_NODE:
+            case Node.ATTRIBUTE_NODE:
+                return getQName().getLocalPart();
+            case NAMESPACE_NODE:
+                if (XMLConstants.XMLNS_ATTRIBUTE.equals(getQName().getPrefix()) && XMLConstants.DEFAULT_NS_PREFIX.equals(getQName().getLocalPart())) {
+                    return null;
+                } else {
+                    return getQName().getLocalPart();
+                }
+
+            default:
+                return null;
+        }
     }
 
     @Override

exist-core/src/test/java/org/exist/dom/memtree/DocumentBuilderReceiverIntegrationTest.java

@@ -61,7 +61,7 @@ public static java.util.Collection<Object[]> data() {
                 {"merge-docs-ns-1", "<x>{parse-xml(\"<dummy xmlns=''/>\")}</x>", "<x><dummy/></x>"},
                 {"merge-docs-ns-2", "<x xmlns=''>{parse-xml(\"<dummy xmlns=''/>\")}</x>", "<x><dummy/></x>"},
                 {"merge-docs-ns-3", "<x xmlns='xyz'>{parse-xml(\"<dummy xmlns=''/>\")}</x>", "<x xmlns='xyz'><dummy xmlns=''/></x>"},
-                {"merge-docs-ns-3", "<x xmlns=''>{parse-xml(\"<dummy xmlns='xyz'/>\")}</x>", "<x><dummy xmlns='xyz'/></x>"}
+                {"merge-docs-ns-4", "<x xmlns=''>{parse-xml(\"<dummy xmlns='xyz'/>\")}</x>", "<x><dummy xmlns='xyz'/></x>"}
         });
     }