Merge branch '__rultor'

victornoel · Jan 16, 2021 · 865f249 · 865f249
2 parents 5074b24 + 1cb1b88
commit 865f249
Show file tree

Hide file tree

Showing 17 changed files with 263 additions and 140 deletions.
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
@@ -91,7 +91,8 @@ public <X> And(final Func<X, Boolean> func, final X... src) {
     public <X> And(final Func<X, Boolean> func, final Iterable<X> src) {
         this(
             new Mapped<>(
-                item -> (Scalar<Boolean>) () -> func.apply(item), src
+                item -> new ScalarOf<>(() -> func.apply(item)),
+                src
             )
         );
     }
@@ -105,10 +106,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)
+                item -> new ScalarOf<>(() -> item.apply(subject)),
+                conditions
             )
         );
     }

diff --git a/src/main/java/org/cactoos/scalar/AndInThreads.java b/src/main/java/org/cactoos/scalar/AndInThreads.java
@@ -92,7 +92,8 @@ public <X> AndInThreads(final Func<X, Boolean> func,
         final Iterable<X> src) {
         this(
             new Mapped<>(
-                item -> (Scalar<Boolean>) () -> func.apply(item), src
+                item -> new ScalarOf<>(() -> func.apply(item)),
+                src
             )
         );
     }
@@ -164,7 +165,8 @@ public <X> AndInThreads(final ExecutorService svc,
         this(
             svc,
             new Mapped<>(
-                item -> (Scalar<Boolean>) () -> func.apply(item), src
+                item -> new ScalarOf<>(() -> func.apply(item)),
+                src
             )
         );
     }
@@ -210,7 +212,7 @@ public Boolean value() throws Exception {
             futures.add(this.service.submit(item::value));
         }
         final boolean result = new And(
-            (Func<Future<Boolean>, Boolean>) Future::get,
+            Future::get,
             futures
         ).value();
         if (this.shut) {

diff --git a/src/main/java/org/cactoos/scalar/AndWithIndex.java b/src/main/java/org/cactoos/scalar/AndWithIndex.java
@@ -29,6 +29,7 @@
 import org.cactoos.Proc;
 import org.cactoos.Scalar;
 import org.cactoos.func.BiFuncOf;
+import org.cactoos.func.FuncOf;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.Mapped;
 
@@ -115,8 +116,8 @@ public <X> AndWithIndex(final BiFunc<X, Integer, Boolean> func,
         final Iterable<X> src) {
         this(
             new Mapped<>(
-                item -> (Func<Integer, Boolean>) input
-                    -> func.apply(item, input), src
+                item -> new FuncOf<>(input -> func.apply(item, input)),
+                src
             )
         );
     }

diff --git a/src/main/java/org/cactoos/scalar/Or.java b/src/main/java/org/cactoos/scalar/Or.java
@@ -125,7 +125,8 @@ public <X> Or(final Proc<X> proc, final Iterable<X> src) {
     public <X> Or(final Func<X, Boolean> func, final Iterable<X> src) {
         this(
             new Mapped<>(
-                item -> (Scalar<Boolean>) () -> func.apply(item), src
+                item -> new ScalarOf<>(() -> func.apply(item)),
+                src
             )
         );
     }
@@ -140,7 +141,7 @@ public <X> Or(final Func<X, Boolean> func, final Iterable<X> src) {
     public <X> Or(final X subject, final Func<X, Boolean>... conditions) {
         this(
             new Mapped<>(
-                item -> (Scalar<Boolean>) () -> item.apply(subject),
+                item -> new ScalarOf<>(() -> item.apply(subject)),
                 new IterableOf<>(conditions)
             )
         );

diff --git a/src/test/java/org/cactoos/func/BiFuncOfTest.java b/src/test/java/org/cactoos/func/BiFuncOfTest.java
@@ -23,57 +23,88 @@
  */
 package org.cactoos.func;
 
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import org.cactoos.BiFunc;
 import org.cactoos.proc.ProcOf;
-import org.cactoos.scalar.True;
-import org.hamcrest.core.IsEqual;
+import org.cactoos.scalar.Constant;
+import org.hamcrest.core.IsSame;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
-import org.llorllale.cactoos.matchers.IsTrue;
+import org.llorllale.cactoos.matchers.MatcherOf;
 
 /**
  * Test case for {@link BiFuncOf}.
  *
  * @since 0.20
- * @checkstyle JavadocMethodCheck (500 lines)
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 final class BiFuncOfTest {
 
     @Test
     void convertsFuncIntoBiFunc() throws Exception {
         new Assertion<>(
             "Must convert function into bi-function",
             new BiFuncOf<>(
-                new FuncOf<>(input -> 1)
-            ).apply(1, 2),
-            new IsEqual<>(1)
+                new FuncOf<>(input -> input)
+            ),
+            new MatcherOf<>(
+                func -> {
+                    final Object first = new Object();
+                    final Object res = func.apply(first, "discarded");
+                    return res.equals(first);
+                }
+            )
         ).affirm();
     }
 
     @Test
     void convertsProcIntoBiFunc() throws Exception {
-        final AtomicBoolean done = new AtomicBoolean(false);
+        final AtomicReference<Object> done = new AtomicReference<>();
+        final Object result = new Object();
         new Assertion<>(
             "Must convert procedure into bi-function",
-            new BiFuncOf<String, Integer, Boolean>(
+            new BiFuncOf<>(
                 new ProcOf<>(
                     input -> {
-                        done.set(true);
+                        done.set(input);
                     }
                 ),
-                true
-            ).apply("hello world", 1),
-            new IsEqual<>(done.get())
+                result
+            ),
+            new MatcherOf<>(
+                func -> {
+                    final Object first = new Object();
+                    final Object res = func.apply(first, "discarded");
+                    return res.equals(result) && done.get().equals(first);
+                }
+            )
         ).affirm();
     }
 
     @Test
     void convertsScalarIntoBiFunc() throws Exception {
+        final Object obj = new Object();
         new Assertion<>(
             "Must convert scalar into bi-function",
-            new BiFuncOf<Boolean, Boolean, Boolean>(new True()).apply(false, false),
-            new IsTrue()
+            new BiFuncOf<>(new Constant<>(obj)).apply("discarded", "discarded"),
+            new IsSame<>(obj)
+        ).affirm();
+    }
+
+    @Test
+    void convertsLambdaIntoBiFunc() throws Exception {
+        new Assertion<>(
+            "Must convert lambda into bi-function",
+            new BiFuncOf<>((first, second) -> new Object[] {first, second}),
+            new MatcherOf<BiFunc<Object, Object, Object[]>>(
+                func -> {
+                    final Object first = new Object();
+                    final Object second = new Object();
+                    final Object[] res = func.apply(first, second);
+                    return res.length == 2 && res[0].equals(first) && res[1].equals(second);
+                }
+            )
         ).affirm();
     }
 }