Merge branch '__rultor'

yegor256 · Jan 16, 2021 · 5074b24 · 5074b24
2 parents ecb0cf4 + a210b96
commit 5074b24
Show file tree

Hide file tree

Showing 43 changed files with 80 additions and 49 deletions.
diff --git a/src/main/java/org/cactoos/Bytes.java b/src/main/java/org/cactoos/Bytes.java
@@ -28,7 +28,7 @@
  *
  * <p>There is no thread-safety guarantee.
  *
- * @see org.cactoos.io.BytesOf
+ * @see org.cactoos.bytes.BytesOf
  * @since 0.1
  */
 public interface Bytes {

diff --git a/src/main/java/org/cactoos/io/BytesOf.java → src/main/java/org/cactoos/bytes/BytesOf.java b/src/main/java/org/cactoos/io/BytesOf.java → src/main/java/org/cactoos/bytes/BytesOf.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -38,6 +38,7 @@
 import org.cactoos.Bytes;
 import org.cactoos.Input;
 import org.cactoos.Text;
+import org.cactoos.io.InputOf;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.list.ListOf;
 

diff --git a/...ain/java/org/cactoos/io/CheckedBytes.java → .../java/org/cactoos/bytes/CheckedBytes.java b/...ain/java/org/cactoos/io/CheckedBytes.java → .../java/org/cactoos/bytes/CheckedBytes.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import org.cactoos.Bytes;
 import org.cactoos.Func;

diff --git a/...n/java/org/cactoos/io/DigestEnvelope.java → ...ava/org/cactoos/bytes/DigestEnvelope.java b/...n/java/org/cactoos/io/DigestEnvelope.java → ...ava/org/cactoos/bytes/DigestEnvelope.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/src/main/java/org/cactoos/io/EmptyBytes.java → ...in/java/org/cactoos/bytes/EmptyBytes.java b/src/main/java/org/cactoos/io/EmptyBytes.java → ...in/java/org/cactoos/bytes/EmptyBytes.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import org.cactoos.Bytes;
 

diff --git a/...ain/java/org/cactoos/io/InputAsBytes.java → .../java/org/cactoos/bytes/InputAsBytes.java b/...ain/java/org/cactoos/io/InputAsBytes.java → .../java/org/cactoos/bytes/InputAsBytes.java
@@ -21,12 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import org.cactoos.Bytes;
 import org.cactoos.Input;
+import org.cactoos.io.OutputTo;
+import org.cactoos.io.TeeInput;
 
 /**
  * Input as Byte Array.
@@ -36,7 +38,7 @@
  * <p>There is no thread-safety guarantee.
  * @since 0.1
  */
-final class InputAsBytes implements Bytes {
+public final class InputAsBytes implements Bytes {
 
     /**
      * The input.

diff --git a/...main/java/org/cactoos/io/Md5DigestOf.java → ...n/java/org/cactoos/bytes/Md5DigestOf.java b/...main/java/org/cactoos/io/Md5DigestOf.java → ...n/java/org/cactoos/bytes/Md5DigestOf.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import org.cactoos.Input;
 

diff --git a/...in/java/org/cactoos/io/ReaderAsBytes.java → ...java/org/cactoos/bytes/ReaderAsBytes.java b/...in/java/org/cactoos/io/ReaderAsBytes.java → ...java/org/cactoos/bytes/ReaderAsBytes.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.Reader;
 import java.nio.charset.Charset;

diff --git a/...ain/java/org/cactoos/io/Sha1DigestOf.java → .../java/org/cactoos/bytes/Sha1DigestOf.java b/...ain/java/org/cactoos/io/Sha1DigestOf.java → .../java/org/cactoos/bytes/Sha1DigestOf.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import org.cactoos.Input;
 

diff --git a/...n/java/org/cactoos/io/Sha256DigestOf.java → ...ava/org/cactoos/bytes/Sha256DigestOf.java b/...n/java/org/cactoos/io/Sha256DigestOf.java → ...ava/org/cactoos/bytes/Sha256DigestOf.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import org.cactoos.Input;
 

diff --git a/...n/java/org/cactoos/io/UncheckedBytes.java → ...ava/org/cactoos/bytes/UncheckedBytes.java b/...n/java/org/cactoos/io/UncheckedBytes.java → ...ava/org/cactoos/bytes/UncheckedBytes.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import org.cactoos.Bytes;
 import org.cactoos.Func;

diff --git a/src/main/java/org/cactoos/io/InputOf.java b/src/main/java/org/cactoos/io/InputOf.java
@@ -36,6 +36,7 @@
 import org.cactoos.Input;
 import org.cactoos.Scalar;
 import org.cactoos.Text;
+import org.cactoos.bytes.BytesOf;
 import org.cactoos.scalar.IoChecked;
 import org.cactoos.scalar.Unchecked;
 

diff --git a/src/main/java/org/cactoos/io/ResourceOf.java b/src/main/java/org/cactoos/io/ResourceOf.java
@@ -28,6 +28,7 @@
 import org.cactoos.Func;
 import org.cactoos.Input;
 import org.cactoos.Text;
+import org.cactoos.bytes.BytesOf;
 import org.cactoos.func.IoCheckedFunc;
 import org.cactoos.text.FormattedText;
 import org.cactoos.text.TextOf;

diff --git a/src/main/java/org/cactoos/io/Zip.java b/src/main/java/org/cactoos/io/Zip.java
@@ -33,6 +33,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import org.cactoos.Input;
+import org.cactoos.bytes.BytesOf;
 
 /**
  * Zip files and directory.

diff --git a/src/main/java/org/cactoos/iterable/IterableOfBytes.java b/src/main/java/org/cactoos/iterable/IterableOfBytes.java
@@ -25,7 +25,7 @@
 
 import org.cactoos.Bytes;
 import org.cactoos.Text;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
 import org.cactoos.iterator.IteratorOfBytes;
 
 /**

diff --git a/src/main/java/org/cactoos/iterator/IteratorOfBytes.java b/src/main/java/org/cactoos/iterator/IteratorOfBytes.java
@@ -28,8 +28,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.cactoos.Bytes;
 import org.cactoos.Text;
-import org.cactoos.io.BytesOf;
-import org.cactoos.io.UncheckedBytes;
+import org.cactoos.bytes.BytesOf;
+import org.cactoos.bytes.UncheckedBytes;
 
 /**
  * Iterator that returns a set of bytes.

diff --git a/src/main/java/org/cactoos/text/Base64Decoded.java b/src/main/java/org/cactoos/text/Base64Decoded.java
@@ -26,7 +26,7 @@
 
 import org.cactoos.Text;
 import org.cactoos.bytes.Base64Bytes;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
 
 /**
  * Decodes the origin text using the Base64 encoding scheme.

diff --git a/src/main/java/org/cactoos/text/Base64Encoded.java b/src/main/java/org/cactoos/text/Base64Encoded.java
@@ -26,7 +26,7 @@
 
 import org.cactoos.Text;
 import org.cactoos.bytes.BytesBase64;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
 
 /**
  * Encodes the origin text using the Base64 encoding scheme.

diff --git a/src/main/java/org/cactoos/text/TextOf.java b/src/main/java/org/cactoos/text/TextOf.java
@@ -46,7 +46,7 @@
 import org.cactoos.Input;
 import org.cactoos.Scalar;
 import org.cactoos.Text;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
 import org.cactoos.io.InputOf;
 import org.cactoos.iterable.Mapped;
 import org.cactoos.scalar.And;

diff --git a/src/test/java/org/cactoos/bytes/Base64BytesTest.java b/src/test/java/org/cactoos/bytes/Base64BytesTest.java
@@ -25,7 +25,6 @@
 package org.cactoos.bytes;
 
 import java.util.Base64;
-import org.cactoos.io.BytesOf;
 import org.hamcrest.core.IsEqual;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/src/test/java/org/cactoos/bytes/BytesBase64Test.java b/src/test/java/org/cactoos/bytes/BytesBase64Test.java
@@ -25,7 +25,6 @@
 package org.cactoos.bytes;
 
 import java.util.Base64;
-import org.cactoos.io.BytesOf;
 import org.hamcrest.core.IsEqual;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/...test/java/org/cactoos/io/BytesOfTest.java → ...t/java/org/cactoos/bytes/BytesOfTest.java b/...test/java/org/cactoos/io/BytesOfTest.java → ...t/java/org/cactoos/bytes/BytesOfTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -30,13 +30,16 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.cactoos.Text;
+import org.cactoos.io.InputOf;
+import org.cactoos.io.Sticky;
 import org.cactoos.iterable.Endless;
 import org.cactoos.iterable.HeadOf;
+import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.IterableOfBytes;
 import org.cactoos.iterator.IteratorOfBytes;
 import org.cactoos.text.Joined;
 import org.cactoos.text.TextOf;
-import org.hamcrest.Matchers;
+import org.hamcrest.core.AllOf;
 import org.hamcrest.core.IsEqual;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
@@ -76,6 +79,7 @@ void readsLargeInMemoryContent() throws Exception {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     void readsInputIntoBytes() throws Exception {
         new Assertion<>(
             "must read bytes from Input",
@@ -84,9 +88,11 @@ void readsInputIntoBytes() throws Exception {
                     new InputOf("Hello, друг!")
                 )
             ),
-            Matchers.allOf(
-                new StartsWith("Hello, "),
-                new EndsWith("друг!")
+            new AllOf<>(
+                new IterableOf<>(
+                    new StartsWith("Hello, "),
+                    new EndsWith("друг!")
+                )
             )
         ).affirm();
     }
@@ -113,6 +119,7 @@ void readsFromReader() throws Exception {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     void readsInputIntoBytesWithSmallBuffer() throws Exception {
         new Assertion<>(
             "must read bytes from Input with a small reading buffer",
@@ -122,9 +129,11 @@ void readsInputIntoBytesWithSmallBuffer() throws Exception {
                     2
                 )
             ),
-            Matchers.allOf(
-                new StartsWith("Hello,"),
-                new EndsWith("товарищ!")
+            new AllOf<>(
+                new IterableOf<>(
+                    new StartsWith("Hello,"),
+                    new EndsWith("товарищ!")
+                )
             )
         ).affirm();
     }
@@ -214,7 +223,7 @@ void printsStackTrace() {
                 new Joined(
                     System.lineSeparator(),
                     "java.io.IOException: It doesn't work at all",
-                    "\tat org.cactoos.io.BytesOfTest"
+                    "\tat org.cactoos.bytes.BytesOfTest"
                 )
             )
         ).affirm();
@@ -229,7 +238,7 @@ void printsStackTraceFromArray() {
                     new IOException("").getStackTrace()
                 )
             ),
-            new TextHasString("org.cactoos.io.BytesOfTest")
+            new TextHasString("org.cactoos.bytes.BytesOfTest")
         ).affirm();
     }
 

diff --git a/...java/org/cactoos/io/CheckedBytesTest.java → ...a/org/cactoos/bytes/CheckedBytesTest.java b/...java/org/cactoos/io/CheckedBytesTest.java → ...a/org/cactoos/bytes/CheckedBytesTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.IOException;
 import org.hamcrest.core.IsNull;

diff --git a/...a/org/cactoos/io/EmptyClosableReader.java → ...rg/cactoos/bytes/EmptyClosableReader.java b/...a/org/cactoos/io/EmptyClosableReader.java → ...rg/cactoos/bytes/EmptyClosableReader.java
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.IOException;
 import java.io.Reader;
+import org.cactoos.io.ReaderOf;
 
 /**
  * Empty Closable Reader

diff --git a/src/test/java/org/cactoos/bytes/HexOfTest.java b/src/test/java/org/cactoos/bytes/HexOfTest.java
@@ -26,7 +26,6 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import org.cactoos.io.BytesOf;
 import org.cactoos.text.TextOf;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/...java/org/cactoos/io/InputAsBytesTest.java → ...a/org/cactoos/bytes/InputAsBytesTest.java b/...java/org/cactoos/io/InputAsBytesTest.java → ...a/org/cactoos/bytes/InputAsBytesTest.java
@@ -21,10 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import org.cactoos.io.InputOf;
+import org.cactoos.io.SlowInputStream;
 import org.cactoos.iterable.Endless;
 import org.cactoos.iterable.HeadOf;
 import org.cactoos.iterable.IterableOf;

diff --git a/.../java/org/cactoos/io/Md5DigestOfTest.java → ...va/org/cactoos/bytes/Md5DigestOfTest.java b/.../java/org/cactoos/io/Md5DigestOfTest.java → ...va/org/cactoos/bytes/Md5DigestOfTest.java
@@ -21,8 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
+import org.cactoos.io.InputOf;
+import org.cactoos.io.ResourceOf;
+import org.cactoos.io.Sticky;
 import org.cactoos.text.HexOf;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/...ava/org/cactoos/io/ReaderAsBytesTest.java → .../org/cactoos/bytes/ReaderAsBytesTest.java b/...ava/org/cactoos/io/ReaderAsBytesTest.java → .../org/cactoos/bytes/ReaderAsBytesTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
 import java.io.StringReader;
 import org.cactoos.text.TextOf;

diff --git a/...java/org/cactoos/io/Sha1DigestOfTest.java → ...a/org/cactoos/bytes/Sha1DigestOfTest.java b/...java/org/cactoos/io/Sha1DigestOfTest.java → ...a/org/cactoos/bytes/Sha1DigestOfTest.java
@@ -21,8 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
+import org.cactoos.io.InputOf;
+import org.cactoos.io.ResourceOf;
+import org.cactoos.io.Sticky;
 import org.cactoos.text.HexOf;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/...va/org/cactoos/io/Sha256DigestOfTest.java → ...org/cactoos/bytes/Sha256DigestOfTest.java b/...va/org/cactoos/io/Sha256DigestOfTest.java → ...org/cactoos/bytes/Sha256DigestOfTest.java
@@ -21,8 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.io;
+package org.cactoos.bytes;
 
+import org.cactoos.io.InputOf;
+import org.cactoos.io.ResourceOf;
+import org.cactoos.io.Sticky;
 import org.cactoos.text.HexOf;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;