cleanup

Author: rbri

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.htmlunit</groupId>
     <artifactId>htmlunit-xpath</artifactId>
-    <version>4.16.0</version>
+    <version>4.17.0-SNAPSHOT</version>
     <name>HtmlUnit-XPath</name>
     <organization>
         <name>HtmlUnit</name>
@@ -24,24 +24,26 @@
         <maven.compiler.target>8</maven.compiler.target>
 
         <!-- test dependencies -->
-        <junit.version>5.13.4</junit.version>
+        <junit.version>5.14.0</junit.version>
         <commons-io.version>2.20.0</commons-io.version>
 
         <!-- quality -->
-        <checkstyle.version>10.26.1</checkstyle.version>
-        <spotbugs.version>4.9.4</spotbugs.version>
-        <pmd.version>7.16.0</pmd.version>
+        <checkstyle.version>11.1.0</checkstyle.version>
+        <spotbugs.version>4.9.6</spotbugs.version>
+        <pmd.version>7.17.0</pmd.version>
         <dependencycheck.version>10.0.4</dependencycheck.version>
 
         <!-- plugins -->
-        <central-publishing-plugin.version>0.8.0</central-publishing-plugin.version>
+        <central-publishing-plugin.version>0.9.0</central-publishing-plugin.version>
         <checkstyle-plugin.version>3.6.0</checkstyle-plugin.version>
         <pmd-plugin.version>3.27.0</pmd-plugin.version>
-        <spotbugs-plugin.version>4.9.4.0</spotbugs-plugin.version>
+        <spotbugs-plugin.version>4.9.6.0</spotbugs-plugin.version>
         <gpg-plugin.version>3.2.8</gpg-plugin.version>
-        <enforcer-plugin.version>3.6.1</enforcer-plugin.version>
+        <enforcer-plugin.version>3.6.2</enforcer-plugin.version>
+        <compiler-plugin.version>3.14.1</compiler-plugin.version>
         <jar-plugin.version>3.4.2</jar-plugin.version>
-        <javadoc-plugin.version>3.11.3</javadoc-plugin.version>
+        <javadoc-plugin.version>3.12.0</javadoc-plugin.version>
+        <surefire-plugin.version>3.5.4</surefire-plugin.version>
     </properties>
 
     <dependencies>
@@ -63,11 +65,11 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.14.0</version>
+                <version>${compiler-plugin.version}</version>
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>${surefire-plugin.version}</version>
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>

src/main/java/org/htmlunit/xpath/Expression.java

@@ -19,6 +19,7 @@
 
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerException;
+
 import org.htmlunit.xpath.objects.XObject;
 import org.htmlunit.xpath.res.XPATHErrorResources;
 import org.htmlunit.xpath.res.XPATHMessages;

src/main/java/org/htmlunit/xpath/NodeSet.java

@@ -19,6 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 

src/main/java/org/htmlunit/xpath/XPath.java

@@ -20,6 +20,7 @@
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.SourceLocator;
 import javax.xml.transform.TransformerException;
+
 import org.htmlunit.xpath.compiler.Compiler;
 import org.htmlunit.xpath.compiler.FunctionTable;
 import org.htmlunit.xpath.compiler.XPathParser;

src/main/java/org/htmlunit/xpath/XPathAPI.java

@@ -18,6 +18,7 @@
 package org.htmlunit.xpath;
 
 import javax.xml.transform.TransformerException;
+
 import org.htmlunit.xpath.objects.XObject;
 import org.htmlunit.xpath.xml.utils.PrefixResolver;
 import org.htmlunit.xpath.xml.utils.PrefixResolverDefault;
@@ -153,7 +154,7 @@ public static NodeList selectNodeList(
    *
    * @param contextNode The node to start searching from.
    * @param str A valid XPath string.
-   * @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never
+   * @return An XObject, which can be used to obtain a string, number, nodelist, etc., should never
    *     be null.
    * @see org.htmlunit.xpath.objects.XObject
    * @see org.htmlunit.xpath.objects.XBoolean
@@ -174,7 +175,7 @@ public static XObject eval(final Node contextNode, final String str) throws Tran
    * @param contextNode The node to start searching from.
    * @param str A valid XPath string.
    * @param namespaceNode The node from which prefixes in the XPath will be resolved to namespaces.
-   * @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never
+   * @return An XObject, which can be used to obtain a string, number, nodelist, etc., should never
    *     be null.
    * @see org.htmlunit.xpath.objects.XObject
    * @see org.htmlunit.xpath.objects.XBoolean
@@ -185,7 +186,7 @@ public static XObject eval(final Node contextNode, final String str) throws Tran
   public static XObject eval(final Node contextNode, final String str, final Node namespaceNode)
       throws TransformerException {
 
-    // Since we don't have a XML Parser involved here, install some default support
+    // Since we don't have an XML Parser involved here, install some default support
     // for things like namespaces, etc.
     // (Changed from: XPathContext xpathSupport = new XPathContext();
     // because XPathContext is weak in a number of areas... perhaps
@@ -224,7 +225,7 @@ public static XObject eval(final Node contextNode, final String str, final Node
    * @param str A valid XPath string.
    * @param prefixResolver Will be called if the parser encounters namespace prefixes, to resolve
    *     the prefixes to URLs.
-   * @return An XObject, which can be used to obtain a string, number, nodelist, etc, should never
+   * @return An XObject, which can be used to obtain a string, number, nodelist, etc., should never
    *     be null.
    * @see org.htmlunit.xpath.objects.XObject
    * @see org.htmlunit.xpath.objects.XBoolean
@@ -236,7 +237,7 @@ public static XObject eval(
       final Node contextNode, final String str, final PrefixResolver prefixResolver)
       throws TransformerException {
 
-    // Since we don't have a XML Parser involved here, install some default support
+    // Since we don't have an XML Parser involved here, install some default support
     // for things like namespaces, etc.
     // (Changed from: XPathContext xpathSupport = new XPathContext();
     // because XPathContext is weak in a number of areas... perhaps

src/main/java/org/htmlunit/xpath/XPathContext.java

@@ -18,8 +18,10 @@
 package org.htmlunit.xpath;
 
 import java.util.Stack;
+
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.URIResolver;
+
 import org.htmlunit.xpath.axes.SubContextList;
 import org.htmlunit.xpath.res.XPATHErrorResources;
 import org.htmlunit.xpath.res.XPATHMessages;

src/main/java/org/htmlunit/xpath/axes/AttributeIterator.java

@@ -20,35 +20,41 @@
 import org.htmlunit.xpath.compiler.Compiler;
 import org.htmlunit.xpath.xml.dtm.DTM;
 
-/** This class implements an optimized iterator for attribute axes patterns. */
+/**
+ * This class implements an optimized iterator for attribute axes patterns.
+ */
 public class AttributeIterator extends ChildTestIterator {
 
-  /**
-   * Create a AttributeIterator object.
-   *
-   * @param compiler A reference to the Compiler that contains the op map.
-   * @param opPos The position within the op map, which contains the location path expression for
-   *     this iterator.
-   * @throws javax.xml.transform.TransformerException if any
-   */
-  AttributeIterator(final Compiler compiler, final int opPos, final int analysis)
-      throws javax.xml.transform.TransformerException {
-    super(compiler, opPos, analysis);
-  }
+    /**
+     * Create a AttributeIterator object.
+     *
+     * @param compiler A reference to the Compiler that contains the op map.
+     * @param opPos    The position within the op map, which contains the location path expression for
+     *                 this iterator.
+     * @throws javax.xml.transform.TransformerException if any
+     */
+    AttributeIterator(final Compiler compiler, final int opPos, final int analysis)
+            throws javax.xml.transform.TransformerException {
+        super(compiler, opPos, analysis);
+    }
 
-  /** {@inheritDoc} */
-  @Override
-  protected int getNextNode() {
-    m_lastFetched =
-        (DTM.NULL == m_lastFetched)
-            ? m_cdtm.getFirstAttribute(m_context)
-            : m_cdtm.getNextAttribute(m_lastFetched);
-    return m_lastFetched;
-  }
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected int getNextNode() {
+        m_lastFetched =
+                (DTM.NULL == m_lastFetched)
+                        ? m_cdtm.getFirstAttribute(m_context)
+                        : m_cdtm.getNextAttribute(m_lastFetched);
+        return m_lastFetched;
+    }
 
-  /** {@inheritDoc} */
-  @Override
-  public int getAxis() {
-    return org.htmlunit.xpath.xml.dtm.Axis.ATTRIBUTE;
-  }
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getAxis() {
+        return org.htmlunit.xpath.xml.dtm.Axis.ATTRIBUTE;
+    }
 }