Fix a bunch of deprecated ImgFactory calls

ctrueden · ctrueden · commit dc0e97193bd2 · 2019-09-22T19:45:05.000+02:00
Accomplished via:

  sed -i '' -e 's/$new [A-Za-z]*ImgFactory&lt;$[^&gt;]*&gt;().create($.*$, $new [A-Za-z]*Type()$);/\1&gt;(\3).create(\2);/' $(git grep -l 'new .*ImgFactory&lt;[^&gt;]*&gt;()')
diff --git a/src/test/java/net/imagej/ops/copy/CopyIITest.java b/src/test/java/net/imagej/ops/copy/CopyIITest.java
@@ -56,7 +56,7 @@ public class CopyIITest extends AbstractOpTest {
 
 	@Before
 	public void createData() {
-		input = new PlanarImgFactory<DoubleType>().create(new int[] { 120, 100 }, new DoubleType());
+		input = new PlanarImgFactory<>(new DoubleType()).create(new int[] { 120, 100 });
 
 		final MersenneTwisterFast r = new MersenneTwisterFast(System.currentTimeMillis());
 
@@ -85,7 +85,7 @@ public void copyRAINoOutputTest() {
 
 	@Test
 	public void copyTypeTest() {
-		Img<FloatType> inputFloat = new ArrayImgFactory<FloatType>().create(new int[] { 120, 100 }, new FloatType());
+		Img<FloatType> inputFloat = new ArrayImgFactory<>(new FloatType()).create(new int[] { 120, 100 });
 
 		@SuppressWarnings("unchecked")
 		Img<FloatType> output = (Img<FloatType>) ops.run("copy.iterableInterval", inputFloat);
diff --git a/src/test/java/net/imagej/ops/copy/CopyRAITest.java b/src/test/java/net/imagej/ops/copy/CopyRAITest.java
@@ -78,7 +78,7 @@ public class CopyRAITest extends AbstractOpTest {
 
 	@Before
 	public void createData() {
-		input = new ArrayImgFactory<UnsignedByteType>().create(new int[] { 120, 100 }, new UnsignedByteType());
+		input = new ArrayImgFactory<>(new UnsignedByteType()).create(new int[] { 120, 100 });
 
 		final MersenneTwisterFast r = new MersenneTwisterFast(System.currentTimeMillis());
 
diff --git a/src/test/java/net/imagej/ops/deconvolve/DeconvolveTest.java b/src/test/java/net/imagej/ops/deconvolve/DeconvolveTest.java
@@ -65,7 +65,7 @@ public void testDeconvolve() {
 		int[] size = new int[] { 225, 167 };
 
 		// create an input with a small sphere at the center
-		Img<FloatType> in = new ArrayImgFactory<FloatType>().create(size, new FloatType());
+		Img<FloatType> in = new ArrayImgFactory<>(new FloatType()).create(size);
 		placeSphereInCenter(in);
 
 		// crop the image so the sphere is truncated at the corner
diff --git a/src/test/java/net/imagej/ops/transform/addDimensionView/AddDimensionViewTest.java b/src/test/java/net/imagej/ops/transform/addDimensionView/AddDimensionViewTest.java
@@ -60,7 +60,7 @@ public class AddDimensionViewTest extends AbstractTestEnvironment {
 
 	@Test
 	public void addDimensionTest() {
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		MixedTransformView<DoubleType> il2 = Views.addDimension((RandomAccessible<DoubleType>) img);
 
@@ -84,7 +84,7 @@ public void addDimensionTest() {
 
 	@Test
 	public void addDimensionMinMaxTest() {
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 		long max = 20;
 		long min = 0;
 
diff --git a/src/test/java/net/imagej/ops/transform/collapseView/CollapseViewTest.java b/src/test/java/net/imagej/ops/transform/collapseView/CollapseViewTest.java
@@ -61,7 +61,7 @@ public class CollapseViewTest extends AbstractTestEnvironment {
 
 	@Test
 	public void defaultCollapseTest() {
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		Function<RandomAccessibleInterval<DoubleType>, CompositeIntervalView<DoubleType, ? extends GenericComposite<DoubleType>>> collapseFunc = Functions
 				.unary(ops, "transform.collapseView", new Nil<RandomAccessibleInterval<DoubleType>>() {
@@ -77,7 +77,7 @@ public void defaultCollapseTest() {
 	@Test
 	public void collapseRATest() {
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10, 10 });
 
 		Function<RandomAccessible<DoubleType>, CompositeView<DoubleType, ? extends GenericComposite<DoubleType>>> collapseFunc = Functions
 				.unary(ops, "transform.collapseView", new Nil<RandomAccessible<DoubleType>>() {
diff --git a/src/test/java/net/imagej/ops/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java b/src/test/java/net/imagej/ops/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java
@@ -63,7 +63,7 @@ public void dropSingletonDimensionsTest() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 1, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 1, 10 });
 
 		RandomAccessibleInterval<DoubleType> il2 = Views.dropSingletonDimensions(img);
 
diff --git a/src/test/java/net/imagej/ops/transform/extendBorderView/ExtendBorderViewTest.java b/src/test/java/net/imagej/ops/transform/extendBorderView/ExtendBorderViewTest.java
@@ -67,7 +67,7 @@ public void extendBorderTest() {
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		RandomAccess<DoubleType> il2 = Views.extendBorder(img).randomAccess();
 
diff --git a/src/test/java/net/imagej/ops/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java b/src/test/java/net/imagej/ops/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java
@@ -67,7 +67,7 @@ public void extendMirrorDoubleTest() {
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		RandomAccess<DoubleType> il2 = Views.extendMirrorDouble(img).randomAccess();
 
diff --git a/src/test/java/net/imagej/ops/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java b/src/test/java/net/imagej/ops/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java
@@ -67,7 +67,7 @@ public void extendMirrorSingleTest() {
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		RandomAccess<DoubleType> il2 = Views.extendMirrorSingle(img).randomAccess();
 
diff --git a/src/test/java/net/imagej/ops/transform/extendPeriodicView/ExtendPeriodicViewTest.java b/src/test/java/net/imagej/ops/transform/extendPeriodicView/ExtendPeriodicViewTest.java
@@ -67,7 +67,7 @@ public void extendPeriodicTest() {
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		RandomAccess<DoubleType> il2 = Views.extendPeriodic(img).randomAccess();
 
diff --git a/src/test/java/net/imagej/ops/transform/extendRandomView/ExtendRandomViewTest.java b/src/test/java/net/imagej/ops/transform/extendRandomView/ExtendRandomViewTest.java
@@ -68,7 +68,7 @@ public void extendRandomTest() {
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		RandomAccess<DoubleType> il2 = Views.extendRandom(img, 0, 0).randomAccess();
 
diff --git a/src/test/java/net/imagej/ops/transform/extendValueView/ExtendValueViewTest.java b/src/test/java/net/imagej/ops/transform/extendValueView/ExtendValueViewTest.java
@@ -67,7 +67,7 @@ public void extendValueTest() {
 				}, new Nil<RandomAccessible<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		RandomAccess<DoubleType> il2 = Views.extendValue(img, new DoubleType(0)).randomAccess();
 
diff --git a/src/test/java/net/imagej/ops/transform/extendView/ExtendViewTest.java b/src/test/java/net/imagej/ops/transform/extendView/ExtendViewTest.java
@@ -71,7 +71,7 @@ public void defaultExtendTest() {
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		RandomAccess<DoubleType> il2 = Views
 				.extend(img, new OutOfBoundsBorderFactory<DoubleType, RandomAccessibleInterval<DoubleType>>())
diff --git a/src/test/java/net/imagej/ops/transform/extendZeroView/ExtendZeroViewTest.java b/src/test/java/net/imagej/ops/transform/extendZeroView/ExtendZeroViewTest.java
@@ -66,7 +66,7 @@ public void extendZeroTest() {
 				.unary(ops, "transform.extendZeroView", raiNil,
 						new Nil<RandomAccessible<DoubleType>>() {
 				});
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 
 		RandomAccess<DoubleType> il2 = Views.extendZero(img).randomAccess();
diff --git a/src/test/java/net/imagej/ops/transform/flatIterableView/FlatIterableViewTest.java b/src/test/java/net/imagej/ops/transform/flatIterableView/FlatIterableViewTest.java
@@ -66,7 +66,7 @@ public void defaultFlatIterableTest() {
 		Function<RandomAccessibleInterval<DoubleType>, IterableInterval<DoubleType>> flatIterableFunc = Functions
 				.unary(ops, "transform.flatIterableView", raiNil, iiNil);
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		Cursor<DoubleType> il2 = Views.flatIterable(img).cursor();
 
diff --git a/src/test/java/net/imagej/ops/transform/interpolateView/InterpolateViewTest.java b/src/test/java/net/imagej/ops/transform/interpolateView/InterpolateViewTest.java
@@ -70,7 +70,7 @@ public void defaultInterpolateTest() {
 				}, new Nil<RealRandomAccessible<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		for (DoubleType d : img) {
 			d.set(r.nextDouble());
diff --git a/src/test/java/net/imagej/ops/transform/intervalView/IntervalViewTest.java b/src/test/java/net/imagej/ops/transform/intervalView/IntervalViewTest.java
@@ -72,7 +72,7 @@ public void defaultIntervalTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		for (DoubleType d : img) {
@@ -100,7 +100,7 @@ public void intervalMinMaxTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		for (DoubleType d : img) {
diff --git a/src/test/java/net/imagej/ops/transform/invertAxisView/InvertAxisViewTest.java b/src/test/java/net/imagej/ops/transform/invertAxisView/InvertAxisViewTest.java
@@ -72,7 +72,7 @@ public void defaultInvertAxisTest() {
 				}, new Nil<MixedTransformView<DoubleType>>() {
 				});
 
-		final Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		final Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		final MixedTransformView<DoubleType> il2 = Views.invertAxis((RandomAccessible<DoubleType>) img, 1);
 		final MixedTransformView<DoubleType> opr = invertFunc.apply(deinterval(img), 1);
@@ -94,7 +94,7 @@ public void intervalInvertAxisTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		final Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		final Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		final IntervalView<DoubleType> il2 = Views.invertAxis(img, 1);
 		final IntervalView<DoubleType> opr = invertFunc.apply(img, 1);
diff --git a/src/test/java/net/imagej/ops/transform/offsetView/OffsetViewTest.java b/src/test/java/net/imagej/ops/transform/offsetView/OffsetViewTest.java
@@ -70,7 +70,7 @@ public void defaultOffsetTest() {
 				}, new Nil<MixedTransformView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		MixedTransformView<DoubleType> il2 = Views.offset((RandomAccessible<DoubleType>) img, new long[] { 2, 2 });
 		MixedTransformView<DoubleType> opr = offsetFunc.apply(img, new long[] { 2, 2 });
@@ -92,7 +92,7 @@ public void defaultOffsetIntervalTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		IntervalView<DoubleType> il2 = Views.offsetInterval(img,
 				new FinalInterval(new long[] { 2, 2 }, new long[] { 9, 9 }));
@@ -115,7 +115,7 @@ public void defaultOffsetStartEndTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		IntervalView<DoubleType> il2 = Views.offsetInterval(img, new long[] { 2, 2 }, new long[] { 9, 9 });
 		IntervalView<DoubleType> opr = offsetFunc.apply(img, new long[] { 2, 2 }, new long[] { 9, 9 });
diff --git a/src/test/java/net/imagej/ops/transform/permuteView/PermuteViewTest.java b/src/test/java/net/imagej/ops/transform/permuteView/PermuteViewTest.java
@@ -82,7 +82,7 @@ public void defaultPermuteTest() {
 				}, new Nil<MixedTransformView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		MixedTransformView<DoubleType> il2 = Views.permute((RandomAccessible<DoubleType>) img, 1, 0);
 		MixedTransformView<DoubleType> opr = permuteFunc.apply(deinterval(img), 1, 0);
@@ -104,7 +104,7 @@ public void defaultPermuteCoordinatesTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 2, 2 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 2, 2 });
 		Cursor<DoubleType> c = img.cursor();
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		while (c.hasNext()) {
@@ -131,7 +131,7 @@ public void permuteCoordinatesOfDimensionTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 2, 2 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 2, 2 });
 		Cursor<DoubleType> c = img.cursor();
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		while (c.hasNext()) {
@@ -159,7 +159,7 @@ public void defaultPermuteCoordinatesInverseTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 2, 2 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 2, 2 });
 		Cursor<DoubleType> c = img.cursor();
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		while (c.hasNext()) {
@@ -187,7 +187,7 @@ public void permuteCoordinatesInverseOfDimensionTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 2, 2 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 2, 2 });
 		Cursor<DoubleType> c = img.cursor();
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		while (c.hasNext()) {
@@ -218,7 +218,7 @@ public void testIntervalPermute() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		IntervalView<DoubleType> expected = Views.permute((RandomAccessibleInterval<DoubleType>) img, 1, 0);
 		IntervalView<DoubleType> actual = permuteFunc.apply(img, 1, 0);
diff --git a/src/test/java/net/imagej/ops/transform/rasterView/RasterViewTest.java b/src/test/java/net/imagej/ops/transform/rasterView/RasterViewTest.java
@@ -69,7 +69,7 @@ public void defaultRasterTest() {
 				.unary(ops, "transform.rasterView", new Nil<RealRandomAccessible<DoubleType>>() {
 				}, new Nil<RandomAccessibleOnRealRandomAccessible<DoubleType>>() {
 				});
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		for (DoubleType d : img) {
 			d.set(r.nextDouble());
diff --git a/src/test/java/net/imagej/ops/transform/rotateView/RotateViewTest.java b/src/test/java/net/imagej/ops/transform/rotateView/RotateViewTest.java
@@ -73,7 +73,7 @@ public void testDefaultRotate() {
 				}, new Nil<MixedTransformView<DoubleType>>() {
 				});
 
-		final Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 20, 10 }, new DoubleType());
+		final Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 20, 10 });
 
 		final MixedTransformView<DoubleType> il2 = Views.rotate((RandomAccessible<DoubleType>) img, 1, 0);
 		final MixedTransformView<DoubleType> opr = rotateFunc.apply(deinterval(img), 1, 0);
@@ -123,7 +123,7 @@ public void testIntervalRotateInterval() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		final Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 20, 10 }, new DoubleType());
+		final Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 20, 10 });
 
 		final IntervalView<DoubleType> il2 = Views.rotate((RandomAccessibleInterval<DoubleType>) img, 1, 0);
 		final IntervalView<DoubleType> opr = rotateFunc.apply(img, 1,
diff --git a/src/test/java/net/imagej/ops/transform/shearView/ShearViewTest.java b/src/test/java/net/imagej/ops/transform/shearView/ShearViewTest.java
@@ -72,7 +72,7 @@ public void defaultShearTest() {
 				}, new Nil<TransformView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 2, 2 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 2, 2 });
 		Cursor<DoubleType> imgC = img.cursor();
 		while (imgC.hasNext()) {
 			imgC.next().set(1);
@@ -104,7 +104,7 @@ public void ShearIntervalTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 2, 2 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 2, 2 });
 		Cursor<DoubleType> imgC = img.cursor();
 		while (imgC.hasNext()) {
 			imgC.next().set(1);
diff --git a/src/test/java/net/imagej/ops/transform/stackView/StackViewTest.java b/src/test/java/net/imagej/ops/transform/stackView/StackViewTest.java
@@ -66,7 +66,7 @@ public void defaultStackTest() {
 		}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 		});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		List<Img<DoubleType>> list = new ArrayList<>();
 		list.add(img);
@@ -87,7 +87,7 @@ public void stackWithAccessModeTest() {
 				}, new Nil<RandomAccessibleInterval<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		List<Img<DoubleType>> list = new ArrayList<>();
 		list.add(img);
diff --git a/src/test/java/net/imagej/ops/transform/subsampleView/SubsampleViewTest.java b/src/test/java/net/imagej/ops/transform/subsampleView/SubsampleViewTest.java
@@ -75,7 +75,7 @@ public void defaultSubsampleTest() {
 		}, new Nil<SubsampleView<DoubleType>>() {
 		});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		for (DoubleType d : img) {
 			d.set(r.nextDouble());
@@ -103,7 +103,7 @@ public void defaultSubsampleStepsTest() {
 		}, new Nil<SubsampleView<DoubleType>>() {
 		});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 		MersenneTwisterFast r = new MersenneTwisterFast(SEED);
 		for (DoubleType d : img) {
 			d.set(r.nextDouble());
diff --git a/src/test/java/net/imagej/ops/transform/translateView/TranslateViewTest.java b/src/test/java/net/imagej/ops/transform/translateView/TranslateViewTest.java
@@ -76,7 +76,7 @@ public void defaultTranslateTest() {
 		}, new Nil<MixedTransformView<DoubleType>>() {
 		});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 10, 10 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 });
 
 		MixedTransformView<DoubleType> il2 = Views.translate(deinterval(img), 2, 5);
 		MixedTransformView<DoubleType> opr = translateFunc.apply(img, new long[] { 2, 5 });
diff --git a/src/test/java/net/imagej/ops/transform/unshearView/UnshearViewTest.java b/src/test/java/net/imagej/ops/transform/unshearView/UnshearViewTest.java
@@ -70,7 +70,7 @@ public void defaultUnshearTest() {
 				}, new Nil<TransformView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 2, 2 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 2, 2 });
 		Cursor<DoubleType> imgC = img.cursor();
 		while (imgC.hasNext()) {
 			imgC.next().set(1);
@@ -101,7 +101,7 @@ public void UnshearIntervalTest() {
 				}, new Nil<IntervalView<DoubleType>>() {
 				});
 
-		Img<DoubleType> img = new ArrayImgFactory<DoubleType>().create(new int[] { 2, 2 }, new DoubleType());
+		Img<DoubleType> img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 2, 2 });
 		Cursor<DoubleType> imgC = img.cursor();
 		while (imgC.hasNext()) {
 			imgC.next().set(1);
diff --git a/src/test/java/net/imagej/ops/transform/zeroMinView/ZeroMinViewTest.java b/src/test/java/net/imagej/ops/transform/zeroMinView/ZeroMinViewTest.java
