Pull BlockSupplier.threadSafe() implementation into AbstractBlockSupplier

Author: tpietzsch

src/main/java/net/imglib2/algorithm/blocks/AbstractBlockSupplier.java

@@ -0,0 +1,54 @@
+package net.imglib2.algorithm.blocks;
+
+import java.util.function.Supplier;
+
+import net.imglib2.type.NativeType;
+import net.imglib2.util.CloseableThreadLocal;
+
+/**
+ * Implements {@link BlockSupplier#threadSafe()} as a wrapper that makes {@link
+ * ThreadLocal} {@link BlockSupplier#independentCopy()} copies.
+ */
+public abstract class AbstractBlockSupplier< T extends NativeType< T > > implements BlockSupplier< T >
+{
+	private Supplier< BlockSupplier< T > > threadSafeSupplier;
+
+	@Override
+	public BlockSupplier< T > threadSafe()
+	{
+		if ( threadSafeSupplier == null )
+			threadSafeSupplier = CloseableThreadLocal.withInitial( this::independentCopy )::get;
+		return new BlockSupplier< T >()
+		{
+			@Override
+			public T getType()
+			{
+				return AbstractBlockSupplier.this.getType();
+			}
+
+			@Override
+			public int numDimensions()
+			{
+				return AbstractBlockSupplier.this.numDimensions();
+			}
+
+			@Override
+			public void copy( final long[] srcPos, final Object dest, final int[] size )
+			{
+				threadSafeSupplier.get().copy( srcPos, dest, size );
+			}
+
+			@Override
+			public BlockSupplier< T > independentCopy()
+			{
+				return AbstractBlockSupplier.this.independentCopy().threadSafe();
+			}
+
+			@Override
+			public BlockSupplier< T > threadSafe()
+			{
+				return this;
+			}
+		};
+	}
+}

src/main/java/net/imglib2/algorithm/blocks/ConcatenatedBlockSupplier.java

@@ -11,13 +11,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,13 +33,10 @@
  */
 package net.imglib2.algorithm.blocks;
 
-import java.util.function.Supplier;
-
 import net.imglib2.type.NativeType;
 import net.imglib2.util.Cast;
-import net.imglib2.util.CloseableThreadLocal;
 
-class ConcatenatedBlockSupplier< T extends NativeType< T > > implements BlockSupplier< T >
+class ConcatenatedBlockSupplier< T extends NativeType< T > > extends AbstractBlockSupplier< T >
 {
 	private final BlockSupplier< ? > p0;
 
@@ -49,8 +46,6 @@ class ConcatenatedBlockSupplier< T extends NativeType< T > > implements BlockSup
 
 	private final int numDimensions;
 
-	private Supplier< BlockSupplier< T > > threadSafeSupplier;
-
 	public < S extends NativeType< S > > ConcatenatedBlockSupplier(
 			final BlockSupplier< S > srcSupplier,
 			final UnaryBlockOperator< S, T > operator )
@@ -104,43 +99,4 @@ public BlockSupplier< T > independentCopy()
 	{
 		return new ConcatenatedBlockSupplier<>( this );
 	}
-
-	@Override
-	public BlockSupplier< T > threadSafe()
-	{
-		if ( threadSafeSupplier == null )
-			threadSafeSupplier = CloseableThreadLocal.withInitial( this::independentCopy )::get;
-		return new BlockSupplier< T >()
-		{
-			@Override
-			public T getType()
-			{
-				return type;
-			}
-
-			@Override
-			public int numDimensions()
-			{
-				return numDimensions;
-			}
-
-			@Override
-			public void copy( final long[] srcPos, final Object dest, final int[] size )
-			{
-				threadSafeSupplier.get().copy( srcPos, dest, size );
-			}
-
-			@Override
-			public BlockSupplier< T > independentCopy()
-			{
-				return ConcatenatedBlockSupplier.this.independentCopy().threadSafe();
-			}
-
-			@Override
-			public BlockSupplier< T > threadSafe()
-			{
-				return this;
-			}
-		};
-	}
 }

src/main/java/net/imglib2/algorithm/blocks/PrimitiveBlocksSupplier.java

@@ -11,13 +11,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,18 +33,13 @@
  */
 package net.imglib2.algorithm.blocks;
 
-import java.util.function.Supplier;
-
 import net.imglib2.blocks.PrimitiveBlocks;
 import net.imglib2.type.NativeType;
-import net.imglib2.util.CloseableThreadLocal;
 
-class PrimitiveBlocksSupplier< T extends NativeType< T > > implements BlockSupplier< T >
+class PrimitiveBlocksSupplier< T extends NativeType< T > > extends AbstractBlockSupplier< T >
 {
 	private final PrimitiveBlocks< T > blocks;
 
-	private Supplier< BlockSupplier< T > > threadSafeSupplier;
-
 	PrimitiveBlocksSupplier( final PrimitiveBlocks< T > blocks )
 	{
 		this.blocks = blocks;
@@ -80,43 +75,4 @@ public BlockSupplier< T > independentCopy()
 		final PrimitiveBlocks< T > blocksCopy = blocks.independentCopy();
 		return blocksCopy == blocks ? this : new PrimitiveBlocksSupplier<>( blocksCopy );
 	}
-
-	@Override
-	public BlockSupplier< T > threadSafe()
-	{
-		if ( threadSafeSupplier == null )
-			threadSafeSupplier = CloseableThreadLocal.withInitial( this::independentCopy )::get;
-		return new BlockSupplier< T >()
-		{
-			@Override
-			public T getType()
-			{
-				return blocks.getType();
-			}
-
-			@Override
-			public int numDimensions()
-			{
-				return blocks.numDimensions();
-			}
-
-			@Override
-			public void copy( final long[] srcPos, final Object dest, final int[] size )
-			{
-				threadSafeSupplier.get().copy( srcPos, dest, size );
-			}
-
-			@Override
-			public BlockSupplier< T > independentCopy()
-			{
-				return PrimitiveBlocksSupplier.this.independentCopy().threadSafe();
-			}
-
-			@Override
-			public BlockSupplier< T > threadSafe()
-			{
-				return this;
-			}
-		};
-	}
 }

src/main/java/net/imglib2/algorithm/blocks/TilingBlockSupplier.java

@@ -33,14 +33,11 @@
  */
 package net.imglib2.algorithm.blocks;
 
-import java.util.function.Supplier;
-
 import net.imglib2.blocks.SubArrayCopy;
 import net.imglib2.blocks.TempArray;
 import net.imglib2.type.NativeType;
 import net.imglib2.type.PrimitiveType;
 import net.imglib2.util.Cast;
-import net.imglib2.util.CloseableThreadLocal;
 import net.imglib2.util.Intervals;
 import net.imglib2.util.Util;
 
@@ -70,7 +67,7 @@
  * @param <P>
  * 		corresponding primitive array type
  */
-class TilingBlockSupplier< T extends NativeType< T >, P > implements BlockSupplier< T >
+class TilingBlockSupplier< T extends NativeType< T >, P > extends AbstractBlockSupplier< T >
 {
 	private final BlockSupplier< T > p0;
 
@@ -83,8 +80,6 @@ class TilingBlockSupplier< T extends NativeType< T >, P > implements BlockSuppli
 
 	private final SubArrayCopy.Typed< P, P > subArrayCopy;
 
-	private Supplier< BlockSupplier< T > > threadSafeSupplier;
-
 	final int[] tile_pos_in_dest;
 	final long[] tile_pos_in_src;
 	final int[] tile_origin;
@@ -202,43 +197,4 @@ public BlockSupplier< T > independentCopy()
 	{
 		return new TilingBlockSupplier<>( this );
 	}
-
-	@Override
-	public BlockSupplier< T > threadSafe()
-	{
-		if ( threadSafeSupplier == null )
-			threadSafeSupplier = CloseableThreadLocal.withInitial( this::independentCopy )::get;
-		return new BlockSupplier< T >()
-		{
-			@Override
-			public T getType()
-			{
-				return p0.getType();
-			}
-
-			@Override
-			public int numDimensions()
-			{
-				return p0.numDimensions();
-			}
-
-			@Override
-			public void copy( final long[] srcPos, final Object dest, final int[] size )
-			{
-				threadSafeSupplier.get().copy( srcPos, dest, size );
-			}
-
-			@Override
-			public BlockSupplier< T > independentCopy()
-			{
-				return TilingBlockSupplier.this.independentCopy().threadSafe();
-			}
-
-			@Override
-			public BlockSupplier< T > threadSafe()
-			{
-				return this;
-			}
-		};
-	}
 }