(#1445) Cleanup around Proc and co

victornoel · victornoel · commit 74dc2a3d88a4 · 2021-01-16T11:36:36.000+01:00
diff --git a/src/main/java/org/cactoos/BiProc.java b/src/main/java/org/cactoos/BiProc.java
@@ -39,6 +39,10 @@
  * @param <X> Type of input
  * @param <Y> Type of input
  * @since 0.20
+ * @todo #1445:30min Introduce BiProcOf on the model of ProcOf, FuncOf, etc
+ *  with constructors taking Func, BiFunc, Proc and BiProc as primary.
+ *  Add tests similar to those of ProcOfTest, FuncOfTest, etc to fully cover
+ *  the implementation. Use it where needed, for example in AndWithIndexTest.
  */
 public interface BiProc<X, Y> {
 
diff --git a/src/main/java/org/cactoos/proc/ForEach.java b/src/main/java/org/cactoos/proc/ForEach.java
@@ -23,7 +23,6 @@
  */
 package org.cactoos.proc;
 
-import org.cactoos.Func;
 import org.cactoos.Proc;
 import org.cactoos.func.FuncOf;
 import org.cactoos.scalar.And;
@@ -47,31 +46,29 @@
  * <p>
  * There is no thread-safety guarantee.
  *
- * @param <X> The type to itetare over
+ * @param <X> The type to iterate over
  * @since 1.0
  */
 public final class ForEach<X> implements Proc<Iterable<X>> {
 
     /**
      * The proc.
      */
-    private final Func<X, Boolean> func;
+    private final Proc<X> proc;
 
     /**
      * Ctor.
      *
      * @param proc The proc to execute
      */
     public ForEach(final Proc<X> proc) {
-        this.func = new FuncOf<>(
-            proc, true
-        );
+        this.proc = proc;
     }
 
     @Override
     public void exec(final Iterable<X> input) throws Exception {
         new And(
-            this.func, input
+            new FuncOf<>(this.proc, true), input
         ).value();
     }
 
diff --git a/src/main/java/org/cactoos/proc/ForEachInThreads.java b/src/main/java/org/cactoos/proc/ForEachInThreads.java
@@ -23,7 +23,6 @@
  */
 package org.cactoos.proc;
 
-import org.cactoos.Func;
 import org.cactoos.Proc;
 import org.cactoos.func.FuncOf;
 import org.cactoos.scalar.AndInThreads;
@@ -49,31 +48,29 @@
  * <p>
  * There is no thread-safety guarantee.
  *
- * @param <X> The type to itetare over
+ * @param <X> The type to iterate over
  * @since 1.0
  */
 public final class ForEachInThreads<X> implements Proc<Iterable<X>> {
 
     /**
      * The proc.
      */
-    private final Func<X, Boolean> func;
+    private final Proc<X> proc;
 
     /**
      * Ctor.
      *
      * @param proc The proc to execute
      */
     public ForEachInThreads(final Proc<X> proc) {
-        this.func = new FuncOf<>(
-            proc, true
-        );
+        this.proc = proc;
     }
 
     @Override
     public void exec(final Iterable<X> input) throws Exception {
         new AndInThreads(
-            this.func, input
+            new FuncOf<>(this.proc, true), input
         ).value();
     }
 
diff --git a/src/main/java/org/cactoos/proc/ForEachWithIndex.java b/src/main/java/org/cactoos/proc/ForEachWithIndex.java
@@ -23,10 +23,8 @@
  */
 package org.cactoos.proc;
 
-import org.cactoos.BiFunc;
 import org.cactoos.BiProc;
 import org.cactoos.Proc;
-import org.cactoos.func.BiFuncOf;
 import org.cactoos.scalar.AndWithIndex;
 
 /**
@@ -57,23 +55,21 @@ public final class ForEachWithIndex<X> implements Proc<Iterable<X>> {
     /**
      * The proc.
      */
-    private final BiFunc<X, Integer, Boolean> func;
+    private final BiProc<X, Integer> proc;
 
     /**
      * Ctor.
      *
      * @param proc The proc to execute
      */
     public ForEachWithIndex(final BiProc<X, Integer> proc) {
-        this.func = new BiFuncOf<>(
-            proc, true
-        );
+        this.proc = proc;
     }
 
     @Override
     public void exec(final Iterable<X> input) throws Exception {
         new AndWithIndex(
-            this.func, input
+            this.proc, input
         ).value();
     }
 }
diff --git a/src/main/java/org/cactoos/proc/ProcOf.java b/src/main/java/org/cactoos/proc/ProcOf.java
@@ -46,7 +46,11 @@ public final class ProcOf<X> implements Proc<X> {
      * @param fnc The proc
      */
     public ProcOf(final Func<X, ?> fnc) {
-        this((Proc<X>) fnc::apply);
+        this(
+            input -> {
+                fnc.apply(input);
+            }
+        );
     }
 
     /**
diff --git a/src/main/java/org/cactoos/scalar/And.java b/src/main/java/org/cactoos/scalar/And.java
@@ -105,10 +105,21 @@ public <X> And(final Func<X, Boolean> func, final Iterable<X> src) {
      */
     @SafeVarargs
     public <X> And(final X subject, final Func<X, Boolean>... conditions) {
+        this(subject, new IterableOf<>(conditions));
+    }
+
+    /**
+     * Ctor.
+     * @param subject The subject
+     * @param conditions Funcs to map
+     * @param <X> Type of items in the iterable
+     * @since 0.49
+     */
+    public <X> And(final X subject, final Iterable<Func<X, Boolean>> conditions) {
         this(
             new Mapped<>(
                 item -> (Scalar<Boolean>) () -> item.apply(subject),
-                new IterableOf<>(conditions)
+                conditions
             )
         );
     }
diff --git a/src/test/java/org/cactoos/io/TempFolderTest.java b/src/test/java/org/cactoos/io/TempFolderTest.java
@@ -87,15 +87,13 @@ void deletesNonEmptyDirectory() throws Exception {
                                     filename,
                                     ""
                                 ).value();
-                                return true;
                             }
                         )
                     ).exec(
                         new IterableOf<>(
                             "file1.txt", "file2.txt", "file3.txt"
                         )
                     );
-                    return true;
                 }
             )
         ).exec(
@@ -129,15 +127,13 @@ void createDirectoryWithDirectoriesAndFiles() throws Exception {
                                     filename,
                                     ""
                                 ).value();
-                                return true;
                             }
                         )
                     ).exec(
                         new IterableOf<>(
                             "1.txt", "2.txt", "3.txt"
                         )
                     );
-                    return true;
                 }
             )
         ).exec(

Original file line number	Diff line number	Diff line change
`@@ -87,15 +87,13 @@ void deletesNonEmptyDirectory() throws Exception {`
`87`	`87`	`filename,`
`88`	`88`	`""`
`89`	`89`	`).value();`
`90`		`- return true;`
`91`	`90`	`}`
`92`	`91`	`)`
`93`	`92`	`).exec(`
`94`	`93`	`new IterableOf<>(`
`95`	`94`	`"file1.txt", "file2.txt", "file3.txt"`
`96`	`95`	`)`
`97`	`96`	`);`
`98`		`- return true;`
`99`	`97`	`}`
`100`	`98`	`)`
`101`	`99`	`).exec(`
`@@ -129,15 +127,13 @@ void createDirectoryWithDirectoriesAndFiles() throws Exception {`
`129`	`127`	`filename,`
`130`	`128`	`""`
`131`	`129`	`).value();`
`132`		`- return true;`
`133`	`130`	`}`
`134`	`131`	`)`
`135`	`132`	`).exec(`
`136`	`133`	`new IterableOf<>(`
`137`	`134`	`"1.txt", "2.txt", "3.txt"`
`138`	`135`	`)`
`139`	`136`	`);`
`140`		`- return true;`
`141`	`137`	`}`
`142`	`138`	`)`
`143`	`139`	`).exec(`