Generalize CodeRunner from Class to Object

Sometimes we want to run Class objects. Sometimes String identifiers.
Sometimes maybe other things. Rather than overtype things with a new
interface, let's just use good ol' Object here, for flexibility.

Author: ctrueden

src/main/java/org/scijava/command/run/CommandCodeRunner.java

@@ -56,17 +56,26 @@ public class CommandCodeRunner extends AbstractCodeRunner {
 	// -- CodeRunner methods --
 
 	@Override
-	public void run(final Class<?> c, final Object... args) {
-		@SuppressWarnings("unchecked")
-		final Class<? extends Command> commandClass =  (Class<? extends Command>) c;
-		commandService.run(commandClass, true, args);
+	public void run(final Object code, final Object... args) {
+		commandService.run(getCommandClass(code), true, args);
 	}
 
 	// -- Typed methods --
 
 	@Override
-	public boolean supports(final Class<?> c) {
-		return Command.class.isAssignableFrom(c);
+	public boolean supports(final Object code) {
+		return getCommandClass(code) != null;
+	}
+
+	// -- Helper methods --
+
+	private Class<? extends Command> getCommandClass(final Object code) {
+		if (!(code instanceof Class)) return null;
+		final Class<?> c = (Class<?>) code;
+		if (!Command.class.isAssignableFrom(c)) return null;
+		@SuppressWarnings("unchecked")
+		final Class<? extends Command> commandClass = (Class<? extends Command>) c;
+		return commandClass;
 	}
 
 }

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

@@ -40,6 +40,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.run.AbstractCodeRunner;
 import org.scijava.run.CodeRunner;
+import org.scijava.util.ClassUtils;
 
 /**
  * Executes the given class's {@code main} method.
@@ -55,12 +56,12 @@ public class MainCodeRunner extends AbstractCodeRunner {
 	// -- CodeRunner methods --
 
 	@Override
-	public void run(final Class<?> c, final Object... args)
+	public void run(final Object code, final Object... args)
 		throws InvocationTargetException
 	{
 		final Object[] sArgs = stringify(args);
 		try {
-			getMain(c).invoke(null, new Object[] { sArgs });
+			getMain(code).invoke(null, new Object[] { sArgs });
 		}
 		catch (final IllegalArgumentException exc) {
 			throw new InvocationTargetException(exc);
@@ -73,13 +74,15 @@ public void run(final Class<?> c, final Object... args)
 	// -- Typed methods --
 
 	@Override
-	public boolean supports(final Class<?> c) {
-		return getMain(c) != null;
+	public boolean supports(final Object code) {
+		return getMain(code) != null;
 	}
 
 	// -- Helper methods --
 
-	private Method getMain(final Class<?> c) {
+	private Method getMain(final Object code) {
+		final Class<?> c = getClass(code);
+		if (c == null) return null;
 		try {
 			return c.getMethod("main", String[].class);
 		}
@@ -93,6 +96,12 @@ private Method getMain(final Class<?> c) {
 		}
 	}
 
+	private Class<?> getClass(final Object code) {
+		if (code instanceof Class) return (Class<?>) code;
+		if (code instanceof String) return ClassUtils.loadClass((String) code);
+		return null;
+	}
+
 	/** Ensures each element is a {@link String}. */
 	private String[] stringify(final Object... o) {
 		final String[] s;

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

@@ -39,15 +39,14 @@
  * @author Curtis Rueden
  */
 public abstract class AbstractCodeRunner extends
-	AbstractHandlerPlugin<Class<?>> implements CodeRunner
+	AbstractHandlerPlugin<Object> implements CodeRunner
 {
 
 	// -- Typed methods --
 
 	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Class<Class<?>> getType() {
-		return (Class) Class.class;
+	public Class<Object> getType() {
+		return Object.class;
 	}
 
 }

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

@@ -33,15 +33,17 @@
 
 import java.lang.reflect.InvocationTargetException;
 
+import org.scijava.Identifiable;
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
 
 /**
  * A plugin which extends the {@link RunService}'s execution handling. A
- * {@link CodeRunner} knows how to execute certain classes, beyond just Java's
- * usual {@code main} method.
+ * {@link CodeRunner} knows how to execute code of a certain form, such as the
+ * {@code main} method of a Java {@link Class}, or an {@link Identifiable}
+ * SciJava module.
  * <p>
- * Class runner plugins discoverable at runtime must implement this interface
+ * Code runner plugins discoverable at runtime must implement this interface
  * and be annotated with @{@link Plugin} with attribute {@link Plugin#type()} =
  * {@link CodeRunner}.class. While it possible to create a class runner plugin
  * merely by implementing this interface, it is encouraged to instead extend
@@ -50,9 +52,12 @@
  * 
  * @author Curtis Rueden
  */
-public interface CodeRunner extends HandlerPlugin<Class<?>> {
+public interface CodeRunner extends HandlerPlugin<Object> {
 
-	/** Executes the given class, with the specified arguments. */
-	void run(Class<?> c, Object... args) throws InvocationTargetException;
+	/**
+	 * Executes the code identified by the given object, passing the
+	 * specified arguments as inputs.
+	 */
+	void run(Object code, Object... args) throws InvocationTargetException;
 
 }

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

@@ -32,6 +32,7 @@
 package org.scijava.run;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
 
 import org.scijava.log.LogService;
 import org.scijava.plugin.AbstractHandlerService;
@@ -46,7 +47,7 @@
  */
 @Plugin(type = Service.class)
 public class DefaultRunService extends
-	AbstractHandlerService<Class<?>, CodeRunner> implements RunService
+	AbstractHandlerService<Object, CodeRunner> implements RunService
 {
 
 	@Parameter
@@ -55,16 +56,29 @@ public class DefaultRunService extends
 	// -- RunService methods --
 
 	@Override
-	public void run(final Class<?> c, final Object... args)
+	public void run(final Object code, final Object... args)
 		throws InvocationTargetException
 	{
 		for (final CodeRunner runner : getInstances()) {
-			if (runner.supports(c)) {
-				runner.run(c);
+			if (runner.supports(code)) {
+				runner.run(code, args);
 				return;
 			}
 		}
-		throw new IllegalArgumentException("Unknown class type: " + c.getName());
+		throw new IllegalArgumentException("Unknown code type: " + code);
+	}
+
+	@Override
+	public void run(final Object code, final Map<String, Object> inputMap)
+		throws InvocationTargetException
+	{
+		for (final CodeRunner runner : getInstances()) {
+			if (runner.supports(code)) {
+				runner.run(code, inputMap);
+				return;
+			}
+		}
+		throw new IllegalArgumentException("Unknown code type: " + code);
 	}
 
 	// -- PTService methods --
@@ -77,9 +91,8 @@ public Class<CodeRunner> getPluginType() {
 	// -- Typed methods --
 
 	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Class<Class<?>> getType() {
-		return (Class) Class.class;
+	public Class<Object> getType() {
+		return Object.class;
 	}
 
 }

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

@@ -32,6 +32,7 @@
 package org.scijava.run;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
 
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
@@ -42,13 +43,20 @@
  * @author Curtis Rueden
  */
 public interface RunService extends
-	HandlerService<Class<?>, CodeRunner>, SciJavaService
+	HandlerService<Object, CodeRunner>, SciJavaService
 {
 
 	/**
-	 * Executes the given class using the most appropriate handler, passing the
-	 * given arguments to the execution.
+	 * Executes the given code using the most appropriate handler, passing the
+	 * specified arguments as inputs.
 	 */
-	void run(Class<?> c, Object... args) throws InvocationTargetException;
+	void run(Object code, Object... args) throws InvocationTargetException;
+
+	/**
+	 * Executes the given code using the most appropriate handler, passing the
+	 * arguments in the specified map as inputs.
+	 */
+	void run(Object code, Map<String, Object> inputMap)
+		throws InvocationTargetException;
 
 }