Eliminate deprecated ConversionUtils casting usage

There is now the Types utility class instead.

Author: ctrueden

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

@@ -38,7 +38,6 @@
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.AbstractHandlerPlugin;
 import org.scijava.plugin.Parameter;
-import org.scijava.util.ConversionUtils;
 import org.scijava.util.Types;
 
 /**
@@ -111,8 +110,8 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
 		final Class<?> saneSrc = Types.box(src);
 		final Class<?> saneDest = Types.box(dest);
-		return ConversionUtils.canCast(saneSrc, getInputType()) &&
-			ConversionUtils.canCast(getOutputType(), saneDest);
+		return Types.isAssignable(saneSrc, getInputType()) &&
+			Types.isAssignable(getOutputType(), saneDest);
 	}
 
 	@Override

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

@@ -33,8 +33,6 @@
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.ClassUtils;
-import org.scijava.util.ConversionUtils;
 import org.scijava.util.Types;
 
 /**
@@ -45,19 +43,15 @@
 @Plugin(type = Converter.class, priority = Priority.EXTREMELY_HIGH)
 public class CastingConverter extends AbstractConverter<Object, Object> {
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public boolean canConvert(final Object src, final Class<?> dest) {
-		return ClassUtils.canCast(src, dest);
+		return Types.isInstance(src, dest);
 	}
 
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		// OK if the existing object can be casted
-		if (ConversionUtils.canCast(src, dest))
-			return true;
-
-		return false;
+		return dest != null && Types.isAssignable(src, dest);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -73,7 +67,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 		// very quickly in various subclassing cases, generic parameters
 		// resolved vs. propagated, etc.
 		final Class<?> c = Types.raw(dest);
-		return (T) ConversionUtils.cast(src, c);
+		return (T) Types.cast(src, c);
 	}
 
 	@Override

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

@@ -209,7 +209,9 @@ private Constructor<?> getConstructor(final Class<?> type,
 	{
 		for (final Constructor<?> ctor : type.getConstructors()) {
 			final Class<?>[] params = ctor.getParameterTypes();
-			if (params.length == 1 && ConversionUtils.canCast(argType, params[0])) {
+			if (params.length == 1 && //
+				Types.isAssignable(Types.box(argType), Types.box(params[0])))
+			{
 				return ctor;
 			}
 		}
@@ -221,7 +223,7 @@ private boolean isArray(final Type type) {
 	}
 
 	private boolean isCollection(final Type type) {
-		return ConversionUtils.canCast(Types.raw(type), Collection.class);
+		return Types.isAssignable(Types.raw(type), Collection.class);
 	}
 
 	private Object
@@ -267,8 +269,8 @@ private Collection<Object> createCollection(final Class<?> type) {
 		if (type.isInterface() || Modifier.isAbstract(type.getModifiers())) {
 			// We don't have a concrete class. If it's a set or a list, we use
 			// the typical default implementation. Otherwise we won't convert.
-			if (ConversionUtils.canCast(type, List.class)) return new ArrayList<>();
-			if (ConversionUtils.canCast(type, Set.class)) return new HashSet<>();
+			if (Types.isAssignable(type, List.class)) return new ArrayList<>();
+			if (Types.isAssignable(type, Set.class)) return new HashSet<>();
 			return null;
 		}
 
@@ -312,7 +314,7 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		final Class<?> saneDest = Types.box(dest);
 
 		// OK for numerical conversions
-		if (ConversionUtils.canCast(Types.box(src), Number.class) && //
+		if (Types.isAssignable(Types.box(src), Number.class) && //
 			(Types.isByte(dest) || Types.isDouble(dest) || Types.isFloat(dest) ||
 				Types.isInteger(dest) || Types.isLong(dest) || Types.isShort(dest)))
 		{
@@ -322,7 +324,7 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		// OK if string
 		if (saneDest == String.class) return true;
 
-		if (ConversionUtils.canCast(src, String.class)) {
+		if (Types.isAssignable(src, String.class)) {
 			// OK if source type is string and destination type is character
 			// (in this case, the first character of the string would be used)
 			if (saneDest == Character.class) return true;

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

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

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

@@ -665,22 +665,22 @@ public static boolean canConvert(final Object value, final Class<?> type) {
 		return ConversionUtils.canConvert(value, type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#cast(Object, Class)} */
+	/** @deprecated use {@link Types#cast(Object, Class)} */
 	@Deprecated
 	public static <T> T cast(final Object obj, final Class<T> type) {
-		return ConversionUtils.cast(obj, type);
+		return Types.cast(obj, type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#canCast(Class, Class)} */
+	/** @deprecated use {@link Types#isAssignable(Type, Type)} */
 	@Deprecated
 	public static boolean canCast(final Class<?> c, final Class<?> type) {
-		return ConversionUtils.canCast(c, type);
+		return Types.isAssignable(c, type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#canCast(Object, Class)} */
+	/** @deprecated use {@link Types#isInstance(Object, Class)} */
 	@Deprecated
 	public static boolean canCast(final Object obj, final Class<?> type) {
-		return ConversionUtils.canCast(obj, type);
+		return Types.isInstance(obj, type);
 	}
 
 	/** @deprecated use {@link Types#box(Class)} */

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

@@ -56,7 +56,7 @@ private NumberUtils() {
 	 */
 	public static Number toNumber(final Object value, final Class<?> type) {
 		final Object num = ConversionUtils.convert(value, type);
-		return num == null ? null : ConversionUtils.cast(num, Number.class);
+		return num == null ? null : Types.cast(num, Number.class);
 	}
 
 	public static BigDecimal asBigDecimal(final Number n) {

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

@@ -35,6 +35,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 
+import org.scijava.util.Types;
+
 /**
  * An extensible, generic array of {@code Object} elements. Note that this class
  * is a {@link PrimitiveArray} but of course Objects are not primitives.
@@ -184,7 +186,7 @@ public boolean contains(final Object o) {
 	@Override
 	public boolean remove(final Object o) {
 		if (!compatibleClass(o)) return false;
-		final E value = ConversionUtils.cast(o, objectClass);
+		final E value = Types.cast(o, objectClass);
 		return removeValue(value);
 	}
 
@@ -216,7 +218,7 @@ public boolean removeAll(final Collection<?> c) {
 		boolean changed = false;
 		for (final Object o : c) {
 			if (!compatibleClass(o)) continue;
-			final E value = ConversionUtils.cast(o, objectClass);
+			final E value = Types.cast(o, objectClass);
 			final boolean result = removeValue(value);
 			if (result) changed = true;
 		}