Rename internal method to remove type casts

Author: garydgregory

src/main/java/org/apache/commons/lang3/ArrayUtils.java

@@ -5308,7 +5308,7 @@ public static long[] removeAll(final long[] array, final int... indices) {
      * @return new array of same type minus elements specified by the set bits in {@code indices}.
      */
     // package protected for access by unit tests
-    static Object removeAll(final Object array, final BitSet indices) {
+    static Object removeAt(final Object array, final BitSet indices) {
         if (array == null) {
             return null;
         }
@@ -5475,7 +5475,7 @@ public static <T> T[] removeAll(final T[] array, final int... indices) {
      */
     @Deprecated
     public static boolean[] removeAllOccurences(final boolean[] array, final boolean element) {
-        return (boolean[]) removeAll((Object) array, indexesOf(array, element));
+        return (boolean[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5494,7 +5494,7 @@ public static boolean[] removeAllOccurences(final boolean[] array, final boolean
      */
     @Deprecated
     public static byte[] removeAllOccurences(final byte[] array, final byte element) {
-        return (byte[]) removeAll((Object) array, indexesOf(array, element));
+        return (byte[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5513,7 +5513,7 @@ public static byte[] removeAllOccurences(final byte[] array, final byte element)
      */
     @Deprecated
     public static char[] removeAllOccurences(final char[] array, final char element) {
-        return (char[]) removeAll((Object) array, indexesOf(array, element));
+        return (char[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5532,7 +5532,7 @@ public static char[] removeAllOccurences(final char[] array, final char element)
      */
     @Deprecated
     public static double[] removeAllOccurences(final double[] array, final double element) {
-        return (double[]) removeAll((Object) array, indexesOf(array, element));
+        return (double[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5551,7 +5551,7 @@ public static double[] removeAllOccurences(final double[] array, final double el
      */
     @Deprecated
     public static float[] removeAllOccurences(final float[] array, final float element) {
-        return (float[]) removeAll((Object) array, indexesOf(array, element));
+        return (float[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5570,7 +5570,7 @@ public static float[] removeAllOccurences(final float[] array, final float eleme
      */
     @Deprecated
     public static int[] removeAllOccurences(final int[] array, final int element) {
-        return (int[]) removeAll((Object) array, indexesOf(array, element));
+        return (int[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5589,7 +5589,7 @@ public static int[] removeAllOccurences(final int[] array, final int element) {
      */
     @Deprecated
     public static long[] removeAllOccurences(final long[] array, final long element) {
-        return (long[]) removeAll((Object) array, indexesOf(array, element));
+        return (long[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5608,7 +5608,7 @@ public static long[] removeAllOccurences(final long[] array, final long element)
      */
     @Deprecated
     public static short[] removeAllOccurences(final short[] array, final short element) {
-        return (short[]) removeAll((Object) array, indexesOf(array, element));
+        return (short[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5628,7 +5628,7 @@ public static short[] removeAllOccurences(final short[] array, final short eleme
      */
     @Deprecated
     public static <T> T[] removeAllOccurences(final T[] array, final T element) {
-        return (T[]) removeAll((Object) array, indexesOf(array, element));
+        return (T[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5645,7 +5645,7 @@ public static <T> T[] removeAllOccurences(final T[] array, final T element) {
      * @since 3.10
      */
     public static boolean[] removeAllOccurrences(final boolean[] array, final boolean element) {
-        return (boolean[]) removeAll((Object) array, indexesOf(array, element));
+        return (boolean[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5662,7 +5662,7 @@ public static boolean[] removeAllOccurrences(final boolean[] array, final boolea
      * @since 3.10
      */
     public static byte[] removeAllOccurrences(final byte[] array, final byte element) {
-        return (byte[]) removeAll((Object) array, indexesOf(array, element));
+        return (byte[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5679,7 +5679,7 @@ public static byte[] removeAllOccurrences(final byte[] array, final byte element
      * @since 3.10
      */
     public static char[] removeAllOccurrences(final char[] array, final char element) {
-        return (char[]) removeAll((Object) array, indexesOf(array, element));
+        return (char[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5696,7 +5696,7 @@ public static char[] removeAllOccurrences(final char[] array, final char element
      * @since 3.10
      */
     public static double[] removeAllOccurrences(final double[] array, final double element) {
-        return (double[]) removeAll((Object) array, indexesOf(array, element));
+        return (double[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5713,7 +5713,7 @@ public static double[] removeAllOccurrences(final double[] array, final double e
      * @since 3.10
      */
     public static float[] removeAllOccurrences(final float[] array, final float element) {
-        return (float[]) removeAll((Object) array, indexesOf(array, element));
+        return (float[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5730,7 +5730,7 @@ public static float[] removeAllOccurrences(final float[] array, final float elem
      * @since 3.10
      */
     public static int[] removeAllOccurrences(final int[] array, final int element) {
-        return (int[]) removeAll((Object) array, indexesOf(array, element));
+        return (int[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5747,7 +5747,7 @@ public static int[] removeAllOccurrences(final int[] array, final int element) {
      * @since 3.10
      */
     public static long[] removeAllOccurrences(final long[] array, final long element) {
-        return (long[]) removeAll((Object) array, indexesOf(array, element));
+        return (long[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5764,7 +5764,7 @@ public static long[] removeAllOccurrences(final long[] array, final long element
      * @since 3.10
      */
     public static short[] removeAllOccurrences(final short[] array, final short element) {
-        return (short[]) removeAll((Object) array, indexesOf(array, element));
+        return (short[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -5782,7 +5782,7 @@ public static short[] removeAllOccurrences(final short[] array, final short elem
      * @since 3.10
      */
     public static <T> T[] removeAllOccurrences(final T[] array, final T element) {
-        return (T[]) removeAll((Object) array, indexesOf(array, element));
+        return (T[]) removeAt(array, indexesOf(array, element));
     }
 
     /**
@@ -6102,7 +6102,7 @@ public static boolean[] removeElements(final boolean[] array, final boolean... v
                 toRemove.set(i);
             }
         }
-        return (boolean[]) removeAll(array, toRemove);
+        return (boolean[]) removeAt(array, toRemove);
     }
 
     /**
@@ -6151,7 +6151,7 @@ public static byte[] removeElements(final byte[] array, final byte... values) {
                 toRemove.set(i);
             }
         }
-        return (byte[]) removeAll(array, toRemove);
+        return (byte[]) removeAt(array, toRemove);
     }
 
     /**
@@ -6200,7 +6200,7 @@ public static char[] removeElements(final char[] array, final char... values) {
                 toRemove.set(i);
             }
         }
-        return (char[]) removeAll(array, toRemove);
+        return (char[]) removeAt(array, toRemove);
     }
 
     /**
@@ -6249,7 +6249,7 @@ public static double[] removeElements(final double[] array, final double... valu
                 toRemove.set(i);
             }
         }
-        return (double[]) removeAll(array, toRemove);
+        return (double[]) removeAt(array, toRemove);
     }
 
     /**
@@ -6298,7 +6298,7 @@ public static float[] removeElements(final float[] array, final float... values)
                 toRemove.set(i);
             }
         }
-        return (float[]) removeAll(array, toRemove);
+        return (float[]) removeAt(array, toRemove);
     }
 
     /**
@@ -6347,7 +6347,7 @@ public static int[] removeElements(final int[] array, final int... values) {
                 toRemove.set(i);
             }
         }
-        return (int[]) removeAll(array, toRemove);
+        return (int[]) removeAt(array, toRemove);
     }
 
     /**
@@ -6396,7 +6396,7 @@ public static long[] removeElements(final long[] array, final long... values) {
                 toRemove.set(i);
             }
         }
-        return (long[]) removeAll(array, toRemove);
+        return (long[]) removeAt(array, toRemove);
     }
 
     /**
@@ -6445,7 +6445,7 @@ public static short[] removeElements(final short[] array, final short... values)
                 toRemove.set(i);
             }
         }
-        return (short[]) removeAll(array, toRemove);
+        return (short[]) removeAt(array, toRemove);
     }
 
     /**
@@ -6497,7 +6497,7 @@ public static <T> T[] removeElements(final T[] array, final T... values) {
             }
         }
         @SuppressWarnings("unchecked") // removeAll() always creates an array of the same type as its input
-        final T[] result = (T[]) removeAll(array, toRemove);
+        final T[] result = (T[]) removeAt(array, toRemove);
         return result;
     }
 

src/test/java/org/apache/commons/lang3/HashSetvBitSetTest.java

@@ -80,7 +80,7 @@ public int[] timeBitSetRemoveAll() {
         final BitSet toRemove = new BitSet();
         final int[] array = new int[100];
         toRemove.set(10, 20);
-        return (int[]) ArrayUtils.removeAll(array, toRemove);
+        return (int[]) ArrayUtils.removeAt(array, toRemove);
     }
 
     @Benchmark