Merge branch 'master' of github.com:yegor256/cactoos

src/main/java/org/cactoos/func/FuncWithFallback.java

@@ -23,9 +23,7 @@
  */
 package org.cactoos.func;
 
-import java.util.concurrent.Callable;
 import org.cactoos.Func;
-import org.cactoos.Proc;
 
 /**
  * Func with a fallback plan.
@@ -65,219 +63,6 @@ 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
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Func<X, Y> fnc,
-        final Proc<Throwable> fbk, final Func<Y, Y> flw) {
-        this(fnc, new FuncOf<>(fbk), flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Func<X, Y> fnc,
-        final Proc<Throwable> fbk, final Proc<Y> flw) {
-        this(fnc, new FuncOf<>(fbk), new FuncOf<>(flw));
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Func<X, Y> fnc,
-        final Func<Throwable, Y> fbk, final Proc<Y> flw) {
-        this(fnc, fbk, new FuncOf<>(flw));
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Proc<X> fnc,
-        final Func<Throwable, Y> fbk, final Func<Y, Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Proc<X> fnc,
-        final Proc<Throwable> fbk, final Func<Y, Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Proc<X> fnc,
-        final Proc<Throwable> fbk, final Proc<Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Proc<X> fnc,
-        final Func<Throwable, Y> fbk, final Proc<Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Callable<Y> fnc,
-        final Func<Throwable, Y> fbk, final Func<Y, Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Callable<Y> fnc,
-        final Proc<Throwable> fbk, final Func<Y, Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Callable<Y> fnc,
-        final Proc<Throwable> fbk, final Proc<Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Callable<Y> fnc,
-        final Func<Throwable, Y> fbk, final Proc<Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Runnable fnc,
-        final Func<Throwable, Y> fbk, final Proc<Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Runnable fnc,
-        final Func<Throwable, Y> fbk, final Func<Y, Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Runnable fnc,
-        final Proc<Throwable> fbk, final Func<Y, Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
-    /**
-     * Ctor.
-     * @param fnc The func
-     * @param fbk The fallback
-     * @param flw The follow up func
-     * @since 0.12
-     */
-    public FuncWithFallback(final Runnable fnc,
-        final Proc<Throwable> fbk, final Proc<Y> flw) {
-        this(new FuncOf<>(fnc), fbk, flw);
-    }
-
     /**
      * Ctor.
      * @param fnc The func

src/main/java/org/cactoos/io/WriterTo.java

@@ -71,7 +71,7 @@ public WriterTo(final File file) {
 
     /**
      * Ctor.
-     * @param stream The outpup
+     * @param stream The output
      */
     public WriterTo(final OutputStream stream) {
         this(new OutputTo(stream));

src/main/java/org/cactoos/text/HexOf.java

@@ -0,0 +1,81 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.cactoos.text;
+
+import java.io.IOException;
+import org.cactoos.Bytes;
+import org.cactoos.Text;
+
+/**
+ * Hexadecimal representation of Bytes.
+ *
+ * <p>There is no thread-safety guarantee.
+ *
+ * @author Fabricio Cabral (fabriciofx@gmail.com)
+ * @version $Id$
+ * @since 0.28
+ */
+@SuppressWarnings("PMD.ConstructorShouldDoInitialization")
+public final class HexOf implements Text {
+
+    /**
+     * The hexadecimal chars.
+     */
+    private static final char[] HEX_CHARS = {
+        '0', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+    };
+
+    /**
+     * The Bytes.
+     */
+    private final Bytes bytes;
+
+    /**
+     * Ctor.
+     * @param source The bytes
+     */
+    public HexOf(final Bytes source) {
+        this.bytes = source;
+    }
+
+    @Override
+    public String asString() throws IOException {
+        final byte[] bts = this.bytes.asBytes();
+        final char[] hex = new char[bts.length * 2];
+        int chr = -1;
+        for (int idx = 0; idx < bts.length; ++idx) {
+            // @checkstyle MagicNumber (3 line)
+            final int value = 0xff & bts[idx];
+            hex[++chr] = HexOf.HEX_CHARS[value >>> 4];
+            hex[++chr] = HexOf.HEX_CHARS[value & 0x0f];
+        }
+        return new String(hex);
+    }
+
+    @Override
+    public int compareTo(final Text text) {
+        return new UncheckedText(this).compareTo(text);
+    }
+}

src/test/java/org/cactoos/collection/FilteredTest.java

@@ -45,7 +45,7 @@ public final class FilteredTest {
     public void behavesAsCollection() throws Exception {
         MatcherAssert.assertThat(
             "Can't behave as a collection",
-            new Filtered<>(i -> i < 2, 1, 2, 0, -1),
+            new Filtered<Integer>(i -> i < 2, 1, 2, 0, -1),
             new BehavesAsCollection<>(-1)
         );
     }

src/test/java/org/cactoos/func/FuncWithFallbackTest.java

@@ -25,7 +25,6 @@
 
 import java.io.IOException;
 import org.cactoos.FuncApplies;
-import org.cactoos.Proc;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
@@ -53,11 +52,11 @@ public void usesMainFunc() throws Exception {
     }
 
     @Test
-    public void usesCallback() throws Exception {
+    public void usesFallback() throws Exception {
         MatcherAssert.assertThat(
             "Can't use the callback in case of exception",
             new FuncWithFallback<>(
-                (Proc<Integer>) input -> {
+                input -> {
                     throw new IOException("Failure");
                 },
                 ex -> "Never mind"