Minor fixes in Parallelization and DefaultTaskExecutorTest

Author: maarzt

src/main/java/net/imglib2/parallel/DefaultTaskExecutor.java

@@ -57,7 +57,7 @@ public class DefaultTaskExecutor implements TaskExecutor
 
 	private final IntSupplier getParallelism;
 
-	public DefaultTaskExecutor( ExecutorService executorService )
+	public DefaultTaskExecutor( final ExecutorService executorService )
 	{
 		this.executorService = executorService;
 		this.getParallelism = initGetParallelism();
@@ -89,9 +89,9 @@ public int getParallelism()
 	}
 
 	@Override
-	public void runAll( List< Runnable > tasks )
+	public void runAll( final List< Runnable > tasks )
 	{
-		List< Callable< Object > > callables = new ArrayList<>( tasks.size() );
+		final List< Callable< Object > > callables = new ArrayList<>( tasks.size() );
 		// use for-loop because stream with collect(Collectors.toList) is slow.
 		for ( Runnable task : tasks )
 			callables.add( Executors.callable( task ) );
@@ -106,9 +106,9 @@ public int suggestNumberOfTasks()
 	}
 
 	@Override
-	public < T > void forEach( List< ? extends T > parameters, Consumer< ? super T > task )
+	public < T > void forEach( final List< ? extends T > parameters, final Consumer< ? super T > task )
 	{
-		List< Callable< Object > > callables = new ArrayList<>( parameters.size() );
+		final List< Callable< Object > > callables = new ArrayList<>( parameters.size() );
 		// use for-loop because stream with collect(Collectors.toList) is slow.
 		for ( T parameter : parameters )
 			callables.add( () -> {
@@ -121,14 +121,14 @@ public < T > void forEach( List< ? extends T > parameters, Consumer< ? super T >
 	@Override
 	public < T, R > List< R > forEachApply( List< ? extends T > parameters, Function< ? super T, ? extends R > task )
 	{
-		List< Callable< R > > callables = new ArrayList<>( parameters.size() );
+		final List< Callable< R > > callables = new ArrayList<>( parameters.size() );
 		// use for-loop because stream with collect(Collectors.toList) is slow.
 		for ( T parameter : parameters )
 			callables.add( () -> task.apply( parameter ) );
 		try
 		{
-			List< Future< R > > futures = executorService.invokeAll( callables );
-			List< R > results = new ArrayList<>( futures.size() );
+			final List< Future< R > > futures = executorService.invokeAll( callables );
+			final List< R > results = new ArrayList<>( futures.size() );
 			for ( Future< R > future : futures )
 				results.add( future.get() );
 			return results;
@@ -139,11 +139,11 @@ public < T, R > List< R > forEachApply( List< ? extends T > parameters, Function
 		}
 	}
 
-	private void invokeAllIgnoreResults( List< Callable< Object > > callables )
+	private void invokeAllIgnoreResults( final List< Callable< Object > > callables )
 	{
 		try
 		{
-			List< Future< Object > > futures = executorService.invokeAll( callables );
+			final List< Future< Object > > futures = executorService.invokeAll( callables );
 			for ( Future< Object > future : futures )
 				future.get();
 		}

src/main/java/net/imglib2/parallel/Parallelization.java

@@ -256,11 +256,6 @@ public static Frame setExecutorRequiresReset( TaskExecutor taskExecutor )
 	public interface Frame extends AutoCloseable
 	{
 		@Override
-		default void close()
-		{
-			reset();
-		}
-
-		void reset();
+		void close(); // NB: Throws no exceptions
 	}
 }

src/test/java/net/imglib2/parallel/DefaultTaskExecutorTest.java

@@ -91,7 +91,7 @@ public void testForEach()
 	}
 
 	@Test
-	public void testForEachCollectResults()
+	public void testForEachApply()
 	{
 		List< Integer > parameters = Arrays.asList( 1, 2, 3 );
 		List< Integer > squared = twoThreads.forEachApply( parameters, i -> i * i );