#1062: Bump Cactoos for org.cactoos.text.Sticky

pom.xml

@@ -106,7 +106,7 @@ SOFTWARE.
          https://github.com/yegor256/takes/pull/886#issuecomment-446030223
          for details.
        -->
-      <version>0.44</version>
+      <version>0.49</version>
     </dependency>
     <dependency>
       <groupId>xml-apis</groupId>

src/main/java/org/takes/facets/auth/PsCookie.java

@@ -27,8 +27,8 @@
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 import lombok.EqualsAndHashCode;
-import org.cactoos.io.BytesOf;
-import org.cactoos.io.UncheckedBytes;
+import org.cactoos.bytes.BytesOf;
+import org.cactoos.bytes.UncheckedBytes;
 import org.cactoos.text.TextOf;
 import org.takes.Request;
 import org.takes.Response;
@@ -119,7 +119,7 @@ public Response exit(final Response res,
         if (idt.equals(Identity.ANONYMOUS)) {
             text = "";
         } else {
-            text = new TextOf(this.codec.encode(idt)).asString();
+            text = new TextOf(this.codec.encode(idt)).toString();
         }
         return new RsWithCookie(
             res, this.cookie, text,

src/main/java/org/takes/facets/auth/RqAuth.java

@@ -26,8 +26,8 @@
 import java.io.IOException;
 import java.util.Iterator;
 import lombok.EqualsAndHashCode;
-import org.cactoos.io.BytesOf;
-import org.cactoos.io.UncheckedBytes;
+import org.cactoos.bytes.BytesOf;
+import org.cactoos.bytes.UncheckedBytes;
 import org.takes.Request;
 import org.takes.facets.auth.codecs.CcPlain;
 import org.takes.rq.RqHeaders;

src/main/java/org/takes/facets/auth/RqWithAuth.java

@@ -110,7 +110,7 @@ private static Request make(final Identity identity, final String header,
         return new RqWithHeader(
             req,
             header,
-            new TextOf(new CcPlain().encode(identity)).asString()
+            new TextOf(new CcPlain().encode(identity)).toString()
         );
     }
 

src/main/java/org/takes/facets/auth/codecs/CcPlain.java

@@ -33,8 +33,8 @@
 import java.util.Map;
 import lombok.EqualsAndHashCode;
 import org.cactoos.Text;
-import org.cactoos.io.BytesOf;
-import org.cactoos.io.UncheckedBytes;
+import org.cactoos.bytes.BytesOf;
+import org.cactoos.bytes.UncheckedBytes;
 import org.cactoos.list.ListOf;
 import org.cactoos.text.Split;
 import org.cactoos.text.TextOf;
@@ -74,7 +74,7 @@ public byte[] encode(final Identity identity) throws IOException {
     public Identity decode(final byte[] bytes) throws IOException {
         final List<Text> parts = new ListOf<>(
             new Split(
-                new TextOf(new BytesOf(bytes)), ";"
+                new TextOf(bytes), ";"
             )
         );
         final Map<String, String> map = new HashMap<>(parts.size());

src/main/java/org/takes/facets/auth/codecs/CcXor.java

@@ -26,8 +26,8 @@
 import java.io.IOException;
 import java.util.Arrays;
 import lombok.EqualsAndHashCode;
-import org.cactoos.io.BytesOf;
-import org.cactoos.io.UncheckedBytes;
+import org.cactoos.bytes.BytesOf;
+import org.cactoos.bytes.UncheckedBytes;
 import org.takes.facets.auth.Identity;
 
 /**

src/main/java/org/takes/facets/auth/social/PsTwitter.java

@@ -34,8 +34,8 @@
 import javax.json.JsonObject;
 import javax.xml.bind.DatatypeConverter;
 import lombok.EqualsAndHashCode;
-import org.cactoos.io.BytesOf;
-import org.cactoos.io.UncheckedBytes;
+import org.cactoos.bytes.BytesOf;
+import org.cactoos.bytes.UncheckedBytes;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.facets.auth.Identity;

src/main/java/org/takes/facets/cookies/RqCookies.java

@@ -94,15 +94,15 @@ public Iterable<String> cookie(final CharSequence key)
                         // @checkstyle LineLengthCheck (1 line)
                         "There are no Cookies by name \"%s\" among %d others: %s",
                         key, map.size(), map.keySet()
-                    ).asString()
+                    )
                 );
             } else {
                 iter = new VerboseIterable<>(
                     Collections.singleton(value),
                     new FormattedText(
                         "There is always only one Cookie by name \"%s\"",
                         key
-                    ).asString()
+                    )
                 );
             }
             return iter;

src/main/java/org/takes/facets/fallback/FbLog4j.java

@@ -26,7 +26,7 @@
 import java.io.IOException;
 import lombok.EqualsAndHashCode;
 import org.apache.log4j.Logger;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
 import org.cactoos.text.TextOf;
 import org.takes.Response;
 import org.takes.misc.Opt;

src/main/java/org/takes/facets/fallback/FbSlf4j.java

@@ -25,7 +25,7 @@
 
 import java.io.IOException;
 import lombok.EqualsAndHashCode;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
 import org.cactoos.text.TextOf;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/takes/http/BkBasic.java

@@ -30,9 +30,9 @@
 import java.net.HttpURLConnection;
 import java.net.Socket;
 import lombok.EqualsAndHashCode;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
+import org.cactoos.bytes.UncheckedBytes;
 import org.cactoos.io.InputStreamOf;
-import org.cactoos.io.UncheckedBytes;
 import org.takes.HttpException;
 import org.takes.Request;
 import org.takes.Response;

src/main/java/org/takes/http/MainRemote.java

@@ -34,7 +34,7 @@
 import java.util.concurrent.TimeUnit;
 import lombok.EqualsAndHashCode;
 import org.cactoos.Scalar;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
 import org.cactoos.scalar.NumberOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.Trimmed;

src/main/java/org/takes/misc/Href.java

@@ -36,6 +36,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.regex.Pattern;
+import org.cactoos.text.FormattedText;
 
 /**
  * HTTP URI/HREF.
@@ -190,15 +191,15 @@ public Iterable<String> param(final Object key) {
         if (values.isEmpty()) {
             iter = new VerboseIterable<>(
                 Collections.emptyList(),
-                String.format(
+                new FormattedText(
                     "there are no URI params by name \"%s\" among %d others",
                     key, this.params.size()
                 )
             );
         } else {
             iter = new VerboseIterable<>(
                 values,
-                String.format(
+                new FormattedText(
                     "there are only %d URI params by name \"%s\"",
                     values.size(), key
                 )

src/main/java/org/takes/misc/VerboseIterable.java

@@ -24,6 +24,7 @@
 package org.takes.misc;
 
 import java.util.Iterator;
+import org.cactoos.Text;
 
 /**
  * Verbose iterable.
@@ -41,14 +42,14 @@ public final class VerboseIterable<T> implements Iterable<T> {
     /**
      * Error message when running out of items.
      */
-    private final CharSequence error;
+    private final Text error;
 
     /**
      * Ctor.
      * @param iter Original iterator
      * @param msg Error message
      */
-    public VerboseIterable(final Iterable<T> iter, final CharSequence msg) {
+    public VerboseIterable(final Iterable<T> iter, final Text msg) {
         this.origin = iter;
         this.error = msg;
     }

src/main/java/org/takes/misc/VerboseIterator.java

@@ -25,6 +25,8 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import org.cactoos.Text;
+import org.cactoos.text.UncheckedText;
 
 /**
  * Verbose iterator.
@@ -42,16 +44,16 @@ public final class VerboseIterator<T> implements Iterator<T> {
     /**
      * Error message when running out of items.
      */
-    private final CharSequence error;
+    private final Text error;
 
     /**
      * Ctor.
      * @param iter Original iterator
      * @param msg Error message
      */
-    public VerboseIterator(final Iterator<T> iter, final CharSequence msg) {
+    public VerboseIterator(final Iterator<T> iter, final Text msg) {
         this.origin = iter;
-        this.error = msg;
+        this.error = new UncheckedText(msg);
     }
 
     @Override

src/main/java/org/takes/misc/VerboseList.java

@@ -28,6 +28,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+import org.cactoos.Text;
+import org.cactoos.text.UncheckedText;
 
 /**
  * Verbose List that wraps OutOfBoundsException with custom message.
@@ -46,14 +48,14 @@ public final class VerboseList<T> implements List<T> {
     /**
      * Error message for IndexOutOfBoundsException.
      */
-    private final String message;
+    private final Text message;
 
     /**
      * Ctor.
      * @param list Original list
      * @param msg Error message for IndexOutOfBoundsException
      */
-    public VerboseList(final List<T> list, final String msg) {
+    public VerboseList(final List<T> list, final Text msg) {
         this.origin = list;
         this.message = msg;
     }
@@ -210,7 +212,9 @@ public List<T> subList(final int fridx, final int toidx) {
     private IndexOutOfBoundsException wrapException(
         final IndexOutOfBoundsException cause) {
         final IndexOutOfBoundsException exc =
-            new IndexOutOfBoundsException(this.message);
+            new IndexOutOfBoundsException(
+                new UncheckedText(this.message).asString()
+            );
         exc.initCause(cause);
         return exc;
     }

src/main/java/org/takes/rq/RequestOf.java

@@ -28,7 +28,7 @@
 import java.io.InputStream;
 import java.util.Iterator;
 import org.cactoos.Scalar;
-import org.cactoos.io.BytesOf;
+import org.cactoos.bytes.BytesOf;
 import org.cactoos.scalar.And;
 import org.cactoos.scalar.Equality;
 import org.cactoos.scalar.HashCode;

src/main/java/org/takes/rq/RqFake.java

@@ -29,8 +29,10 @@
 import java.util.Collections;
 import java.util.List;
 import lombok.EqualsAndHashCode;
-import org.cactoos.io.BytesOf;
-import org.cactoos.io.UncheckedBytes;
+import org.cactoos.Text;
+import org.cactoos.bytes.BytesOf;
+import org.cactoos.bytes.UncheckedBytes;
+import org.cactoos.io.InputStreamOf;
 
 /**
  * Fake request (for unit tests).
@@ -96,6 +98,18 @@ public RqFake(final List<String> head, final CharSequence body) {
             ).asBytes());
     }
 
+    /**
+     * Ctor.
+     * @param head Head
+     * @param body Body
+     */
+    public RqFake(final List<String> head, final Text body) {
+        this(
+            head,
+            new InputStreamOf(body)
+        );
+    }
+
     /**
      * Ctor.
      * @param head Head

src/main/java/org/takes/rq/RqHeaders.java

@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Set;
 import lombok.EqualsAndHashCode;
+import org.cactoos.text.FormattedText;
 import org.cactoos.text.Lowered;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.Trimmed;
@@ -101,7 +102,7 @@ public List<String> header(final CharSequence key)
             if (values.isEmpty()) {
                 list = new VerboseList<>(
                     Collections.emptyList(),
-                    String.format(
+                    new FormattedText(
                         // @checkstyle LineLengthCheck (1 line)
                         "there are no headers by name \"%s\" among %d others: %s",
                         key,
@@ -112,7 +113,7 @@ public List<String> header(final CharSequence key)
             } else {
                 list = new VerboseList<>(
                     values,
-                    String.format(
+                    new FormattedText(
                         // @checkstyle LineLengthCheck (1 line)
                         "there are only %d headers by name \"%s\"",
                         values.size(),

src/main/java/org/takes/rq/RqLive.java

@@ -30,6 +30,7 @@
 import java.util.Collection;
 import java.util.LinkedList;
 import lombok.EqualsAndHashCode;
+import org.cactoos.text.FormattedText;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
 import org.takes.HttpException;
@@ -109,11 +110,11 @@ private static void checkLineFeed(final InputStream input,
         if (input.read() != '\n') {
             throw new HttpException(
                 HttpURLConnection.HTTP_BAD_REQUEST,
-                String.format(
+                new FormattedText(
                     "there is no LF after CR in header, line #%d: \"%s\"",
                     position,
-                    new TextOf(baos.toByteArray()).asString()
-                )
+                    new TextOf(baos.toByteArray())
+                ).toString()
             );
         }
     }
@@ -160,7 +161,7 @@ private static Integer legalCharacter(final Opt<Integer> data,
                     "illegal character 0x%02X in HTTP header line #%d: \"%s\"",
                     data.get(),
                     position,
-                    new TextOf(baos.toByteArray()).asString()
+                    new TextOf(baos.toByteArray())
                 )
             );
         }