#274: more ctors

yegor256 · Jul 20, 2017 · 0130b25 · 0130b25
1 parent d46fb6f
commit 0130b25
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/src/main/java/org/cactoos/func/FuncOf.java b/src/main/java/org/cactoos/func/FuncOf.java
@@ -95,7 +95,7 @@ public FuncOf(final Proc<X> proc, final Y result) {
      * Ctor.
      * @param fnc Func
      */
-    public FuncOf(final Func<X, Y> fnc) {
+    private FuncOf(final Func<X, Y> fnc) {
         this.func = fnc;
     }
 

diff --git a/src/main/java/org/cactoos/func/FuncWithFallback.java b/src/main/java/org/cactoos/func/FuncWithFallback.java
@@ -65,6 +65,39 @@ public FuncWithFallback(final Func<X, Y> fnc,
         this(fnc, fbk, input -> input);
     }
 
+    /**
+     * Ctor.
+     * @param proc The proc
+     * @param fbk The fallback
+     * @since 0.12
+     */
+    public FuncWithFallback(final Proc<X> proc,
+        final Func<Throwable, Y> fbk) {
+        this(new FuncOf<>(proc), fbk);
+    }
+
+    /**
+     * Ctor.
+     * @param proc The proc
+     * @param fbk The fallback
+     * @since 0.12
+     */
+    public FuncWithFallback(final Proc<X> proc,
+        final Proc<Throwable> fbk) {
+        this(new FuncOf<>(proc), new FuncOf<>(fbk));
+    }
+
+    /**
+     * Ctor.
+     * @param proc The proc
+     * @param fbk The fallback
+     * @since 0.12
+     */
+    public FuncWithFallback(final Func<X, Y> proc,
+        final Proc<Throwable> fbk) {
+        this(proc, new FuncOf<>(fbk));
+    }
+
     /**
      * Ctor.
      * @param fnc The func

diff --git a/src/main/java/org/cactoos/func/ProcOf.java b/src/main/java/org/cactoos/func/ProcOf.java
@@ -72,7 +72,7 @@ public ProcOf(final Func<X, ?> fnc) {
      * Ctor.
      * @param prc The proc
      */
-    public ProcOf(final Proc<X> prc) {
+    private ProcOf(final Proc<X> prc) {
         this.proc = prc;
     }
 

diff --git a/src/test/java/org/cactoos/func/FuncWithFallbackTest.java b/src/test/java/org/cactoos/func/FuncWithFallbackTest.java
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import org.cactoos.FuncApplies;
+import org.cactoos.Proc;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
@@ -56,7 +57,7 @@ public void usesCallback() throws Exception {
         MatcherAssert.assertThat(
             "Can't use the callback in case of exception",
             new FuncWithFallback<>(
-                input -> {
+                (Proc<Integer>) input -> {
                     throw new IOException("Failure");
                 },
                 ex -> "Never mind"