(#825) Scalar replaced with Proc

yegor256 · Feb 11, 2019 · 074afad · 074afad
1 parent 3d83b3c
commit 074afad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/main/java/org/cactoos/scalar/Binary.java b/src/main/java/org/cactoos/scalar/Binary.java
@@ -23,7 +23,9 @@
  */
 package org.cactoos.scalar;
 
+import org.cactoos.Proc;
 import org.cactoos.Scalar;
+import org.cactoos.func.ProcOf;
 
 /**
  * Binary operation.
@@ -54,9 +56,9 @@ public final class Binary implements Scalar<Boolean> {
     private final Scalar<Boolean> condition;
 
     /**
-     * Scalar executed when condition is true.
+     * Proc executed when condition is true.
      */
-    private final Scalar<?> consequent;
+    private final Proc<Boolean> consequent;
 
     /**
      * Ctor.
@@ -66,20 +68,21 @@ public final class Binary implements Scalar<Boolean> {
      */
     public Binary(final Scalar<Boolean> condition, final Runnable runnable) {
         this(
-            condition, () -> {
-                runnable.run();
-                return 0;
-            }
+            condition,
+            new ProcOf<>(runnable)
         );
     }
 
     /**
      * Ctor.
      *
      * @param condition Boolean function
-     * @param consequent Scalar executed when condition is true
+     * @param consequent Proc executed when condition is true
      */
-    public Binary(final Scalar<Boolean> condition, final Scalar<?> consequent) {
+    public Binary(
+        final Scalar<Boolean> condition,
+        final Proc<Boolean> consequent
+    ) {
         this.condition = condition;
         this.consequent = consequent;
     }
@@ -88,7 +91,7 @@ public Binary(final Scalar<Boolean> condition, final Scalar<?> consequent) {
     public Boolean value() throws Exception {
         final Boolean result = this.condition.value();
         if (result) {
-            this.consequent.value();
+            this.consequent.exec(true);
         }
         return result;
     }

diff --git a/src/test/java/org/cactoos/scalar/BinaryTest.java b/src/test/java/org/cactoos/scalar/BinaryTest.java
@@ -45,7 +45,7 @@ public void conditionTrue() {
         final AtomicInteger counter = new AtomicInteger(0);
         final Binary binary = new Binary(
             new True(),
-            (Runnable) counter::incrementAndGet
+            counter::incrementAndGet
         );
         new Assertion<>(
             "Binary has to return true",
@@ -65,7 +65,7 @@ public void conditionFalse() {
         final AtomicInteger counter = new AtomicInteger(0);
         final Binary binary = new Binary(
             new False(),
-            (Runnable) counter::incrementAndGet
+            counter::incrementAndGet
         );
         new Assertion<>(
             "Binary has to return false",