Renaming

Treiblesschorle · gselzer · commit bc5686e29217 · 2019-04-12T12:54:02.000-05:00
diff --git a/src/main/java/org/scijava/ops/transform/lift/LiftFunctionToIterableTransformer.java b/src/main/java/org/scijava/ops/transform/lift/LiftFunctionToIterableTransformer.java
@@ -14,7 +14,7 @@ public class LiftFunctionToIterableTransformer implements OpTransformer {
 
 	@Override
 	public Object transform(OpService opService, OpRef fromRef, Object src) {
-		return Maps.Lift.Functions.iterable((Function) src);
+		return Maps.Functions.Iterables.liftBoth((Function) src);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/ops/transform/lift/LiftFunctionToListTransformer.java b/src/main/java/org/scijava/ops/transform/lift/LiftFunctionToListTransformer.java
@@ -15,7 +15,7 @@ public class LiftFunctionToListTransformer implements OpTransformer {
 
 	@Override
 	public Object transform(OpService opService, OpRef fromRef, Object src) {
-		return Maps.Lift.Functions.list((Function) src);
+		return Maps.Functions.Lists.liftBoth((Function) src);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/ops/util/Maps.java b/src/main/java/org/scijava/ops/util/Maps.java
@@ -14,33 +14,32 @@ public class Maps {
 	private Maps() {
 		// NB: Prevent instantiation of utility class.
 	}
-
-	public static class Lift {
-		private Lift() {
-		}
 		
-		public static class Functions {
-			private Functions() {
-			}
-			
-			public static <I, O> Function<List<I>, List<O>> list(final Function<I, O> function) {
-				return iter -> iter.stream().map(function).collect(Collectors.toList());
-			}
+	public interface Functions {
+		
+		public interface Iterables {
 			
-			public static <I, O> Function<Iterable<I>, Iterable<O>> iterable(final Function<I, O> function) {
+			public static <I, O> Function<Iterable<I>, Iterable<O>> liftBoth(final Function<I, O> function) {
 				return iter -> () -> Streams.stream(iter).map(function).iterator();
 			}
 
-			public static <I, O> Function<Iterable<I>, Iterable<O>> iterableFlat(final Function<I, Iterable<O>> function) {
+			public static <I, O> Function<Iterable<I>, Iterable<O>> bothFlat(final Function<I, Iterable<O>> function) {
 				return iter -> () -> Streams.stream(iter).flatMap(i -> Streams.stream(function.apply(i))).iterator();
 			}
 		}
-
-		public static class Computers {
-			private Computers() {
+		
+		public interface Lists {
+			public static <I, O> Function<List<I>, List<O>> liftBoth(final Function<I, O> function) {
+				return iter -> iter.stream().map(function).collect(Collectors.toList());
 			}
+		}
+	}
 
-			public static <I, O> Computer<Iterable<I>, Iterable<O>> iterable(final Computer<I, O> computer) {
+	public interface Computers {
+		
+		public interface Iterables {
+			
+			public static <I, O> Computer<Iterable<I>, Iterable<O>> liftBoth(final Computer<I, O> computer) {
 				return (iter1, iter2) -> {
 					Iterator<I> i1 = iter1.iterator();
 					Iterator<O> i2 = iter2.iterator();
diff --git a/src/test/java/org/scijava/ops/LiftTest.java b/src/test/java/org/scijava/ops/LiftTest.java
@@ -57,7 +57,7 @@ public void testliftFunction() throws ValidityException {
 				nilDouble, 2.0//
 		);
 
-		Function<Iterable<Double>, Iterable<Double>> liftedToIterable = Maps.Lift.Functions.iterable(powFunction);
+		Function<Iterable<Double>, Iterable<Double>> liftedToIterable = Maps.Functions.Iterables.liftBoth(powFunction);
 		Iterable<Double> res2 = liftedToIterable.apply(Arrays.asList(1.0, 2.0, 3.0, 4.0));
 
 		arrayEquals(toArray(res2), 1.0, 4.0, 9.0, 16.0);
@@ -77,7 +77,7 @@ public void testliftComputer() throws ValidityException {
 				nilDoubleArray, 2.0//
 		);
 
-		Computer<Iterable<double[]>, Iterable<double[]>> liftedToIterable = Maps.Lift.Computers.iterable(powComputer);
+		Computer<Iterable<double[]>, Iterable<double[]>> liftedToIterable = Maps.Computers.Iterables.liftBoth(powComputer);
 		Iterable<double[]> res = wrap(new double[4]);
 		liftedToIterable.compute(wrap(new double[]{1.0, 2.0, 3.0, 4.0}), res);
 		

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class LiftFunctionToIterableTransformer implements OpTransformer {`
`14`	`14`
`15`	`15`	`@Override`
`16`	`16`	`public Object transform(OpService opService, OpRef fromRef, Object src) {`
`17`		`- return Maps.Lift.Functions.iterable((Function) src);`
	`17`	`+ return Maps.Functions.Iterables.liftBoth((Function) src);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class LiftFunctionToListTransformer implements OpTransformer {`
`15`	`15`
`16`	`16`	`@Override`
`17`	`17`	`public Object transform(OpService opService, OpRef fromRef, Object src) {`
`18`		`- return Maps.Lift.Functions.list((Function) src);`
	`18`	`+ return Maps.Functions.Lists.liftBoth((Function) src);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`