Stop using deprecated ClassUtils.loadClass

There is now Types.load instead.

Author: ctrueden

src/main/java/org/scijava/Context.java

@@ -52,6 +52,7 @@
 import org.scijava.service.ServiceIndex;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.Query;
+import org.scijava.util.Types;
 
 /**
  * Top-level SciJava application context, which initializes and maintains a list
@@ -323,7 +324,7 @@ public <S extends Service> S service(final Class<S> c) {
 	 *           service.
 	 */
 	public Service service(final String className) {
-		final Class<?> c = ClassUtils.loadClass(className, false);
+		final Class<?> c = Types.load(className, false);
 		if (!Service.class.isAssignableFrom(c)) {
 			throw new IllegalArgumentException("Not a service class: " + c.getName());
 		}
@@ -342,7 +343,7 @@ public <S extends Service> S getService(final Class<S> c) {
 
 	/** Gets the service of the given class name (useful for scripts). */
 	public Service getService(final String className) {
-		final Class<?> c = ClassUtils.loadClass(className);
+		final Class<?> c = Types.load(className);
 		if (c == null) return null;
 		if (!Service.class.isAssignableFrom(c)) return null; // not a service class
 		@SuppressWarnings("unchecked")

src/main/java/org/scijava/main/DefaultMainService.java

@@ -42,7 +42,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 
 /**
  * Default implementation of {@link MainService}.
@@ -102,7 +102,7 @@ public String[] args() {
 		@Override
 		public void exec() {
 			try {
-				final Class<?> mainClass = ClassUtils.loadClass(className, false);
+				final Class<?> mainClass = Types.load(className, false);
 				final Method main = mainClass.getMethod("main", String[].class);
 				main.invoke(null, new Object[] { args });
 			}

src/main/java/org/scijava/main/run/MainCodeRunner.java

@@ -42,7 +42,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.run.AbstractCodeRunner;
 import org.scijava.run.CodeRunner;
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 
 /**
  * Executes the given class's {@code main} method.
@@ -108,7 +108,7 @@ private Method getMain(final Object code) {
 
 	private Class<?> getClass(final Object code) {
 		if (code instanceof Class) return (Class<?>) code;
-		if (code instanceof String) return ClassUtils.loadClass((String) code);
+		if (code instanceof String) return Types.load((String) code);
 		return null;
 	}
 

src/main/java/org/scijava/menu/ShadowMenu.java

@@ -57,6 +57,7 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.MiscUtils;
+import org.scijava.util.Types;
 
 /**
  * A tree representing a menu structure independent of any particular user
@@ -234,7 +235,7 @@ public URL getIconURL() {
 		}
 		final String className = moduleInfo.getDelegateClassName();
 		try {
-			final Class<?> c = ClassUtils.loadClass(className, false);
+			final Class<?> c = Types.load(className, false);
 			final URL iconURL = c.getResource(iconPath);
 			if (iconURL == null) {
 				if (log != null) log.error("Could not load icon: " + iconPath);

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

@@ -63,7 +63,7 @@
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
 import org.scijava.thread.ThreadService;
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 
 /**
  * Default service for keeping track of and executing available modules.
@@ -370,7 +370,7 @@ private List<? extends PostprocessorPlugin> post(final boolean process) {
 	 * {@link ModuleInfo} argument is called).
 	 */
 	private Module getRegisteredModuleInstance(final ModuleInfo info) {
-		final Class<?> type = ClassUtils.loadClass(info.getDelegateClassName());
+		final Class<?> type = Types.load(info.getDelegateClassName());
 		if (type == null || !Module.class.isAssignableFrom(type)) return null;
 
 		// the module metadata's delegate class extends Module, so there is hope

src/main/java/org/scijava/plugin/PluginInfo.java

@@ -47,6 +47,7 @@
 import org.scijava.input.Accelerator;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.StringMaker;
+import org.scijava.util.Types;
 import org.scijava.util.VersionUtils;
 
 /**
@@ -282,7 +283,7 @@ public String getClassName() {
 	public Class<? extends PT> loadClass() throws InstantiableException {
 		if (pluginClass == null) {
 			try {
-				final Class<?> c = ClassUtils.loadClass(className, classLoader, false);
+				final Class<?> c = Types.load(className, classLoader, false);
 				@SuppressWarnings("unchecked")
 				final Class<? extends PT> typedClass = (Class<? extends PT>) c;
 				pluginClass = typedClass;

src/main/java/org/scijava/script/DefaultScriptService.java

@@ -65,7 +65,6 @@
 import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.script.process.ScriptProcessorService;
 import org.scijava.service.Service;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.ColorRGB;
 import org.scijava.util.ColorRGBA;
 import org.scijava.util.Types;
@@ -209,7 +208,7 @@ public synchronized Class<?> lookupClass(final String alias)
 		}
 
 		try {
-			final Class<?> c = ClassUtils.loadClass(alias, false);
+			final Class<?> c = Types.load(alias, false);
 			aliasMap().put(alias, c);
 			return c;
 		}

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

@@ -37,6 +37,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.scijava.util.Types;
+
 /**
  * Useful methods for obtaining details of the SciJava application environment.
  * 
@@ -51,7 +53,7 @@ public final class AppUtils {
 		// Get the class whose main method launched the application. The heuristic
 		// will fail if the main thread has terminated before this class loads.
 		final String className = DebugUtils.getMainClassName();
-		mainClass = className == null ? null : ClassUtils.loadClass(className);
+		mainClass = className == null ? null : Types.load(className);
 	}
 
 	private AppUtils() {

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

@@ -98,7 +98,7 @@ public static boolean hasClass(final String className) {
 	public static boolean hasClass(final String className,
 		final ClassLoader classLoader)
 	{
-		return loadClass(className, classLoader) != null;
+		return Types.load(className, classLoader) != null;
 	}
 
 	/**
@@ -141,7 +141,7 @@ public static URL getLocation(final String className) {
 	public static URL getLocation(final String className,
 		final ClassLoader classLoader)
 	{
-		final Class<?> c = loadClass(className, classLoader);
+		final Class<?> c = Types.load(className, classLoader);
 		return getLocation(c);
 	}
 
@@ -694,7 +694,7 @@ public static Type getGenericType(final Field field, final Class<?> type) {
 	/** @deprecated Use {@link Types#field} instead. */
 	@Deprecated
 	public static Field getField(final String className, final String fieldName) {
-		return Types.field(loadClass(className), fieldName);
+		return Types.field(Types.load(className), fieldName);
 	}
 
 	/** @deprecated Use {@link Types#field} instead. */