cleanup

Author: rbri

src/main/java/org/htmlunit/cyberneko/HTMLNamedEntitiesParser.java

@@ -86,13 +86,12 @@ private HTMLNamedEntitiesParser() {
 
             props.forEach((k, v) -> {
                 String key = (String) k;
-                final String value = (String) v;
-
                 // we might have an empty line in it
                 if (key.trim().isEmpty()) {
                     return;
                 }
 
+                final String value = (String) v;
                 rootLevel_.add(key, value);
 
                 key = "&" + key;

src/main/java/org/htmlunit/cyberneko/filters/HTMLWriterFilter.java

@@ -21,6 +21,7 @@
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 
 import org.htmlunit.cyberneko.HTMLElements;
 import org.htmlunit.cyberneko.HTMLNamedEntitiesParser;
@@ -238,7 +239,7 @@ protected void printStartElement(final QName element, final XMLAttributes attrib
             String httpEquiv = null;
             final int length = attributes.getLength();
             for (int i = 0; i < length; i++) {
-                final String aname = attributes.getQName(i).toLowerCase();
+                final String aname = attributes.getQName(i).toLowerCase(Locale.ROOT);
                 if ("http-equiv".equals(aname)) {
                     httpEquiv = attributes.getValue(i);
                 }
@@ -250,7 +251,7 @@ else if ("content".equals(aname)) {
                 String content = null;
                 if (contentIndex != -1) {
                     originalContent = attributes.getValue(contentIndex);
-                    content = originalContent.toLowerCase();
+                    content = originalContent.toLowerCase(Locale.ROOT);
                 }
                 if (content != null) {
                     final int charsetIndex = content.indexOf("charset=");

src/main/java/org/htmlunit/cyberneko/html/dom/HTMLDOMImplementationImpl.java

@@ -54,12 +54,11 @@ private HTMLDOMImplementationImpl() {
      */
     @Override
     public HTMLDocument createHTMLDocument(final String title) throws DOMException {
-        final HTMLDocument doc;
-
         if (title == null) {
             throw new NullPointerException("HTM014 Argument 'title' is null.");
         }
-        doc = new HTMLDocumentImpl();
+
+        final HTMLDocument doc = new HTMLDocumentImpl();
         doc.setTitle(title);
         return doc;
     }

src/main/java/org/htmlunit/cyberneko/html/dom/HTMLDocumentImpl.java

@@ -252,15 +252,11 @@ public HTMLDocumentImpl() {
 
     @Override
     public synchronized Element getDocumentElement() {
-        Node    html;
-        Node    child;
-        Node    next;
-
         // The document element is the top-level HTML element of the HTML
         // document. Only this element should exist at the top level.
         // If the HTML element is found, all other elements that might
         // precede it are placed inside the HTML element.
-        html = getFirstChild();
+        Node html = getFirstChild();
         while (html != null) {
             if (html instanceof HTMLHtmlElement) {
                 return (HTMLElement) html;
@@ -272,9 +268,9 @@ public synchronized Element getDocumentElement() {
         // entire contents of the document into it in the same order as
         // they appear now.
         html = new HTMLHtmlElementImpl(this, "HTML");
-        child = getFirstChild();
+        Node child = getFirstChild();
         while (child != null) {
-            next = child.getNextSibling();
+            final Node next = child.getNextSibling();
             html.appendChild(child);
             child = next;
         }

src/main/java/org/htmlunit/cyberneko/xerces/dom/DeepNodeListImpl.java

@@ -112,8 +112,6 @@ public int getLength() {
      */
     @Override
     public Node item(final int index) {
-        Node thisNode;
-
         // Tree changed. Do it all from scratch!
         if (rootNode_.changes() != changes_) {
             nodes_ = new ArrayList<>();
@@ -129,6 +127,7 @@ public Node item(final int index) {
         // Not yet seen
 
         // Pick up where we left off (Which may be the beginning)
+        Node thisNode;
         if (currentSize == 0) {
             thisNode = rootNode_;
         }

src/main/java/org/htmlunit/cyberneko/xerces/dom/ElementNSImpl.java

@@ -48,17 +48,13 @@ protected ElementNSImpl(final CoreDocumentImpl ownerDocument, final String names
     }
 
     private void setName(final String namespaceURI, final String qname) {
-        final String prefix;
         // DOM Level 3: namespace URI is never empty string.
         this.namespaceURI = namespaceURI;
         if (namespaceURI != null) {
             // convert the empty string to 'null'
             this.namespaceURI = (namespaceURI.length() == 0) ? null : namespaceURI;
         }
 
-        final int colon1;
-        final int colon2;
-
         // NAMESPACE_ERR:
         // 1. if the qualified name is 'null' it is malformed.
         // 2. or if the qualifiedName is null and the namespaceURI is different from
@@ -70,8 +66,8 @@ private void setName(final String namespaceURI, final String qname) {
             throw new DOMException(DOMException.NAMESPACE_ERR, msg);
         }
 
-        colon1 = qname.indexOf(':');
-        colon2 = qname.lastIndexOf(':');
+        final int colon1 = qname.indexOf(':');
+        final int colon2 = qname.lastIndexOf(':');
 
         ownerDocument.checkNamespaceWF(qname, colon1, colon2);
         if (colon1 < 0) {
@@ -88,7 +84,7 @@ private void setName(final String namespaceURI, final String qname) {
             }
         }
         else {
-            prefix = qname.substring(0, colon1);
+            final String prefix = qname.substring(0, colon1);
             localName = qname.substring(colon2 + 1);
 
             // NAMESPACE_ERR:

src/main/java/org/htmlunit/cyberneko/xerces/dom/NodeImpl.java

@@ -725,10 +725,8 @@ public short compareDocumentPosition(final Node other) throws DOMException {
 
         Node node;
         Node thisAncestor = this;
-        Node otherAncestor = other;
 
         int thisDepth = 0;
-        int otherDepth = 0;
         for (node = this; node != null; node = node.getParentNode()) {
             thisDepth += 1;
             if (node == other) {
@@ -738,6 +736,8 @@ public short compareDocumentPosition(final Node other) throws DOMException {
             thisAncestor = node;
         }
 
+        int otherDepth = 0;
+        Node otherAncestor = other;
         for (node = other; node != null; node = node.getParentNode()) {
             otherDepth += 1;
             if (node == this) {

src/test/java/org/htmlunit/cyberneko/xerces/xni/XMLStringTest.java

@@ -1353,8 +1353,8 @@ public void equalsIgnoreCase_Difference() {
     @ParameterizedTest
     @ValueSource(strings = { "éäöü€", "Ganyu (贛語 / 赣语)", "duże i małe litery", "большой и нижний регистр" })
     public void equalsIgnoreCase_MoreChallengingLocales(final String s) {
-        final String upper = s.toUpperCase();
-        final String lower = s.toLowerCase();
+        final String upper = s.toUpperCase(Locale.ROOT);
+        final String lower = s.toLowerCase(Locale.ROOT);
 
         final XMLString a = new XMLString(s);
         final XMLString l = new XMLString(upper);