Deprecating Force

jnape · jnape · commit a8c403de5629 · 2019-10-13T16:46:08.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Fixed
 - `SafeT#zip` is now stack-safe regardless of the underlying monad's `zip` implementation
 
+### Deprecated
+- `Force`, in favor if traversing into an `IO` and explicitly running it
+
 ## [5.0.0] - 2019-09-23
 ### Changed
 - ***Breaking Change***: `MonadT` is now witnessed by a parameter for better subtyping, and no longer requires a common
@@ -52,7 +55,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
   
 ### Deprecated
 - `Peek`, `Peek2`, `Maybe#peek`, and `Either#peek` in favor of explicitly matching into `IO` and running it
-- `Force`, in favor if traversing into an `IO` and explicitly running it
 - `IO#exceptionally` in favor of `IO#catchError` (from `MonadError`)
 
 ## [4.0.0] - 2019-05-20
diff --git a/src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Force.java b/src/main/java/com/jnape/palatable/lambda/functions/builtin/fn1/Force.java
@@ -1,13 +1,17 @@
 package com.jnape.palatable.lambda.functions.builtin.fn1;
 
 import com.jnape.palatable.lambda.functions.Fn1;
+import com.jnape.palatable.lambda.io.IO;
+import com.jnape.palatable.lambda.traversable.LambdaIterable;
 
 /**
  * Force a full iteration of an {@link Iterable}, presumably to perform any side-effects contained therein. Returns the
  * {@link Iterable} back.
  *
  * @param <A> the Iterable element type
+ * @deprecated in favor of {@link LambdaIterable#traverse(Fn1, Fn1) traversing} into an {@link IO} and running it
  */
+@Deprecated
 public final class Force<A> implements Fn1<Iterable<A>, Iterable<A>> {
 
     private static final Force<?> INSTANCE = new Force<>();
diff --git a/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn1/ForceTest.java b/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn1/ForceTest.java
diff --git a/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/DropWhileTest.java b/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/DropWhileTest.java
@@ -15,7 +15,6 @@
 import java.util.List;
 
 import static com.jnape.palatable.lambda.functions.builtin.fn1.Constantly.constantly;
-import static com.jnape.palatable.lambda.functions.builtin.fn1.Force.force;
 import static com.jnape.palatable.lambda.functions.builtin.fn2.DropWhile.dropWhile;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertThat;
@@ -50,13 +49,13 @@ public void dropsNoElementsIfPredicateImmediatelyFails() {
     public void deforestingExecutesPredicatesInOrder() {
         List<Integer> innerInvocations = new ArrayList<>();
         List<Integer> outerInvocations = new ArrayList<>();
-        force(dropWhile(y -> {
+        dropWhile(y -> {
             outerInvocations.add(y);
             return true;
         }, dropWhile(x -> {
             innerInvocations.add(x);
             return x > 2;
-        }, asList(1, 2, 3))));
+        }, asList(1, 2, 3))).forEach(__ -> {});
         assertThat(innerInvocations, iterates(1, 2, 3));
         assertThat(outerInvocations, iterates(1, 2));
     }
diff --git a/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/FilterTest.java b/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/FilterTest.java
@@ -15,7 +15,6 @@
 import java.util.List;
 
 import static com.jnape.palatable.lambda.functions.builtin.fn1.Constantly.constantly;
-import static com.jnape.palatable.lambda.functions.builtin.fn1.Force.force;
 import static com.jnape.palatable.lambda.functions.builtin.fn2.Filter.filter;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertThat;
@@ -42,13 +41,13 @@ public void filtersOutMatchingElements() {
     public void deforestingExecutesPredicatesInOrder() {
         List<Integer> innerInvocations = new ArrayList<>();
         List<Integer> outerInvocations = new ArrayList<>();
-        force(filter(y -> {
+        filter(y -> {
             outerInvocations.add(y);
             return true;
         }, filter(x -> {
             innerInvocations.add(x);
             return x % 2 == 0;
-        }, asList(1, 2, 3))));
+        }, asList(1, 2, 3))).forEach(__ -> {});
         assertThat(innerInvocations, iterates(1, 2, 3));
         assertThat(outerInvocations, iterates(2));
     }
diff --git a/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/TakeWhileTest.java b/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/TakeWhileTest.java
@@ -15,7 +15,6 @@
 import java.util.List;
 
 import static com.jnape.palatable.lambda.functions.builtin.fn1.Constantly.constantly;
-import static com.jnape.palatable.lambda.functions.builtin.fn1.Force.force;
 import static com.jnape.palatable.lambda.functions.builtin.fn2.TakeWhile.takeWhile;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertThat;
@@ -55,13 +54,13 @@ public void takesNoElementsIfPredicateImmediatelyFails() {
     public void deforestingExecutesPredicatesInOrder() {
         List<Integer> innerInvocations = new ArrayList<>();
         List<Integer> outerInvocations = new ArrayList<>();
-        force(takeWhile(y -> {
+        takeWhile(y -> {
             outerInvocations.add(y);
             return true;
         }, takeWhile(x -> {
             innerInvocations.add(x);
             return x < 3;
-        }, asList(1, 2, 3))));
+        }, asList(1, 2, 3))).forEach(__ -> {});
         assertThat(innerInvocations, iterates(1, 2, 3));
         assertThat(outerInvocations, iterates(1, 2));
     }
