Stop using deprecated ConversionUtils methods

There is now the Types utility class instead.

Author: ctrueden

src/main/java/org/scijava/command/CommandModuleItem.java

@@ -253,7 +253,7 @@ private T tValue(final String value) {
 
 	private <D> D tValue(final String value, final Class<D> type) {
 		if (value == null || value.isEmpty()) return null;
-		final Class<D> saneType = ConversionUtils.getNonprimitiveType(type);
+		final Class<D> saneType = Types.box(type);
 		return ConversionUtils.convert(value, saneType);
 	}
 

src/main/java/org/scijava/convert/AbstractConverter.java

@@ -109,8 +109,8 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
-		final Class<?> saneSrc = ConversionUtils.getNonprimitiveType(src);
-		final Class<?> saneDest = ConversionUtils.getNonprimitiveType(dest);
+		final Class<?> saneSrc = Types.box(src);
+		final Class<?> saneDest = Types.box(dest);
 		return ConversionUtils.canCast(saneSrc, getInputType()) &&
 			ConversionUtils.canCast(getOutputType(), saneDest);
 	}

src/main/java/org/scijava/convert/DefaultConverter.java

@@ -97,7 +97,7 @@ public Object convert(final Object src, final Type dest) {
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		// ensure type is well-behaved, rather than a primitive type
-		final Class<T> saneDest = ConversionUtils.getNonprimitiveType(dest);
+		final Class<T> saneDest = Types.box(dest);
 
 		// Handle array types
 		if (isArray(dest)) {
@@ -153,7 +153,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 			final String s = (String) src;
 			if (s.isEmpty()) {
 				// return null for empty strings
-				return ConversionUtils.getNullValue(dest);
+				return Types.nullValue(dest);
 			}
 
 			// use first character when converting to Character
@@ -310,11 +310,10 @@ public boolean canConvert(final Class<?> src, final Type dest) {
 	@Deprecated
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		// ensure type is well-behaved, rather than a primitive type
-		final Class<?> saneDest = ConversionUtils.getNonprimitiveType(dest);
+		final Class<?> saneDest = Types.box(dest);
 
 		// OK for numerical conversions
-		if (ConversionUtils.canCast(ConversionUtils.getNonprimitiveType(src),
-			Number.class) &&
+		if (ConversionUtils.canCast(Types.box(src), Number.class) &&
 			(ClassUtils.isByte(dest) || ClassUtils.isDouble(dest) ||
 					ClassUtils.isFloat(dest) || ClassUtils.isInteger(dest) ||
 					ClassUtils.isLong(dest) || ClassUtils.isShort(dest)))

src/main/java/org/scijava/convert/NullConverter.java

@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * {@link Converter} implementation for handling {@code null} values. Performs
@@ -83,7 +83,7 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		if (dest == null) return null;
-		if (src == null) return ConversionUtils.getNullValue(dest);
+		if (src == null) return Types.nullValue(dest);
 
 		throw new IllegalArgumentException("Attempting non-null conversion: " +
 			src + " > " + dest + " using NullConverter.");

src/main/java/org/scijava/convert/NumberToNumberConverter.java

@@ -32,7 +32,7 @@
 
 package org.scijava.convert;
 
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * Converts numbers to numbers, and throws IllegalArgumentException for null or
@@ -53,7 +53,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 				getInputType().getSimpleName() + ", but got " +
 				src.getClass().getSimpleName());
 		}
-		if (ConversionUtils.getNonprimitiveType(dest) != getOutputType()) {
+		if (Types.box(dest) != getOutputType()) {
 			throw new IllegalArgumentException(
 				"Expected output class of " + getOutputType().getSimpleName() +
 				", but got " + dest.getSimpleName());

src/main/java/org/scijava/module/AbstractModuleInfo.java

@@ -40,6 +40,7 @@
 
 import org.scijava.AbstractUIDetails;
 import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * Abstract superclass of {@link ModuleInfo} implementation.
@@ -168,7 +169,7 @@ private <T> ModuleItem<T> castItem(final ModuleItem<?> item,
 	{
 		final Class<?> itemType = item.getType();
 		// if (!type.isAssignableFrom(itemType)) {
-		final Class<?> saneItemType = ConversionUtils.getNonprimitiveType(itemType);
+		final Class<?> saneItemType = Types.box(itemType);
 		if (!ConversionUtils.canCast(type, saneItemType)) {
 			throw new IllegalArgumentException("Type " + type.getName() +
 				" is incompatible with item of type " + itemType.getName());

src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java

@@ -40,7 +40,7 @@
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * A preprocessor plugin that populates default parameter values.
@@ -74,7 +74,7 @@ private <T> void assignDefaultValue(final Module module,
 		final ModuleItem<T> item)
 	{
 		if (module.isInputResolved(item.getName())) return;
-		final T nullValue = ConversionUtils.getNullValue(item.getType());
+		final T nullValue = Types.nullValue(item.getType());
 		if (!Objects.equals(item.getValue(module), nullValue)) return;
 		final T defaultValue = moduleService.getDefaultValue(item);
 		if (defaultValue == null) return;

src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java

@@ -38,7 +38,7 @@
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 import org.scijava.widget.InputHarvester;
 
 /**
@@ -93,7 +93,7 @@ private <T> T getBestValue(final Object prefValue,
 		if (defaultValue != null) {
 			return conversionService.convert(defaultValue, type);
 		}
-		return ConversionUtils.getNullValue(type);
+		return Types.nullValue(type);
 	}
 
 }

src/main/java/org/scijava/util/ClassUtils.java

@@ -683,16 +683,16 @@ public static boolean canCast(final Object obj, final Class<?> type) {
 		return ConversionUtils.canCast(obj, type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#getNonprimitiveType(Class)} */
+	/** @deprecated use {@link Types#box(Class)} */
 	@Deprecated
 	public static <T> Class<T> getNonprimitiveType(final Class<T> type) {
-		return ConversionUtils.getNonprimitiveType(type);
+		return Types.box(type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#getNullValue(Class)} */
+	/** @deprecated use {@link Types#nullValue(Class)} */
 	@Deprecated
 	public static <T> T getNullValue(final Class<T> type) {
-		return ConversionUtils.getNullValue(type);
+		return Types.nullValue(type);
 	}
 
 	/**

src/main/java/org/scijava/util/Types.java

@@ -59,8 +59,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.scijava.util.ConversionUtils;
-
 /**
  * Utility class for working with generic types, fields and methods.
  * <p>
@@ -1647,7 +1645,7 @@ private static Map<TypeVariable<?>, Type> getTypeArguments(Class<?> cls,
 				}
 
 				// work with wrapper the wrapper class instead of the primitive
-				cls = ConversionUtils.getNonprimitiveType(cls);
+				cls = Types.box(cls);
 			}
 
 			// create a copy of the incoming map, or an empty one if it's null