Merge branch 'master' into release

Author: garydgregory

src/changes/changes.xml

@@ -110,7 +110,6 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix" due-to="Gary Gregory">Use generics internally.</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">NodeSet.getPointers() is now typed with generics.</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">ServletContextHandler.collectPropertyNames(HashSet, Object) is now typed with generics.</action>
-      <action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate ClassLoaderUtil.ClassLoaderUtil().</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate MethodLookupUtils.MethodLookupUtils().</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate KeyManagerUtils.KeyManagerUtils().</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate TypeUtils.TypeUtils().</action>

src/main/java/org/apache/commons/jxpath/ExceptionHandler.java

@@ -17,18 +17,14 @@
 
 package org.apache.commons.jxpath;
 
+import java.util.function.BiConsumer;
+
 /**
  * Exception handler interface. Actually handles Throwables.
  *
- * @since 1.4
+ * @since 1.4.0
  */
-public interface ExceptionHandler {
-
-    /**
-     * Handle an encountered Throwable.
-     *
-     * @param t   to handle
-     * @param ptr specific context
-     */
-    void handle(Throwable t, Pointer ptr);
+@FunctionalInterface
+public interface ExceptionHandler extends BiConsumer<Throwable, Pointer> {
+    // empty
 }

src/main/java/org/apache/commons/jxpath/JXPathContext.java

@@ -866,7 +866,7 @@ public synchronized void setDecimalFormatSymbols(final String name, final Decima
      * Sets the ExceptionHandler used by this context, if any.
      *
      * @param exceptionHandler to set
-     * @since 1.4
+     * @since 1.4.0
      */
     public void setExceptionHandler(final ExceptionHandler exceptionHandler) {
         throw new UnsupportedOperationException("ExceptionHandler registration is not implemented by " + getClass());

src/main/java/org/apache/commons/jxpath/JXPathIntrospector.java

@@ -166,7 +166,7 @@ private static Object instantiate(final Class sibling, final String className) t
             }
         }
         // Now try the ClassLoaderUtil.
-        return ClassLoaderUtil.getClass(className).newInstance();
+        return ClassLoaderUtil.getClass(className, true).newInstance();
     }
 
     /**

src/main/java/org/apache/commons/jxpath/functions/package-info.java

@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /**
  * Implementations of Java class-based extension functions.
+ *
+ * @see <a href="https://commons.apache.org/proper/commons-jxpath/apidocs/index.html">User's Guide</a>.
  */
-
 package org.apache.commons.jxpath.functions;

src/main/java/org/apache/commons/jxpath/package-info.java

@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /**
  * Public, abstract part of JXPath: interfaces and configuration. If you are a user of JXPath and don't plan to modify its implementation, this is the only
  * package you'll need to use. Start with the {@link org.apache.commons.jxpath.JXPathContext} class.
+ *
+ * @see <a href="https://commons.apache.org/proper/commons-jxpath/apidocs/index.html">User's Guide</a>.
  */
-
 package org.apache.commons.jxpath;

src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java

@@ -159,7 +159,7 @@ public static NodePointerFactory[] getNodePointerFactories() {
      *
      * @param factory NodePointerFactory to remove
      * @return true if this implementation contained the specified element
-     * @since 1.4.0
+     * @since 1.4.0.0
      */
     public static boolean removeNodePointerFactory(final NodePointerFactory factory) {
         synchronized (nodeFactories) {

src/main/java/org/apache/commons/jxpath/ri/axes/package-info.java

@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /**
  * Implementations of EvalContext used for different XPath axes (child::, parent:: etc). In order to evaluate a path, RI creates a chain of EvalContexts, one
  * for each step in the path.
+ *
+ * @see <a href="https://commons.apache.org/proper/commons-jxpath/apidocs/index.html">User's Guide</a>
  */
-
 package org.apache.commons.jxpath.ri.axes;

src/main/java/org/apache/commons/jxpath/ri/compiler/CoreFunction.java

@@ -290,7 +290,7 @@ protected Object functionCount(final EvalContext context) {
      *
      * @param context evaluation context
      * @return Boolean
-     * @since 1.4
+     * @since 1.4.0
      */
     protected Object functionEndsWith(final EvalContext context) {
         assertArgCount(2);

src/main/java/org/apache/commons/jxpath/ri/compiler/package-info.java

@@ -14,8 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /**
  * XPath parse tree. TreeCompiler is the class responsible for the construction of a parse tree out of individual elements.
+ *
+ * @see <a href="https://commons.apache.org/proper/commons-jxpath/apidocs/index.html">User's Guide</a>.
  */
-
 package org.apache.commons.jxpath.ri.compiler;