Migrate ConversionUtils.getNullValue to Types

ctrueden · ctrueden · commit 4e74d2b611d0 · 2018-03-02T16:02:54.000-06:00
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -218,27 +218,6 @@ public static <T> Class<T> getNonprimitiveType(final Class<T> type) {
 		return result;
 	}
 
-	/**
-	 * Gets the "null" value for the given type. For non-primitives, this will
-	 * actually be null. For primitives, it will be zero for numeric types, false
-	 * for boolean, and the null character for char.
-	 */
-	public static <T> T getNullValue(final Class<T> type) {
-		final Object defaultValue;
-		if (type == boolean.class) defaultValue = false;
-		else if (type == byte.class) defaultValue = (byte) 0;
-		else if (type == char.class) defaultValue = '\0';
-		else if (type == double.class) defaultValue = 0d;
-		else if (type == float.class) defaultValue = 0f;
-		else if (type == int.class) defaultValue = 0;
-		else if (type == long.class) defaultValue = 0L;
-		else if (type == short.class) defaultValue = (short) 0;
-		else defaultValue = null;
-		@SuppressWarnings("unchecked")
-		final T result = (T) defaultValue;
-		return result;
-	}
-
 	// -- ConvertService setter --
 
 	/**
@@ -329,6 +308,12 @@ public static Class<?> getComponentClass(final Type type) {
 		return Types.raw(Types.component(type));
 	}
 
+	/** @deprecated Use {@link Types#nullValue} instead. */
+	@Deprecated
+	public static <T> T getNullValue(final Class<T> type) {
+		return Types.nullValue(type);
+	}
+
 	//-- Helper methods --
 
 	/**
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -307,6 +307,27 @@ public static boolean isText(final Class<?> type) {
 		return String.class.isAssignableFrom(type) || isCharacter(type);
 	}
 
+	/**
+	 * Gets the "null" value for the given type. For non-primitives, this will
+	 * actually be null. For primitives, it will be zero for numeric types, false
+	 * for boolean, and the null character for char.
+	 */
+	public static <T> T nullValue(final Class<T> type) {
+		final Object defaultValue;
+		if (type == boolean.class) defaultValue = false;
+		else if (type == byte.class) defaultValue = (byte) 0;
+		else if (type == char.class) defaultValue = '\0';
+		else if (type == double.class) defaultValue = 0d;
+		else if (type == float.class) defaultValue = 0f;
+		else if (type == int.class) defaultValue = 0;
+		else if (type == long.class) defaultValue = 0L;
+		else if (type == short.class) defaultValue = (short) 0;
+		else defaultValue = null;
+		@SuppressWarnings("unchecked")
+		final T result = (T) defaultValue;
+		return result;
+	}
+
 	public static Field field(final Class<?> c, final String name) {
 		if (c == null) throw new IllegalArgumentException("No such field: " + name);
 		try {
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -198,60 +198,6 @@ public void testGetNonprimitiveType() {
 		}
 	}
 
-	/** Tests {@link ConversionUtils#getNullValue(Class)}. */
-	@Test
-	public void testGetNullValue() {
-		final boolean booleanNull = ConversionUtils.getNullValue(boolean.class);
-		assertFalse(booleanNull);
-
-		final byte byteNull = ConversionUtils.getNullValue(byte.class);
-		assertEquals(0, byteNull);
-
-		final char charNull = ConversionUtils.getNullValue(char.class);
-		assertEquals('\0', charNull);
-
-		final double doubleNull = ConversionUtils.getNullValue(double.class);
-		assertEquals(0.0, doubleNull, 0.0);
-
-		final float floatNull = ConversionUtils.getNullValue(float.class);
-		assertEquals(0f, floatNull, 0f);
-
-		final int intNull = ConversionUtils.getNullValue(int.class);
-		assertEquals(0, intNull);
-
-		final long longNull = ConversionUtils.getNullValue(long.class);
-		assertEquals(0, longNull);
-
-		final short shortNull = ConversionUtils.getNullValue(short.class);
-		assertEquals(0, shortNull);
-
-		final Void voidNull = ConversionUtils.getNullValue(void.class);
-		assertNull(voidNull);
-
-		final Class<?>[] types = { //
-			Boolean.class, Byte.class, Character.class, Double.class, //
-				Float.class, Integer.class, Long.class, Short.class, //
-				Void.class, //
-				String.class, //
-				Number.class, BigInteger.class, BigDecimal.class, //
-				boolean[].class, byte[].class, char[].class, double[].class, //
-				float[].class, int[].class, long[].class, short[].class, //
-				Boolean[].class, Byte[].class, Character[].class, Double[].class, //
-				Float[].class, Integer[].class, Long[].class, Short[].class, //
-				Void[].class, //
-				Object.class, Object[].class, String[].class, //
-				Object[][].class, String[][].class, //
-				Collection.class, //
-				List.class, ArrayList.class, LinkedList.class, //
-				Set.class, HashSet.class, //
-				Map.class, HashMap.class, //
-				Collection[].class, List[].class, Set[].class, Map[].class };
-		for (final Class<?> c : types) {
-			final Object nullValue = ConversionUtils.getNullValue(c);
-			assertNull("Expected null for " + c.getName(), nullValue);
-		}
-	}
-
 	/**
 	 * Tests populating a primitive array.
 	 */
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
@@ -33,6 +33,7 @@
 package org.scijava.util;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -42,8 +43,16 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.junit.Test;
 
@@ -182,6 +191,60 @@ public void testRaws() {
 			Serializable.class, Cloneable.class);
 	}
 
+	/** Tests {@link Types#nullValue(Class)}. */
+	@Test
+	public void testNullValue() {
+		final boolean booleanNull = Types.nullValue(boolean.class);
+		assertFalse(booleanNull);
+
+		final byte byteNull = Types.nullValue(byte.class);
+		assertEquals(0, byteNull);
+
+		final char charNull = Types.nullValue(char.class);
+		assertEquals('\0', charNull);
+
+		final double doubleNull = Types.nullValue(double.class);
+		assertEquals(0.0, doubleNull, 0.0);
+
+		final float floatNull = Types.nullValue(float.class);
+		assertEquals(0f, floatNull, 0f);
+
+		final int intNull = Types.nullValue(int.class);
+		assertEquals(0, intNull);
+
+		final long longNull = Types.nullValue(long.class);
+		assertEquals(0, longNull);
+
+		final short shortNull = Types.nullValue(short.class);
+		assertEquals(0, shortNull);
+
+		final Void voidNull = Types.nullValue(void.class);
+		assertNull(voidNull);
+
+		final Class<?>[] types = { //
+			Boolean.class, Byte.class, Character.class, Double.class, //
+			Float.class, Integer.class, Long.class, Short.class, //
+			Void.class, //
+			String.class, //
+			Number.class, BigInteger.class, BigDecimal.class, //
+			boolean[].class, byte[].class, char[].class, double[].class, //
+			float[].class, int[].class, long[].class, short[].class, //
+			Boolean[].class, Byte[].class, Character[].class, Double[].class, //
+			Float[].class, Integer[].class, Long[].class, Short[].class, //
+			Void[].class, //
+			Object.class, Object[].class, String[].class, //
+			Object[][].class, String[][].class, //
+			Collection.class, //
+			List.class, ArrayList.class, LinkedList.class, //
+			Set.class, HashSet.class, //
+			Map.class, HashMap.class, //
+			Collection[].class, List[].class, Set[].class, Map[].class };
+		for (final Class<?> c : types) {
+			final Object nullValue = Types.nullValue(c);
+			assertNull("Expected null for " + c.getName(), nullValue);
+		}
+	}
+
 	/** Tests {@link Types#field}. */
 	@Test
 	public void testField() {
