Merged BytesAsInput into InputOf

yegor256 · Jul 21, 2017 · 1a725ec · 1a725ec
1 parent 2885eb9
commit 1a725ec
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 156 deletions.
diff --git a/src/main/java/org/cactoos/Input.java b/src/main/java/org/cactoos/Input.java
@@ -46,7 +46,6 @@
  * @author Yegor Bugayenko (yegor256@gmail.com)
  * @author Fabricio Cabral (fabriciofx@gmail.com)
  * @version $Id$
- * @see org.cactoos.io.BytesAsInput
  * @see InputOf
  * @see org.cactoos.io.PathAsInput
  * @since 0.1

diff --git a/src/main/java/org/cactoos/io/BytesAsInput.java b/src/main/java/org/cactoos/io/BytesAsInput.java
diff --git a/src/main/java/org/cactoos/io/DeadInput.java b/src/main/java/org/cactoos/io/DeadInput.java
@@ -41,7 +41,7 @@ public final class DeadInput implements Input {
 
     @Override
     public InputStream stream() throws IOException {
-        return new BytesAsInput(new EmptyBytes()).stream();
+        return new InputOf(new EmptyBytes()).stream();
     }
 
 }
diff --git a/src/main/java/org/cactoos/io/InputAsProperties.java b/src/main/java/org/cactoos/io/InputAsProperties.java
@@ -73,7 +73,7 @@ public InputAsProperties(final Text text) {
      * @since 0.9
      */
     public InputAsProperties(final Bytes bytes) {
-        this(new BytesAsInput(bytes));
+        this(new InputOf(bytes));
     }
 
     /**

diff --git a/src/main/java/org/cactoos/io/InputOf.java b/src/main/java/org/cactoos/io/InputOf.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.io;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -36,6 +37,8 @@
 import org.cactoos.Text;
 import org.cactoos.func.IoCheckedScalar;
 import org.cactoos.func.UncheckedScalar;
+import org.cactoos.text.ArrayAsBytes;
+import org.cactoos.text.TextAsBytes;
 
 /**
  * InputOf
@@ -44,12 +47,12 @@
  *
  * @author Ix (ixmanuel@yahoo.com)
  * @version $Id$
- * @since 0.12
+ * @since 0.11.8
  */
 public final class InputOf implements Input {
 
     /**
-     * Input: BytesAsInput, InputStreamAsInput, PathAsInput.
+     * Input: PathAsInput.
      */
     private final Input origin;
 
@@ -92,49 +95,36 @@ public InputOf(final Path path) {
     /**
      * Ctor.
      *
-     * @param stream The stream
-     */
-    public InputOf(final InputStream stream) {
-        this(new InputStreamAsInput(stream));
-    }
-
-    /**
-     * Ctor.
-     *
-     * @param string The URL
+     * @param uri The URL
      */
-    public InputOf(final String string) {
+    public InputOf(final URI uri) {
         this(() -> {
             return new IoCheckedScalar<URL>(
-                () -> new URL(string)
+                () -> uri.toURL()
             ).value().openStream();
         });
     }
 
     /**
      * Ctor.
      *
-     * @param uri The URL
+     * @param url The url
      */
-    public InputOf(final URI uri) {
+    public InputOf(final URL url) {
         this(() -> {
             return new IoCheckedScalar<URL>(
-                () -> uri.toURL()
+                () -> url
             ).value().openStream();
         });
     }
 
     /**
      * Ctor.
      *
-     * @param url The URL
+     * @param string The string
      */
-    public InputOf(final URL url) {
-        this(() -> {
-            return new IoCheckedScalar<URL>(
-                () -> url
-            ).value().openStream();
-        });
+    public InputOf(final String string) {
+        this(new TextAsBytes(string));
     }
 
     /**
@@ -143,7 +133,7 @@ public InputOf(final URL url) {
      * @param text The text
      */
     public InputOf(final Text text) {
-        this(new BytesAsInput(text));
+        this(new TextAsBytes(text));
     }
 
     /**
@@ -152,16 +142,29 @@ public InputOf(final Text text) {
      * @param bytes The bytes
      */
     public InputOf(final byte[] bytes) {
-        this(new BytesAsInput(bytes));
+        this(new ArrayAsBytes(bytes));
     }
 
     /**
      * Ctor.
      *
-     * @param bytes The bytes
+     * @param src The bytes
+     */
+    public InputOf(final Bytes src) {
+        this(() -> {
+            return new IoCheckedScalar<InputStream>(
+                () -> new ByteArrayInputStream(src.asBytes())
+            ).value();
+        });
+    }
+
+    /**
+     * Ctor.
+     *
+     * @param stream The stream
      */
-    public InputOf(final Bytes bytes) {
-        this(new BytesAsInput(bytes));
+    public InputOf(final InputStream stream) {
+        this(new InputStreamAsInput(stream));
     }
 
     /**

diff --git a/src/main/java/org/cactoos/io/ResourceAsInput.java b/src/main/java/org/cactoos/io/ResourceAsInput.java
@@ -75,7 +75,7 @@ public ResourceAsInput(final String res) {
      * @param fbk Fallback
      */
     public ResourceAsInput(final String res, final String fbk) {
-        this(res, input -> new BytesAsInput(new TextAsBytes(fbk)));
+        this(res, input -> new InputOf(new TextAsBytes(fbk)));
     }
 
     /**

diff --git a/src/main/java/org/cactoos/io/TeeInput.java b/src/main/java/org/cactoos/io/TeeInput.java
@@ -98,7 +98,7 @@ public TeeInput(final File input, final Path output) {
      * @since 0.5
      */
     public TeeInput(final String input, final File file) {
-        this(new BytesAsInput(input), new FileAsOutput(file));
+        this(new InputOf(input), new FileAsOutput(file));
     }
 
     /**
@@ -108,7 +108,7 @@ public TeeInput(final String input, final File file) {
      * @since 0.5
      */
     public TeeInput(final String input, final Path file) {
-        this(new BytesAsInput(input), new PathAsOutput(file));
+        this(new InputOf(input), new PathAsOutput(file));
     }
 
     /**
@@ -118,7 +118,7 @@ public TeeInput(final String input, final Path file) {
      * @since 0.5
      */
     public TeeInput(final byte[] input, final Path file) {
-        this(new BytesAsInput(input), new PathAsOutput(file));
+        this(new InputOf(input), new PathAsOutput(file));
     }
 
     /**
@@ -128,7 +128,7 @@ public TeeInput(final byte[] input, final Path file) {
      * @since 0.5
      */
     public TeeInput(final String input, final Output output) {
-        this(new BytesAsInput(input), output);
+        this(new InputOf(input), output);
     }
 
     /**

diff --git a/src/test/java/org/cactoos/io/InputAsBytesTest.java b/src/test/java/org/cactoos/io/InputAsBytesTest.java
@@ -56,7 +56,7 @@ public void readsLargeInMemoryContent() throws IOException {
         MatcherAssert.assertThat(
             "Can't read large content from in-memory Input",
             new InputAsBytes(
-                new BytesAsInput(
+                new InputOf(
                     String.join(
                         "",
                         new LimitedIterable<>(
@@ -91,7 +91,7 @@ public void readsInputIntoBytes() throws IOException {
             "Can't read bytes from Input",
             new String(
                 new InputAsBytes(
-                    new BytesAsInput(
+                    new InputOf(
                         new TextAsBytes(
                             new StringAsText("Hello, друг!")
                         )
@@ -112,7 +112,7 @@ public void readsInputIntoBytesWithSmallBuffer() throws IOException {
             "Can't read bytes from Input with a small reading buffer",
             new String(
                 new InputAsBytes(
-                    new BytesAsInput(
+                    new InputOf(
                         new TextAsBytes(
                             new StringAsText("Hello, товарищ!")
                         )

diff --git a/src/test/java/org/cactoos/io/InputAsLSInputTest.java b/src/test/java/org/cactoos/io/InputAsLSInputTest.java
@@ -43,7 +43,7 @@ public void readsSimpleInput() {
         MatcherAssert.assertThat(
             "Can't read simple input",
             new InputAsLSInput(
-                new BytesAsInput("hello, world!")
+                new InputOf("hello, world!")
             ).getStringData(),
             Matchers.endsWith("world!")
         );