yegor256#551 CR

SharplEr · May 10, 2018 · 1442e65 · 1442e65
1 parent c56f6d1
commit 1442e65
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 218 deletions.
diff --git a/src/main/java/org/cactoos/func/AsyncFunc.java b/src/main/java/org/cactoos/func/AsyncFunc.java
@@ -63,11 +63,9 @@ public final class AsyncFunc<X, Y> implements Func<X, Future<Y>>, Proc<X> {
     /**
      * Ctor.
      * @param proc The proc
-     * @param result Result to return
-     * @since 0.32
      */
-    public AsyncFunc(final Proc<X> proc, final Y result) {
-        this(new FuncOf<>(proc, result));
+    public AsyncFunc(final Proc<X> proc) {
+        this(new FuncOf<>(proc));
     }
 
     /**
@@ -81,13 +79,10 @@ public AsyncFunc(final Func<X, Y> fnc) {
     /**
      * Ctor.
      * @param proc The proc
-     * @param result Result to return
      * @param fct Factory
-     * @since 0.32
      */
-    public AsyncFunc(final Proc<X> proc, final Y result,
-        final ThreadFactory fct) {
-        this(new FuncOf<>(proc, result), fct);
+    public AsyncFunc(final Proc<X> proc, final ThreadFactory fct) {
+        this(new FuncOf<>(proc), fct);
     }
 
     /**
@@ -103,12 +98,10 @@ public AsyncFunc(final Func<X, Y> fnc, final ThreadFactory fct) {
      * Ctor.
      * @param proc The proc
      * @param exec Executor Service
-     * @param result Result to return
-     * @since 0.32
+     * @since 0.17
      */
-    public AsyncFunc(final Proc<X> proc, final Y result,
-        final ExecutorService exec) {
-        this(new FuncOf<>(proc, result), exec);
+    public AsyncFunc(final Proc<X> proc, final ExecutorService exec) {
+        this(new FuncOf<>(proc), exec);
     }
 
     /**

diff --git a/src/main/java/org/cactoos/func/FuncOf.java b/src/main/java/org/cactoos/func/FuncOf.java
@@ -37,6 +37,10 @@
  * @param <X> Type of input
  * @param <Y> Type of output
  * @since 0.12
+ * @todo #551:30min Remove ctor FuncOf(Proc) by replacing with FuncOf(Proc, Y)
+ * FuncOf(Proc) force using of null value which is against design principles.
+ * It's affect a lot of classes other classes.
+ * Please take a look on #551 and #843 for more details.
  */
 public final class FuncOf<X, Y> implements Func<X, Y> {
 
@@ -50,15 +54,15 @@ public final class FuncOf<X, Y> implements Func<X, Y> {
      * @param result The result
      */
     public FuncOf(final Y result) {
-        this(input -> result);
+        this((Func<X, Y>) input -> result);
     }
 
     /**
      * Ctor.
      * @param callable The callable
      */
     public FuncOf(final Callable<Y> callable) {
-        this(input -> callable.call());
+        this((Func<X, Y>) input -> callable.call());
     }
 
     /**
@@ -71,6 +75,14 @@ public FuncOf(final Runnable runnable, final Y result) {
         this(input -> runnable.run(), result);
     }
 
+    /**
+     * Ctor.
+     * @param proc The proc
+     */
+    public FuncOf(final Proc<X> proc) {
+        this(proc, null);
+    }
+
     /**
      * Ctor.
      * @param proc The proc

diff --git a/src/main/java/org/cactoos/func/IoCheckedProc.java b/src/main/java/org/cactoos/func/IoCheckedProc.java
@@ -54,7 +54,7 @@ public IoCheckedProc(final Proc<X> prc) {
 
     @Override
     public void exec(final X input) throws IOException {
-        new IoCheckedFunc<>(new FuncOf<>(this.proc, null)).apply(input);
+        new IoCheckedFunc<>(new FuncOf<>(this.proc)).apply(input);
     }
 
 }
diff --git a/src/main/java/org/cactoos/func/RepeatedFunc.java b/src/main/java/org/cactoos/func/RepeatedFunc.java
@@ -51,12 +51,11 @@ public final class RepeatedFunc<X, Y> implements Func<X, Y> {
     /**
      * Ctor.
      * @param proc Proc
-     * @param result Result to return
      * @param max How many times
-     * @since 0.32
+     * @since 0.12
      */
-    public RepeatedFunc(final Proc<X> proc, final Y result, final int max) {
-        this(new FuncOf<>(proc, result), max);
+    public RepeatedFunc(final Proc<X> proc, final int max) {
+        this(new FuncOf<>(proc), max);
     }
 
     /**

diff --git a/src/main/java/org/cactoos/func/RetryFunc.java b/src/main/java/org/cactoos/func/RetryFunc.java
@@ -52,34 +52,30 @@ public final class RetryFunc<X, Y> implements Func<X, Y> {
     /**
      * Ctor.
      * @param proc Func original
-     * @param result Result to return
-     * @since 0.32
+     * @since 0.12
      */
-    public RetryFunc(final Proc<X> proc, final Y result) {
-        this(new FuncOf<>(proc, result));
+    public RetryFunc(final Proc<X> proc) {
+        this(new FuncOf<>(proc));
     }
 
     /**
      * Ctor.
      * @param proc Func original
-     * @param result Result to return
      * @param attempts Maximum number of attempts
-     * @since 0.32
+     * @since 0.12
      */
-    public RetryFunc(final Proc<X> proc, final Y result, final int attempts) {
-        this(new FuncOf<>(proc, result), attempts);
+    public RetryFunc(final Proc<X> proc, final int attempts) {
+        this(new FuncOf<>(proc), attempts);
     }
 
     /**
      * Ctor.
      * @param proc Func original
-     * @param result Result to return
      * @param ext Exit condition, returns TRUE if there is no more reason to try
-     * @since 0.32
+     * @since 0.12
      */
-    public RetryFunc(final Proc<X> proc, final Y result,
-        final Func<Integer, Boolean> ext) {
-        this(new FuncOf<>(proc, result), ext);
+    public RetryFunc(final Proc<X> proc, final Func<Integer, Boolean> ext) {
+        this(new FuncOf<>(proc), ext);
     }
 
     /**

diff --git a/src/main/java/org/cactoos/func/SyncFunc.java b/src/main/java/org/cactoos/func/SyncFunc.java
@@ -25,6 +25,7 @@
 
 import java.util.concurrent.Callable;
 import org.cactoos.Func;
+import org.cactoos.Proc;
 
 /**
  * Func that is thread-safe.
@@ -49,6 +50,16 @@ public final class SyncFunc<X, Y> implements Func<X, Y> {
      */
     private final Object lock;
 
+    /**
+     * Ctor.
+     * @param runnable Func original
+     * @param result Result to return
+     * @since 0.32
+     */
+    public SyncFunc(final Runnable runnable, final Y result) {
+        this(new FuncOf<>(runnable, result));
+    }
+
     /**
      * Ctor.
      * @param callable Func original
@@ -58,6 +69,16 @@ public SyncFunc(final Callable<Y> callable) {
         this(new FuncOf<>(callable));
     }
 
+    /**
+     * Ctor.
+     * @param proc Func original
+     * @param result Result to return
+     * @since 0.32
+     */
+    public SyncFunc(final Proc<X> proc, final Y result) {
+        this(new FuncOf<>(proc, result));
+    }
+
     /**
      * Ctor.
      * @param fnc Func original

diff --git a/src/main/java/org/cactoos/func/SyncProc.java b/src/main/java/org/cactoos/func/SyncProc.java
diff --git a/src/main/java/org/cactoos/func/TimedFunc.java b/src/main/java/org/cactoos/func/TimedFunc.java
@@ -53,13 +53,10 @@ public final class TimedFunc<X, Y> implements Func<X, Y> {
     /**
      * Ctor.
      * @param proc Proc
-     * @param result Result to return
      * @param milliseconds Milliseconds
-     * @since 0.32
      */
-    public TimedFunc(final Proc<X> proc, final Y result,
-        final long milliseconds) {
-        this(new FuncOf<>(proc, result), milliseconds);
+    public TimedFunc(final Proc<X> proc, final long milliseconds) {
+        this(new FuncOf<>(proc), milliseconds);
     }
 
     /**

diff --git a/src/main/java/org/cactoos/func/UncheckedProc.java b/src/main/java/org/cactoos/func/UncheckedProc.java
@@ -52,7 +52,7 @@ public UncheckedProc(final Proc<X> prc) {
 
     @Override
     public void exec(final X input) {
-        new UncheckedFunc<>(new FuncOf<>(this.proc, null)).apply(input);
+        new UncheckedFunc<>(new FuncOf<>(this.proc)).apply(input);
     }
 
 }
diff --git a/src/test/java/org/cactoos/func/AsyncFuncTest.java b/src/test/java/org/cactoos/func/AsyncFuncTest.java
@@ -43,7 +43,6 @@
  * @since 0.10
  * @checkstyle JavadocMethodCheck (500 lines)
  */
-@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public final class AsyncFuncTest {
 
     @Test
@@ -72,8 +71,7 @@ public void runsAsProcInBackground() {
             input -> {
                 final CountDownLatch latch = new CountDownLatch(1);
                 new AsyncFunc<>(
-                    (Proc<Boolean>) ipt -> latch.countDown(),
-                    true
+                    (Proc<Boolean>) ipt -> latch.countDown()
                 ).exec(input);
                 latch.await();
                 return true;
@@ -92,8 +90,7 @@ public void runsInBackgroundWithoutFuture() {
             new AsyncFunc<>(
                 input -> {
                     latch.countDown();
-                },
-                "done!"
+                }
             ),
             new FuncApplies<>(
                 true,
@@ -122,7 +119,6 @@ public void runsInBackgroundWithThreadFactory() {
                     }
                     latch.countDown();
                 },
-                null,
                 factory
             ),
             new FuncApplies<>(
@@ -153,7 +149,6 @@ public void runsInBackgroundWithExecutorService() {
                     }
                     latch.countDown();
                 },
-                null,
                 Executors.newSingleThreadExecutor(factory)
             ),
             new FuncApplies<>(

diff --git a/src/test/java/org/cactoos/func/RetryFuncTest.java b/src/test/java/org/cactoos/func/RetryFuncTest.java
@@ -66,10 +66,9 @@ public void runsProcMultipleTimes() throws Exception {
                         throw new IllegalArgumentException("May happen");
                     }
                 },
-                true,
                 Integer.MAX_VALUE
             ).apply(true),
-            Matchers.equalTo(true)
+            Matchers.nullValue()
         );
     }
 
@@ -82,10 +81,9 @@ public void runsProcDefaultMultipleTimes() throws Exception {
                     if (fail.getAndSet(false)) {
                         throw new IllegalArgumentException("May happen");
                     }
-                },
-                true
+                }
             ).apply(true),
-            Matchers.equalTo(true)
+            Matchers.nullValue()
         );
     }
 
@@ -98,10 +96,9 @@ public void runsProcConditionMultipleTimes() throws Exception {
                         throw new IllegalArgumentException("May happen");
                     }
                 },
-                true,
                 count -> count == Integer.MAX_VALUE
             ).apply(true),
-            Matchers.equalTo(true)
+            Matchers.nullValue()
         );
     }
 }