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 b/src/main/java/org/cactoos/bytes/BytesOf.java similarity index 99% rename from src/main/java/org/cactoos/io/BytesOf.java rename to src/main/java/org/cactoos/bytes/BytesOf.java index 59c74d92c2..b48d50903b 100644 --- a/src/main/java/org/cactoos/io/BytesOf.java +++ b/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/src/main/java/org/cactoos/io/CheckedBytes.java b/src/main/java/org/cactoos/bytes/CheckedBytes.java similarity index 98% rename from src/main/java/org/cactoos/io/CheckedBytes.java rename to src/main/java/org/cactoos/bytes/CheckedBytes.java index b96b0ba595..bd478c0071 100644 --- a/src/main/java/org/cactoos/io/CheckedBytes.java +++ b/src/main/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/src/main/java/org/cactoos/io/DigestEnvelope.java b/src/main/java/org/cactoos/bytes/DigestEnvelope.java similarity index 99% rename from src/main/java/org/cactoos/io/DigestEnvelope.java rename to src/main/java/org/cactoos/bytes/DigestEnvelope.java index 76ee25707b..94fceb7175 100644 --- a/src/main/java/org/cactoos/io/DigestEnvelope.java +++ b/src/main/java/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 b/src/main/java/org/cactoos/bytes/EmptyBytes.java similarity index 98% rename from src/main/java/org/cactoos/io/EmptyBytes.java rename to src/main/java/org/cactoos/bytes/EmptyBytes.java index 3265811b8a..73c8926116 100644 --- a/src/main/java/org/cactoos/io/EmptyBytes.java +++ b/src/main/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/src/main/java/org/cactoos/io/InputAsBytes.java b/src/main/java/org/cactoos/bytes/InputAsBytes.java similarity index 94% rename from src/main/java/org/cactoos/io/InputAsBytes.java rename to src/main/java/org/cactoos/bytes/InputAsBytes.java index 07af278f9e..1ed22f85ec 100644 --- a/src/main/java/org/cactoos/io/InputAsBytes.java +++ b/src/main/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 @@ *
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/src/main/java/org/cactoos/io/Md5DigestOf.java b/src/main/java/org/cactoos/bytes/Md5DigestOf.java similarity index 98% rename from src/main/java/org/cactoos/io/Md5DigestOf.java rename to src/main/java/org/cactoos/bytes/Md5DigestOf.java index 97665cef34..303a76df6c 100644 --- a/src/main/java/org/cactoos/io/Md5DigestOf.java +++ b/src/main/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/src/main/java/org/cactoos/io/ReaderAsBytes.java b/src/main/java/org/cactoos/bytes/ReaderAsBytes.java similarity index 99% rename from src/main/java/org/cactoos/io/ReaderAsBytes.java rename to src/main/java/org/cactoos/bytes/ReaderAsBytes.java index 7fb18af312..6111200ad3 100644 --- a/src/main/java/org/cactoos/io/ReaderAsBytes.java +++ b/src/main/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/src/main/java/org/cactoos/io/Sha1DigestOf.java b/src/main/java/org/cactoos/bytes/Sha1DigestOf.java similarity index 98% rename from src/main/java/org/cactoos/io/Sha1DigestOf.java rename to src/main/java/org/cactoos/bytes/Sha1DigestOf.java index abd6c681f5..8d2a33ed26 100644 --- a/src/main/java/org/cactoos/io/Sha1DigestOf.java +++ b/src/main/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/src/main/java/org/cactoos/io/Sha256DigestOf.java b/src/main/java/org/cactoos/bytes/Sha256DigestOf.java similarity index 98% rename from src/main/java/org/cactoos/io/Sha256DigestOf.java rename to src/main/java/org/cactoos/bytes/Sha256DigestOf.java index e07097fce2..7225087209 100644 --- a/src/main/java/org/cactoos/io/Sha256DigestOf.java +++ b/src/main/java/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/src/main/java/org/cactoos/io/UncheckedBytes.java b/src/main/java/org/cactoos/bytes/UncheckedBytes.java similarity index 98% rename from src/main/java/org/cactoos/io/UncheckedBytes.java rename to src/main/java/org/cactoos/bytes/UncheckedBytes.java index ff41e4cc2d..e473d297ac 100644 --- a/src/main/java/org/cactoos/io/UncheckedBytes.java +++ b/src/main/java/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 index 5606920bf2..7550cd39f2 100644 --- 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 index 2894c84ed6..e8f93db39b 100644 --- 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 index ddc1f1437b..346a376a0e 100644 --- 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 index d2ac7835dc..6435eaa707 100644 --- 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 index a46a2e6e6b..14cb73b6b0 100644 --- 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 index 6d1add695b..5f1f61f465 100644 --- 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 index f20cedf02c..05852b6d36 100644 --- 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 index 1d628a4ea9..ad9e2c8db2 100644 --- 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 index 12c46d8449..f730bcb9c5 100644 --- 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 index 7890090f42..dfe43c7371 100644 --- 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/src/test/java/org/cactoos/io/BytesOfTest.java b/src/test/java/org/cactoos/bytes/BytesOfTest.java similarity index 90% rename from src/test/java/org/cactoos/io/BytesOfTest.java rename to src/test/java/org/cactoos/bytes/BytesOfTest.java index 43f15e8cd8..6c4aa279a8 100644 --- a/src/test/java/org/cactoos/io/BytesOfTest.java +++ b/src/test/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/src/test/java/org/cactoos/io/CheckedBytesTest.java b/src/test/java/org/cactoos/bytes/CheckedBytesTest.java similarity index 99% rename from src/test/java/org/cactoos/io/CheckedBytesTest.java rename to src/test/java/org/cactoos/bytes/CheckedBytesTest.java index 6231a18dfa..bd9455df6a 100644 --- a/src/test/java/org/cactoos/io/CheckedBytesTest.java +++ b/src/test/java/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/src/test/java/org/cactoos/io/EmptyClosableReader.java b/src/test/java/org/cactoos/bytes/EmptyClosableReader.java similarity index 97% rename from src/test/java/org/cactoos/io/EmptyClosableReader.java rename to src/test/java/org/cactoos/bytes/EmptyClosableReader.java index de37a6405e..0ea009b826 100644 --- a/src/test/java/org/cactoos/io/EmptyClosableReader.java +++ b/src/test/java/org/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 index 919832544c..c1e59c104a 100644 --- 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/src/test/java/org/cactoos/io/InputAsBytesTest.java b/src/test/java/org/cactoos/bytes/InputAsBytesTest.java similarity index 97% rename from src/test/java/org/cactoos/io/InputAsBytesTest.java rename to src/test/java/org/cactoos/bytes/InputAsBytesTest.java index fd2e52779b..5695935b95 100644 --- a/src/test/java/org/cactoos/io/InputAsBytesTest.java +++ b/src/test/java/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/src/test/java/org/cactoos/io/Md5DigestOfTest.java b/src/test/java/org/cactoos/bytes/Md5DigestOfTest.java similarity index 95% rename from src/test/java/org/cactoos/io/Md5DigestOfTest.java rename to src/test/java/org/cactoos/bytes/Md5DigestOfTest.java index 7fb06e4229..7a2073034d 100644 --- a/src/test/java/org/cactoos/io/Md5DigestOfTest.java +++ b/src/test/java/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/src/test/java/org/cactoos/io/ReaderAsBytesTest.java b/src/test/java/org/cactoos/bytes/ReaderAsBytesTest.java similarity index 98% rename from src/test/java/org/cactoos/io/ReaderAsBytesTest.java rename to src/test/java/org/cactoos/bytes/ReaderAsBytesTest.java index 3e572d17a7..1a330f48f9 100644 --- a/src/test/java/org/cactoos/io/ReaderAsBytesTest.java +++ b/src/test/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/src/test/java/org/cactoos/io/Sha1DigestOfTest.java b/src/test/java/org/cactoos/bytes/Sha1DigestOfTest.java similarity index 95% rename from src/test/java/org/cactoos/io/Sha1DigestOfTest.java rename to src/test/java/org/cactoos/bytes/Sha1DigestOfTest.java index afdca38fce..9f72743576 100644 --- a/src/test/java/org/cactoos/io/Sha1DigestOfTest.java +++ b/src/test/java/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/src/test/java/org/cactoos/io/Sha256DigestOfTest.java b/src/test/java/org/cactoos/bytes/Sha256DigestOfTest.java similarity index 96% rename from src/test/java/org/cactoos/io/Sha256DigestOfTest.java rename to src/test/java/org/cactoos/bytes/Sha256DigestOfTest.java index 40e2487097..326b913750 100644 --- a/src/test/java/org/cactoos/io/Sha256DigestOfTest.java +++ b/src/test/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; diff --git a/src/test/java/org/cactoos/io/UncheckedBytesTest.java b/src/test/java/org/cactoos/bytes/UncheckedBytesTest.java similarity index 93% rename from src/test/java/org/cactoos/io/UncheckedBytesTest.java rename to src/test/java/org/cactoos/bytes/UncheckedBytesTest.java index 3321b9cc88..263f3aebde 100644 --- a/src/test/java/org/cactoos/io/UncheckedBytesTest.java +++ b/src/test/java/org/cactoos/bytes/UncheckedBytesTest.java @@ -21,12 +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.IOException; import org.cactoos.Text; import org.cactoos.text.TextOf; -import org.hamcrest.Matchers; +import org.hamcrest.core.IsEqual; import org.junit.Test; import org.llorllale.cactoos.matchers.Assertion; @@ -55,9 +55,7 @@ public void worksNormallyWhenNoExceptionIsThrown() throws Exception { new UncheckedBytes( new BytesOf(source) ).asBytes(), - Matchers.equalTo( - new BytesOf(source).asBytes() - ) + new IsEqual<>(new BytesOf(source).asBytes()) ).affirm(); } } diff --git a/src/test/java/org/cactoos/io/InputOfTest.java b/src/test/java/org/cactoos/io/InputOfTest.java index beb99c314d..813ed7fa8f 100644 --- a/src/test/java/org/cactoos/io/InputOfTest.java +++ b/src/test/java/org/cactoos/io/InputOfTest.java @@ -39,6 +39,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import org.cactoos.bytes.BytesOf; import org.cactoos.iterable.IterableOf; import org.cactoos.text.TextOf; import org.hamcrest.core.AllOf; @@ -310,7 +311,7 @@ public void readsEncodedStringFromReader() throws Exception { new Assertion<>( "must read encoded string through a reader", new TextOf( - new InputAsBytes( + new BytesOf( new InputOf( new StringReader(source), StandardCharsets.UTF_8 @@ -326,7 +327,7 @@ public void readsAnArrayOfBytes() throws Exception { final byte[] bytes = new byte[] {(byte) 0xCA, (byte) 0xFE}; new Assertion<>( "must read array of bytes", - new InputAsBytes( + new BytesOf( new SyncInput(new InputOf(bytes)) ).asBytes(), new IsEqual<>(bytes) diff --git a/src/test/java/org/cactoos/io/InputStreamOfTest.java b/src/test/java/org/cactoos/io/InputStreamOfTest.java index 7daf1e9a4e..f610031cf1 100644 --- a/src/test/java/org/cactoos/io/InputStreamOfTest.java +++ b/src/test/java/org/cactoos/io/InputStreamOfTest.java @@ -29,6 +29,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import org.cactoos.bytes.BytesOf; import org.cactoos.scalar.LengthOf; import org.cactoos.text.TextOf; import org.hamcrest.Matchers; diff --git a/src/test/java/org/cactoos/io/LoggingOutputTest.java b/src/test/java/org/cactoos/io/LoggingOutputTest.java index 2291cf8e17..1726a479c7 100644 --- a/src/test/java/org/cactoos/io/LoggingOutputTest.java +++ b/src/test/java/org/cactoos/io/LoggingOutputTest.java @@ -28,6 +28,7 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; +import org.cactoos.bytes.BytesOf; import org.cactoos.scalar.LengthOf; import org.hamcrest.Matchers; import org.junit.Rule; diff --git a/src/test/java/org/cactoos/io/ReaderOfTest.java b/src/test/java/org/cactoos/io/ReaderOfTest.java index 2c03f2f486..6902592a34 100644 --- a/src/test/java/org/cactoos/io/ReaderOfTest.java +++ b/src/test/java/org/cactoos/io/ReaderOfTest.java @@ -26,6 +26,7 @@ import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import org.cactoos.bytes.BytesOf; import org.cactoos.text.TextOf; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/ResourceOfTest.java b/src/test/java/org/cactoos/io/ResourceOfTest.java index 7f5ef56be6..8e0f099e76 100644 --- a/src/test/java/org/cactoos/io/ResourceOfTest.java +++ b/src/test/java/org/cactoos/io/ResourceOfTest.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.util.Arrays; import org.cactoos.Text; +import org.cactoos.bytes.BytesOf; import org.cactoos.text.FormattedText; import org.cactoos.text.TextOf; import org.hamcrest.Matchers; diff --git a/src/test/java/org/cactoos/io/SlowInputStream.java b/src/test/java/org/cactoos/io/SlowInputStream.java index e947b769ca..40ce3b341a 100644 --- a/src/test/java/org/cactoos/io/SlowInputStream.java +++ b/src/test/java/org/cactoos/io/SlowInputStream.java @@ -32,7 +32,7 @@ * * @since 0.12 */ -final class SlowInputStream extends InputStream { +public final class SlowInputStream extends InputStream { /** * Original stream. @@ -43,7 +43,7 @@ final class SlowInputStream extends InputStream { * Ctor. * @param size The size of the array to encapsulate */ - SlowInputStream(final int size) { + public SlowInputStream(final int size) { this(new ByteArrayInputStream(new byte[size])); } diff --git a/src/test/java/org/cactoos/io/SlowInputStreamTest.java b/src/test/java/org/cactoos/io/SlowInputStreamTest.java index cbb9623fac..a77e192069 100644 --- a/src/test/java/org/cactoos/io/SlowInputStreamTest.java +++ b/src/test/java/org/cactoos/io/SlowInputStreamTest.java @@ -23,6 +23,7 @@ */ package org.cactoos.io; +import org.cactoos.bytes.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/io/StickyTest.java b/src/test/java/org/cactoos/io/StickyTest.java index ce534e828a..be57946bfa 100644 --- a/src/test/java/org/cactoos/io/StickyTest.java +++ b/src/test/java/org/cactoos/io/StickyTest.java @@ -25,6 +25,7 @@ import java.net.MalformedURLException; import java.net.URL; +import org.cactoos.bytes.BytesOf; import org.cactoos.func.Repeated; import org.cactoos.scalar.LengthOf; import org.cactoos.text.TextOf; diff --git a/src/test/java/org/cactoos/io/TailOfTest.java b/src/test/java/org/cactoos/io/TailOfTest.java index 811c5db724..8750af0a8b 100644 --- a/src/test/java/org/cactoos/io/TailOfTest.java +++ b/src/test/java/org/cactoos/io/TailOfTest.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Random; +import org.cactoos.bytes.BytesOf; import org.hamcrest.Matchers; import org.junit.Test; import org.llorllale.cactoos.matchers.Assertion; diff --git a/src/test/java/org/cactoos/io/TeeInputFromBytesTest.java b/src/test/java/org/cactoos/io/TeeInputFromBytesTest.java index 1bba70d069..e9c56848ec 100644 --- a/src/test/java/org/cactoos/io/TeeInputFromBytesTest.java +++ b/src/test/java/org/cactoos/io/TeeInputFromBytesTest.java @@ -25,6 +25,7 @@ import java.io.File; import java.io.IOException; +import org.cactoos.bytes.BytesOf; import org.cactoos.scalar.LengthOf; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/HexOfTest.java b/src/test/java/org/cactoos/text/HexOfTest.java index b65e26270b..d903f80855 100644 --- a/src/test/java/org/cactoos/text/HexOfTest.java +++ b/src/test/java/org/cactoos/text/HexOfTest.java @@ -24,7 +24,7 @@ package org.cactoos.text; import java.io.IOException; -import org.cactoos.io.BytesOf; +import org.cactoos.bytes.BytesOf; import org.junit.jupiter.api.Test; import org.llorllale.cactoos.matchers.Assertion; import org.llorllale.cactoos.matchers.TextHasString; diff --git a/src/test/java/org/cactoos/text/TextOfTest.java b/src/test/java/org/cactoos/text/TextOfTest.java index 7b10899fc9..5b05051799 100644 --- a/src/test/java/org/cactoos/text/TextOfTest.java +++ b/src/test/java/org/cactoos/text/TextOfTest.java @@ -39,7 +39,7 @@ import java.util.Calendar; import java.util.Locale; import java.util.TimeZone; -import org.cactoos.io.BytesOf; +import org.cactoos.bytes.BytesOf; import org.cactoos.io.InputOf; import org.cactoos.iterator.IteratorOfChars; import org.hamcrest.Matchers;