Stop using deprecated ClassUtils.getArrayClass

ctrueden · ctrueden · commit 704342139335 · 2018-03-02T16:02:53.000-06:00
There is now Types.array instead.
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
@@ -48,8 +48,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.scijava.util.Types;
-
 /**
  * Useful methods for working with {@link Class} objects and primitive types.
  *
@@ -188,19 +186,19 @@ public static Class<?> loadClass(final String name,
 		// handle source style arrays (e.g.: "java.lang.String[]")
 		if (name.endsWith("[]")) {
 			final String elementClassName = name.substring(0, name.length() - 2);
-			return getArrayClass(loadClass(elementClassName, classLoader));
+			return Types.array(loadClass(elementClassName, classLoader));
 		}
 
 		// handle non-primitive internal arrays (e.g.: "[Ljava.lang.String;")
 		if (name.startsWith("[L") && name.endsWith(";")) {
 			final String elementClassName = name.substring(2, name.length() - 1);
-			return getArrayClass(loadClass(elementClassName, classLoader));
+			return Types.array(loadClass(elementClassName, classLoader));
 		}
 
 		// handle other internal arrays (e.g.: "[I", "[[I", "[[Ljava.lang.String;")
 		if (name.startsWith("[")) {
 			final String elementClassName = name.substring(1);
-			return getArrayClass(loadClass(elementClassName, classLoader));
+			return Types.array(loadClass(elementClassName, classLoader));
 		}
 
 		// load the class!
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -79,7 +79,6 @@ public void testLoadClass() {
 		assertLoaded(int[].class, "int[]");
 		assertLoaded(long[].class, "long[]");
 		assertLoaded(short[].class, "short[]");
-		assertLoaded(null, "void[]");
 		assertLoaded(String[].class, "string[]");
 		assertLoaded(Number[].class, "java.lang.Number[]");
 		assertLoaded(boolean[][].class, "boolean[][]");
@@ -90,7 +89,6 @@ public void testLoadClass() {
 		assertLoaded(int[][].class, "int[][]");
 		assertLoaded(long[][].class, "long[][]");
 		assertLoaded(short[][].class, "short[][]");
-		assertLoaded(null, "void[][]");
 		assertLoaded(String[][].class, "string[][]");
 		assertLoaded(Number[][].class, "java.lang.Number[][]");
 		assertLoaded(boolean[].class, "[Z");
@@ -101,7 +99,6 @@ public void testLoadClass() {
 		assertLoaded(int[].class, "[I");
 		assertLoaded(long[].class, "[J");
 		assertLoaded(short[].class, "[S");
-		assertLoaded(null, "[V");
 		assertLoaded(String[].class, "[Lstring;");
 		assertLoaded(Number[].class, "[Ljava.lang.Number;");
 		assertLoaded(boolean[][].class, "[[Z");
@@ -112,11 +109,30 @@ public void testLoadClass() {
 		assertLoaded(int[][].class, "[[I");
 		assertLoaded(long[][].class, "[[J");
 		assertLoaded(short[][].class, "[[S");
-		assertLoaded(null, "[[V");
 		assertLoaded(String[][].class, "[[Lstring;");
 		assertLoaded(Number[][].class, "[[Ljava.lang.Number;");
 	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadClassVoidArray1D() {
+		ClassUtils.loadClass("void[]");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadClassVoidArray1DShort() {
+		ClassUtils.loadClass("[V");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadClassVoidArray2D() {
+		ClassUtils.loadClass("void[][]");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadClassVoidArray2DShort() {
+		ClassUtils.loadClass("[[V");
+	}
+
 	@Test
 	public void testFailureQuiet() {
 		assertNull(ClassUtils.loadClass("a.non.existent.class"));
