Reduce public API footprint for new class

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/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/util/ClassLoaderUtil.java

@@ -27,8 +27,9 @@
  * context class loader results in a {@code java.lang.ClassNotFoundException}.
  *
  * See org.apache.commons.lang3.ClassUtils
+ * @since 1.4.0
  */
-public class ClassLoaderUtil {
+public final class ClassLoaderUtil {
 
     /**
      * Maps a primitive class name to its corresponding abbreviation used in array class names.
@@ -58,21 +59,6 @@ private static void addAbbreviation(final String primitive, final String abbrevi
         abbreviationMap.put(primitive, abbreviation);
     }
 
-    /**
-     * Returns the (initialized) class represented by {@code className} using the {@code classLoader}. This implementation supports names like
-     * "{@code java.lang.String[]}" as well as "{@code [Ljava.lang.String;}".
-     *
-     * @param <T> The expected class type.
-     * @param classLoader the class loader to use to load the class
-     * @param className   the class name
-     * @return the class represented by {@code className} using the {@code classLoader}
-     * @throws ClassNotFoundException if the class is not found
-     */
-    public static <T> Class<T> getClass(final ClassLoader classLoader, final String className) throws ClassNotFoundException {
-        return getClass(classLoader, className, true);
-    }
-
-    // Class loading
     /**
      * Returns the class represented by {@code className} using the {@code classLoader}. This implementation supports names like "{@code java.lang.String[]}" as
      * well as "{@code [Ljava.lang.String;}".
@@ -85,7 +71,7 @@ public static <T> Class<T> getClass(final ClassLoader classLoader, final String
      * @throws ClassNotFoundException if the class is not found
      */
     @SuppressWarnings("unchecked") // assume the call site knows what it's doing.
-    public static <T> Class<T> getClass(final ClassLoader classLoader, final String className, final boolean initialize) throws ClassNotFoundException {
+    private static <T> Class<T> getClass(final ClassLoader classLoader, final String className, final boolean initialize) throws ClassNotFoundException {
         Class<T> clazz;
         if (abbreviationMap.containsKey(className)) {
             final String clsName = "[" + abbreviationMap.get(className);
@@ -96,19 +82,6 @@ public static <T> Class<T> getClass(final ClassLoader classLoader, final String
         return clazz;
     }
 
-    /**
-     * Returns the (initialized) class represented by {@code className} using the current thread's context class loader. This implementation supports names like
-     * "{@code java.lang.String[]}" as well as "{@code [Ljava.lang.String;}".
-     *
-     * @param <T> The expected class type.
-     * @param className the class name
-     * @return the class represented by {@code className} using the current thread's context class loader
-     * @throws ClassNotFoundException if the class is not found
-     */
-    public static <T> Class<T> getClass(final String className) throws ClassNotFoundException {
-        return getClass(className, true);
-    }
-
     /**
      * Returns the class represented by {@code className} using the current thread's context class loader. This implementation supports names like
      * "{@code java.lang.String[]}" as well as "{@code [Ljava.lang.String;}".
@@ -159,11 +132,8 @@ private static String toCanonicalName(String className) {
 
     /**
      * Constructs a new instance.
-     *
-     * @deprecated Constructor will be private in the next major version.
      */
-    @Deprecated
-    public ClassLoaderUtil() {
+    private ClassLoaderUtil() {
         // empty
     }
 }