Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-568 - @SuppressWarnings("unchecked") is used too generally 

Partial fix - some warnings remain to be addressed

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@892135 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2009-12-18 05:03:42 +00:00
parent fd7450f301
commit ed3d84438b
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/java/org/apache/commons/lang3/ArrayUtils.java
View File

@ -425,7 +425,6 @@ public static boolean[] clone(boolean[] array) {
* the start and end indices. * the start and end indices.
* @since 2.1 * @since 2.1
*/ */
@SuppressWarnings("unchecked")
public static <T> T[] subarray(T[] array, int startIndexInclusive, int endIndexExclusive) { public static <T> T[] subarray(T[] array, int startIndexInclusive, int endIndexExclusive) {
if (array == null) { if (array == null) {
return null; return null;
@ -439,8 +438,11 @@ public static <T> T[] subarray(T[] array, int startIndexInclusive, int endIndexE
int newSize = endIndexExclusive - startIndexInclusive; int newSize = endIndexExclusive - startIndexInclusive;
Class<?> type = array.getClass().getComponentType(); Class<?> type = array.getClass().getComponentType();
if (newSize <= 0) { if (newSize <= 0) {
return (T[]) Array.newInstance(type, 0); @SuppressWarnings("unchecked") // OK, because array is of type T
final T[] emptyArray = (T[]) Array.newInstance(type, 0);
return emptyArray;
} }
@SuppressWarnings("unchecked") // OK, because array is of type T
T[] subarray = (T[]) Array.newInstance(type, newSize); T[] subarray = (T[]) Array.newInstance(type, newSize);
System.arraycopy(array, startIndexInclusive, subarray, 0, newSize); System.arraycopy(array, startIndexInclusive, subarray, 0, newSize);
return subarray; return subarray;
@ -2949,7 +2951,6 @@ public static boolean isEmpty(boolean[] array) {
* unless the first array is null, in which case the type is the same as the second array. * unless the first array is null, in which case the type is the same as the second array.
* @since 2.1 * @since 2.1
*/ */
@SuppressWarnings("unchecked")
public static <T> T[] addAll(T[] array1, T... array2) { public static <T> T[] addAll(T[] array1, T... array2) {
if (array1 == null) { if (array1 == null) {
return clone(array2); return clone(array2);
@ -2957,6 +2958,7 @@ public static <T> T[] addAll(T[] array1, T... array2) {
return clone(array1); return clone(array1);
} }
final Class<?> type1 = array1.getClass().getComponentType(); final Class<?> type1 = array1.getClass().getComponentType();
@SuppressWarnings("unchecked") // OK, because array is of type T
T[] joinedArray = (T[]) Array.newInstance(type1, array1.length + array2.length); T[] joinedArray = (T[]) Array.newInstance(type1, array1.length + array2.length);
System.arraycopy(array1, 0, joinedArray, 0, array1.length); System.arraycopy(array1, 0, joinedArray, 0, array1.length);
try { try {
@ -3224,13 +3226,16 @@ public static double[] addAll(double[] array1, double... array2) {
* </pre> * </pre>
* *
* @param array the array to "add" the element to, may be <code>null</code> * @param array the array to "add" the element to, may be <code>null</code>
* @param element the object to add * @param element the object to add, may be <code>null</code>
* @return A new array containing the existing elements plus the new element * @return A new array containing the existing elements plus the new element
* The returned array type will be that of the input array (unless null),
* in which case it will have the same type as the element (unless that is also null)
* in which case the returned type will be Object[].
* @since 2.1 * @since 2.1
*/ */
@SuppressWarnings("unchecked")
public static <T> T[] add(T[] array, T element) { public static <T> T[] add(T[] array, T element) {
Class<?> type = array != null ? array.getClass() : (element != null ? element.getClass() : Object.class); Class<?> type = array != null ? array.getClass() : (element != null ? element.getClass() : Object.class);
// TODO - this is NOT safe to ignore - see LANG-571
T[] newArray = (T[]) copyArrayGrow1(array, type); T[] newArray = (T[]) copyArrayGrow1(array, type);
newArray[newArray.length - 1] = element; newArray[newArray.length - 1] = element;
return newArray; return newArray;
@ -3499,7 +3504,6 @@ private static Object copyArrayGrow1(Object array, Class<?> newArrayComponentTyp
* @throws IndexOutOfBoundsException if the index is out of range * @throws IndexOutOfBoundsException if the index is out of range
* (index < 0 || index > array.length). * (index < 0 || index > array.length).
*/ */
@SuppressWarnings("unchecked")
public static <T> T[] add(T[] array, int index, T element) { public static <T> T[] add(T[] array, int index, T element) {
Class<?> clss = null; Class<?> clss = null;
if (array != null) { if (array != null) {
@ -3507,9 +3511,13 @@ public static <T> T[] add(T[] array, int index, T element) {
} else if (element != null) { } else if (element != null) {
clss = element.getClass(); clss = element.getClass();
} else { } else {
return (T[]) new Object[] { null }; // TODO this is not type-safe - see LANG-571
final T[] emptyArray = (T[]) new Object[] { null };
return emptyArray;
} }
return (T[]) add(array, index, element, clss); @SuppressWarnings("unchecked") // the add method creates an array of type clss, which is type T
final T[] newArray = (T[]) add(array, index, element, clss);
return newArray;
} }
/** /**
@ -3822,7 +3830,7 @@ private static Object add(Object array, int index, Object element, Class<?> clss
* (index < 0 || index >= array.length), or if the array is <code>null</code>. * (index < 0 || index >= array.length), or if the array is <code>null</code>.
* @since 2.1 * @since 2.1
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked") // remove() always creates an array of the same type as its input
public static <T> T[] remove(T[] array, int index) { public static <T> T[] remove(T[] array, int index) {
return (T[]) remove((Object) array, index); return (T[]) remove((Object) array, index);
} }