8287076: Document.normalizeDocument() produces different results

Victor Rudometov · Paul Hohensee · commit 2ebb8997c07d · 2022-09-29T22:03:13.000Z
Reviewed-by: phh
Backport-of: 1f9521e6cb2f701f8712b4ec941ff1dbb45dad4e
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,7 +39,7 @@
  *
  * @xerces.internal
  *
- * @LastModified: Oct 2017
+ * @LastModified: June 2022
  */
 public class AttributeMap extends NamedNodeMapImpl {
 
@@ -117,7 +117,7 @@ public Node setNamedItem(Node arg)
         } else {
             i = -1 - i; // Insert point (may be end of list)
             if (null == nodes) {
-                nodes = new ArrayList<>(5);
+                nodes = new ArrayList<>();
             }
             nodes.add(i, arg);
         }
@@ -193,7 +193,7 @@ public Node setNamedItemNS(Node arg)
             } else {
                 i = -1 - i; // Insert point (may be end of list)
                 if (null == nodes) {
-                    nodes = new ArrayList<>(5);
+                    nodes = new ArrayList<>();
                 }
                 nodes.add(i, arg);
             }
@@ -591,7 +591,7 @@ protected final int addItem (Node arg) {
             else {
                 i = -1 - i; // Insert point (may be end of list)
                 if (null == nodes) {
-                    nodes = new ArrayList<>(5);
+                    nodes = new ArrayList<>();
                 }
                 nodes.add(i, arg);
             }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -89,7 +89,7 @@
  *
  * @author Elena Litani, IBM
  * @author Neeraj Bajaj, Sun Microsystems, inc.
- * @LastModified: Apr 2019
+ * @LastModified: June 2022
  */
 public class DOMNormalizer implements XMLDocumentHandler {
 
@@ -140,9 +140,6 @@ public class DOMNormalizer implements XMLDocumentHandler {
     /** Stores all namespace bindings on the current element */
     protected final NamespaceContext fLocalNSBinder = new NamespaceSupport();
 
-    /** list of attributes */
-    protected final List<Node> fAttributeList = new ArrayList<>(5);
-
     /** DOM Locator -  for namespace fixup algorithm */
     protected final DOMLocatorImpl fLocator = new DOMLocatorImpl();
 
@@ -885,9 +882,9 @@ protected final void namespaceFixUp (ElementImpl element, AttributeMap attribute
         if (attributes != null) {
 
             // clone content of the attributes
-            attributes.cloneMap(fAttributeList);
-            for (int i = 0; i < fAttributeList.size(); i++) {
-                Attr attr = (Attr) fAttributeList.get(i);
+            List<Node> attrList = attributes.cloneMap(new ArrayList<>());
+            for (int i = 0; i < attrList.size(); i++) {
+                Attr attr = (Attr) attrList.get(i);
                 fLocator.fRelatedNode = attr;
 
                 if (DEBUG) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,7 +56,7 @@
  * @xerces.internal
  *
  * @since  PR-DOM-Level-1-19980818.
- * @LastModified: Jan 2018
+ * @LastModified: June 2022
  */
 public class NamedNodeMapImpl
     implements NamedNodeMap, Serializable {
@@ -196,7 +196,7 @@ public Node setNamedItem(Node arg)
         } else {
             i = -1 - i; // Insert point (may be end of list)
             if (null == nodes) {
-                nodes = new ArrayList<>(5);
+                nodes = new ArrayList<>();
             }
             nodes.add(i, arg);
         }
@@ -246,7 +246,7 @@ public Node setNamedItemNS(Node arg)
             } else {
                 i = -1 - i; // Insert point (may be end of list)
                 if (null == nodes) {
-                    nodes = new ArrayList<>(5);
+                    nodes = new ArrayList<>();
                 }
                 nodes.add(i, arg);
             }
@@ -561,7 +561,7 @@ protected int addItem (Node arg) {
             else {
                 i = -1 - i; // Insert point (may be end of list)
                 if (null == nodes) {
-                    nodes = new ArrayList<>(5);
+                    nodes = new ArrayList<>();
                 }
                 nodes.add(i, arg);
             }
diff --git a/test/jaxp/javax/xml/jaxp/unittest/dom/DocumentTest.java b/test/jaxp/javax/xml/jaxp/unittest/dom/DocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,15 +34,20 @@
 import org.testng.Assert;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
+import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
+import org.w3c.dom.bootstrap.DOMImplementationRegistry;
 import org.w3c.dom.events.Event;
 import org.w3c.dom.events.EventListener;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
 
 /*
  * @test
- * @bug 8213117 8222743
+ * @bug 8213117 8222743 8287076
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @modules java.xml
  * @modules java.xml/com.sun.org.apache.xerces.internal.dom
@@ -56,6 +61,53 @@ public class DocumentTest {
     static final int DOC1 = 1;
     static final int DOC2 = 2;
 
+    /*
+     * @bug 8287076
+     * Verifies that Document::normalizeDocument returns the same result as that
+     * prior to JDK 10 (JDK-8181150).
+     * Attribute Name:
+     *     JDK 9:                   NS1:wsu and NS2:wsu2
+     *     After the JDK 10 change: wsu and wsu2
+    */
+    @Test
+    public void testNormalizeDocument() throws Exception {
+        final DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
+        final DOMImplementationLS impl = (DOMImplementationLS) registry.getDOMImplementation("LS");
+        final LSParser builder = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
+        final LSInput input = impl.createLSInput();
+        input.setStringData("<xml/>");
+        final Document document = builder.parse(input);
+        final Element root = document.getDocumentElement();
+
+        // Generate a single element
+        final Element element = document.createElement("token");
+        final Attr attr = element.getOwnerDocument().createAttributeNS("http://blah.xsd", "wsu");
+        attr.setValue("Id");
+        element.setAttributeNodeNS(attr);
+
+        final Attr attr2 = element.getOwnerDocument().createAttributeNS("http://blah2.xsd", "wsu2");
+        element.setAttributeNodeNS(attr2);
+
+        final Attr attr3 = element.getOwnerDocument().createAttribute("aa");
+        element.setAttributeNodeNS(attr3);
+
+        final Attr attr4 = element.getOwnerDocument().createAttribute("zz");
+        element.setAttributeNodeNS(attr4);
+
+        final Attr attr5 = element.getOwnerDocument().createAttribute("tt");
+        element.setAttributeNodeNS(attr5);
+
+        root.appendChild(element);
+
+        document.normalizeDocument();
+
+        Node wsu = element.getAttributes().getNamedItemNS("http://blah.xsd", "wsu");
+        Node wsu2 = element.getAttributes().getNamedItemNS("http://blah2.xsd", "wsu2");
+
+        Assert.assertEquals(wsu.getNodeName(), "NS1:wsu");
+        Assert.assertEquals(wsu2.getNodeName(), "NS2:wsu2");
+    }
+
     /**
      * Verifies the adoptNode method. Before a node from a deferred DOM can be
      * adopted, it needs to be fully expanded.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`*/`
`4`	`4`	`/*`
`5`	`5`	`* Licensed to the Apache Software Foundation (ASF) under one or more`
`@@ -39,7 +39,7 @@`
`39`	`39`	`*`
`40`	`40`	`* @xerces.internal`
`41`	`41`	`*`
`42`		`- * @LastModified: Oct 2017`
	`42`	`+ * @LastModified: June 2022`
`43`	`43`	`*/`
`44`	`44`	`public class AttributeMap extends NamedNodeMapImpl {`
`45`	`45`
`@@ -117,7 +117,7 @@ public Node setNamedItem(Node arg)`
`117`	`117`	`} else {`
`118`	`118`	`i = -1 - i; // Insert point (may be end of list)`
`119`	`119`	`if (null == nodes) {`
`120`		`- nodes = new ArrayList<>(5);`
	`120`	`+ nodes = new ArrayList<>();`
`121`	`121`	`}`
`122`	`122`	`nodes.add(i, arg);`
`123`	`123`	`}`
`@@ -193,7 +193,7 @@ public Node setNamedItemNS(Node arg)`
`193`	`193`	`} else {`
`194`	`194`	`i = -1 - i; // Insert point (may be end of list)`
`195`	`195`	`if (null == nodes) {`
`196`		`- nodes = new ArrayList<>(5);`
	`196`	`+ nodes = new ArrayList<>();`
`197`	`197`	`}`
`198`	`198`	`nodes.add(i, arg);`
`199`	`199`	`}`
`@@ -591,7 +591,7 @@ protected final int addItem (Node arg) {`
`591`	`591`	`else {`
`592`	`592`	`i = -1 - i; // Insert point (may be end of list)`
`593`	`593`	`if (null == nodes) {`
`594`		`- nodes = new ArrayList<>(5);`
	`594`	`+ nodes = new ArrayList<>();`
`595`	`595`	`}`
`596`	`596`	`nodes.add(i, arg);`
`597`	`597`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`*/`
`4`	`4`	`/*`
`5`	`5`	`* Licensed to the Apache Software Foundation (ASF) under one or more`
`@@ -56,7 +56,7 @@`
`56`	`56`	`* @xerces.internal`
`57`	`57`	`*`
`58`	`58`	`* @since PR-DOM-Level-1-19980818.`
`59`		`- * @LastModified: Jan 2018`
	`59`	`+ * @LastModified: June 2022`
`60`	`60`	`*/`
`61`	`61`	`public class NamedNodeMapImpl`
`62`	`62`	`implements NamedNodeMap, Serializable {`
`@@ -196,7 +196,7 @@ public Node setNamedItem(Node arg)`
`196`	`196`	`} else {`
`197`	`197`	`i = -1 - i; // Insert point (may be end of list)`
`198`	`198`	`if (null == nodes) {`
`199`		`- nodes = new ArrayList<>(5);`
	`199`	`+ nodes = new ArrayList<>();`
`200`	`200`	`}`
`201`	`201`	`nodes.add(i, arg);`
`202`	`202`	`}`
`@@ -246,7 +246,7 @@ public Node setNamedItemNS(Node arg)`
`246`	`246`	`} else {`
`247`	`247`	`i = -1 - i; // Insert point (may be end of list)`
`248`	`248`	`if (null == nodes) {`
`249`		`- nodes = new ArrayList<>(5);`
	`249`	`+ nodes = new ArrayList<>();`
`250`	`250`	`}`
`251`	`251`	`nodes.add(i, arg);`
`252`	`252`	`}`
`@@ -561,7 +561,7 @@ protected int addItem (Node arg) {`
`561`	`561`	`else {`
`562`	`562`	`i = -1 - i; // Insert point (may be end of list)`
`563`	`563`	`if (null == nodes) {`
`564`		`- nodes = new ArrayList<>(5);`
	`564`	`+ nodes = new ArrayList<>();`
`565`	`565`	`}`
`566`	`566`	`nodes.add(i, arg);`
`567`	`567`	`}`