Merge pull request #17 from scijava/check-compatible-inputs

Author: imagejan

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>19.1.1</version>
+		<version>23.1.1</version>
 		<relativePath />
 	</parent>
 

src/main/java/org/scijava/batch/FileBatchService.java

@@ -5,6 +5,7 @@
 
 import org.scijava.Priority;
 import org.scijava.command.CommandService;
+import org.scijava.log.LogService;
 import org.scijava.module.ModuleInfo;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -15,6 +16,9 @@
 public final class FileBatchService extends AbstractService implements
 		BatchService {
 
+	@Parameter
+	private LogService log;
+	
 	@Parameter
 	private CommandService commandService;
 
@@ -28,6 +32,11 @@ public boolean supports(Class<?> type) {
 
 	@Override
 	public void run(ModuleInfo moduleInfo) {
+		// check if moduleInfo has batchable inputs
+		if (batchableInputs(moduleInfo).isEmpty()) {
+			log.error("No compatible inputs (of type File) found.");
+			return;
+		}
 		// Call ModuleBatchProcessor with input moduleInfo
 		HashMap<String, Object> inputMap = new HashMap<>();
 		inputMap.put("moduleInfo", moduleInfo);

src/test/java/org/scijava/batch/BatchServiceTest.java

@@ -2,10 +2,12 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.StringReader;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import net.imagej.table.Table;
@@ -17,6 +19,7 @@
 import org.scijava.command.CommandInfo;
 import org.scijava.command.CommandService;
 import org.scijava.module.Module;
+import org.scijava.module.ModuleItem;
 import org.scijava.module.ModuleService;
 import org.scijava.script.ScriptInfo;
 import org.scijava.service.SciJavaService;
@@ -44,6 +47,37 @@ public void testContext() {
 				.getService(BatchService.class);
 		assertNotNull(batchService);
 	}
+	
+	@Test
+	public void testBatchableFileInputs() {
+		String script = "" //
+			+ "#@ File fileInput\n" //
+			+ "#@ String stringInput\n" //
+			+ "#@ Integer integerInput\n" //
+			+ "#@ Double doubleInput\n" //
+			+ "";
+		ScriptInfo scriptInfo = createInfo(script);
+		BatchService batchService = context.getService(BatchService.class);
+		List<ModuleItem<?>> compatibleInputs = batchService.batchableInputs(
+			scriptInfo);
+		assertEquals("Wrong number of batchable inputs", 1, compatibleInputs
+			.size());
+	}
+
+	@Test
+	public void testNoCompatibleInputs() {
+		String script = "" //
+			+ "#@ String stringInput\n" //
+			+ "#@ Integer integerInput\n" //
+			+ "#@ Double doubleInput\n" //
+			+ "";
+		ScriptInfo scriptInfo = createInfo(script);
+		BatchService batchService = context.getService(BatchService.class);
+		List<ModuleItem<?>> compatibleInputs = batchService.batchableInputs(
+			scriptInfo);
+		assertTrue("Wrong inputs found to be compatible", compatibleInputs
+			.isEmpty());
+	}
 
 	@Test
 	public void testModuleBatchProcessor() {
@@ -52,9 +86,7 @@ public void testModuleBatchProcessor() {
 				+ "#@output result\n" //
 				+ "" //
 				+ "result = input";
-		StringReader scriptReader = new StringReader(script);
-		ScriptInfo scriptInfo = new ScriptInfo(context, "Foo.groovy",
-				scriptReader);
+		ScriptInfo scriptInfo = createInfo(script);
 
 		assertEquals("Wrong script language", "Groovy", scriptInfo
 				.getLanguage().getLanguageName());
@@ -90,4 +122,11 @@ public void testModuleBatchProcessor() {
 				outputs.getColumnHeader(0));
 		assertEquals("Wrong file name", "quo.txt", outputs.getRowHeader(2));
 	}
+
+	/* --- Helper methods --- */
+
+	private ScriptInfo createInfo(String script) {
+		StringReader scriptReader = new StringReader(script);
+		return new ScriptInfo(context, "Foo.groovy", scriptReader);
+	}
 }