diff --git a/src/main/java/org/takes/facets/auth/PsBasic.java b/src/main/java/org/takes/facets/auth/PsBasic.java index f7c73f037..7ccd5df2b 100644 --- a/src/main/java/org/takes/facets/auth/PsBasic.java +++ b/src/main/java/org/takes/facets/auth/PsBasic.java @@ -102,7 +102,7 @@ public Opt enter(final Request request) throws IOException { DatatypeConverter.parseBase64Binary( PsBasic.AUTH.split(headers.next())[1] ) - ).string().trim(); + ).asString().trim(); final String user = decoded.split(":")[0]; final Opt identity = this.entry.enter( user, @@ -309,7 +309,7 @@ private Opt urn(final String user, final String pwd) { /** * Creates a key for * {@link org.takes.facets.auth.PsBasic.Default#usernames} map. - * @param unified User string made of 3 urlencoded substrings + * @param unified User asString made of 3 urlencoded substrings * separated with non-urlencoded space characters. * @return Login and password parts with
%20
replaced with *
+
. @@ -326,7 +326,7 @@ private static String key(final String unified) { } /** - * Checks if a unified user string is correctly formatted. + * Checks if a unified user asString is correctly formatted. * @param unified String with urlencoded user login, password and urn * separated with spaces. */ @@ -345,9 +345,9 @@ private static void validateUser(final String unified) { } /** - * Counts spaces in a string. - * @param txt Any string. - * @return Amount of spaces in string. + * Counts spaces in a asString. + * @param txt Any asString. + * @return Amount of spaces in asString. */ private static int countSpaces(final String txt) { int spaces = 0; diff --git a/src/main/java/org/takes/facets/auth/PsCookie.java b/src/main/java/org/takes/facets/auth/PsCookie.java index c8d5cc691..81321a2db 100644 --- a/src/main/java/org/takes/facets/auth/PsCookie.java +++ b/src/main/java/org/takes/facets/auth/PsCookie.java @@ -100,7 +100,7 @@ public Opt enter(final Request req) throws IOException { if (cookies.hasNext()) { user = new Opt.Single<>( this.codec.decode( - new Utf8String(cookies.next()).bytes() + new Utf8String(cookies.next()).asBytes() ) ); } @@ -114,7 +114,7 @@ public Response exit(final Response res, if (idt.equals(Identity.ANONYMOUS)) { text = ""; } else { - text = new Utf8String(this.codec.encode(idt)).string(); + text = new Utf8String(this.codec.encode(idt)).asString(); } return new RsWithCookie( res, this.cookie, text, diff --git a/src/main/java/org/takes/facets/auth/RqAuth.java b/src/main/java/org/takes/facets/auth/RqAuth.java index 3ef192008..ae9933623 100644 --- a/src/main/java/org/takes/facets/auth/RqAuth.java +++ b/src/main/java/org/takes/facets/auth/RqAuth.java @@ -76,7 +76,7 @@ public Identity identity() throws IOException { final Identity user; if (headers.hasNext()) { user = new CcPlain().decode( - new Utf8String(headers.next()).bytes() + new Utf8String(headers.next()).asBytes() ); } else { user = Identity.ANONYMOUS; diff --git a/src/main/java/org/takes/facets/auth/RqWithAuth.java b/src/main/java/org/takes/facets/auth/RqWithAuth.java index c66debbb1..3d66feb1f 100644 --- a/src/main/java/org/takes/facets/auth/RqWithAuth.java +++ b/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 Utf8String(new CcPlain().encode(identity)).string() + new Utf8String(new CcPlain().encode(identity)).asString() ); } diff --git a/src/main/java/org/takes/facets/auth/codecs/CcAes.java b/src/main/java/org/takes/facets/auth/codecs/CcAes.java index d0ffe6c28..3b05c1afd 100644 --- a/src/main/java/org/takes/facets/auth/codecs/CcAes.java +++ b/src/main/java/org/takes/facets/auth/codecs/CcAes.java @@ -132,7 +132,7 @@ public Identity decode(final byte[] bytes) throws IOException { } /** - * Encrypt the given bytes using AES. + * Encrypt the given asBytes using AES. * * @param bytes Bytes to encrypt * @return Encrypted byte using AES algorithm @@ -171,7 +171,7 @@ private static byte[] withCorrectBlockSize(final byte[] key) { if (key.length != CcAes.BLOCK) { throw new IllegalArgumentException( String.format( - "the length of the AES key must be exactly %d bytes", + "the length of the AES key must be exactly %d asBytes", CcAes.BLOCK ) ); @@ -180,10 +180,10 @@ private static byte[] withCorrectBlockSize(final byte[] key) { } /** - * Decrypt the given bytes using AES. + * Decrypt the given asBytes using AES. * * @param bytes Bytes to decrypt - * @return Decrypted bytes + * @return Decrypted asBytes * @throws IOException for all unexpected exceptions */ private byte[] decrypt(final byte[] bytes) throws IOException { diff --git a/src/main/java/org/takes/facets/auth/codecs/CcPlain.java b/src/main/java/org/takes/facets/auth/codecs/CcPlain.java index 4fefe11b0..01a8016ca 100644 --- a/src/main/java/org/takes/facets/auth/codecs/CcPlain.java +++ b/src/main/java/org/takes/facets/auth/codecs/CcPlain.java @@ -57,12 +57,12 @@ public byte[] encode(final Identity identity) throws IOException { .append('=') .append(URLEncoder.encode(ent.getValue(), encoding)); } - return new Utf8String(text.toString()).bytes(); + return new Utf8String(text.toString()).asBytes(); } @Override public Identity decode(final byte[] bytes) throws IOException { - final String[] parts = new Utf8String(bytes).string().split(";"); + final String[] parts = new Utf8String(bytes).asString().split(";"); final Map map = new HashMap<>(parts.length); for (int idx = 1; idx < parts.length; ++idx) { final String[] pair = parts[idx].split("="); diff --git a/src/main/java/org/takes/facets/auth/codecs/CcSalted.java b/src/main/java/org/takes/facets/auth/codecs/CcSalted.java index da899e4c1..8d4fa0ea9 100644 --- a/src/main/java/org/takes/facets/auth/codecs/CcSalted.java +++ b/src/main/java/org/takes/facets/auth/codecs/CcSalted.java @@ -69,9 +69,9 @@ public Identity decode(final byte[] bytes) throws IOException { } /** - * Salt the string. + * Salt the asString. * @param text Original text to salt - * @return Salted string + * @return Salted asString */ @SuppressWarnings("PMD.AvoidArrayLoops") private static byte[] salt(final byte[] text) { @@ -89,7 +89,7 @@ private static byte[] salt(final byte[] text) { } /** - * Un-salt the string. + * Un-salt the asString. * @param text Salted text * @return Original text */ diff --git a/src/main/java/org/takes/facets/auth/codecs/CcXor.java b/src/main/java/org/takes/facets/auth/codecs/CcXor.java index e27421778..1ff506142 100644 --- a/src/main/java/org/takes/facets/auth/codecs/CcXor.java +++ b/src/main/java/org/takes/facets/auth/codecs/CcXor.java @@ -55,7 +55,7 @@ public final class CcXor implements Codec { * @param key Secret key for encoding */ public CcXor(final Codec codec, final String key) { - this(codec, new Utf8String(key).bytes()); + this(codec, new Utf8String(key).asBytes()); } /** @@ -79,7 +79,7 @@ public Identity decode(final byte[] bytes) throws IOException { } /** - * XOR array of bytes. + * XOR array of asBytes. * @param input The input to XOR * @return Encrypted output */ diff --git a/src/main/java/org/takes/facets/auth/codecs/Codec.java b/src/main/java/org/takes/facets/auth/codecs/Codec.java index cecf7b7e9..5a6e47ef5 100644 --- a/src/main/java/org/takes/facets/auth/codecs/Codec.java +++ b/src/main/java/org/takes/facets/auth/codecs/Codec.java @@ -36,7 +36,7 @@ public interface Codec { /** - * Encode identity into bytes. + * Encode identity into asBytes. * @param identity The identity * @return Text * @throws IOException If fails diff --git a/src/main/java/org/takes/facets/auth/signatures/SiHmac.java b/src/main/java/org/takes/facets/auth/signatures/SiHmac.java index 7e15ab273..be8e59bde 100644 --- a/src/main/java/org/takes/facets/auth/signatures/SiHmac.java +++ b/src/main/java/org/takes/facets/auth/signatures/SiHmac.java @@ -134,11 +134,11 @@ private static int bitLength(final int bits) { } /** - * Encrypt the given bytes using HMAC. + * Encrypt the given asBytes using HMAC. * * @param bytes * Bytes to encrypt - * @return Encrypted bytes + * @return Encrypted asBytes * @throws IOException * for all unexpected exceptions */ diff --git a/src/main/java/org/takes/facets/auth/signatures/Signature.java b/src/main/java/org/takes/facets/auth/signatures/Signature.java index 74daea2cd..a992cb080 100644 --- a/src/main/java/org/takes/facets/auth/signatures/Signature.java +++ b/src/main/java/org/takes/facets/auth/signatures/Signature.java @@ -35,7 +35,7 @@ public interface Signature { /** - * Create signature for data bytes. + * Create signature for data asBytes. * @param data The data to be signed * @return Signature * @throws IOException If anything fails diff --git a/src/main/java/org/takes/facets/auth/social/PsTwitter.java b/src/main/java/org/takes/facets/auth/social/PsTwitter.java index 1bc5f251c..039adb60b 100644 --- a/src/main/java/org/takes/facets/auth/social/PsTwitter.java +++ b/src/main/java/org/takes/facets/auth/social/PsTwitter.java @@ -194,7 +194,7 @@ private String fetch() throws IOException { "Basic %s", DatatypeConverter.printBase64Binary( new Utf8String( String.format("%s:%s", this.app, this.key) - ).bytes() + ).asBytes() ) ) ) diff --git a/src/main/java/org/takes/facets/cookies/RsWithCookie.java b/src/main/java/org/takes/facets/cookies/RsWithCookie.java index f7722c214..19acda986 100644 --- a/src/main/java/org/takes/facets/cookies/RsWithCookie.java +++ b/src/main/java/org/takes/facets/cookies/RsWithCookie.java @@ -115,7 +115,7 @@ public RsWithCookie(final Response res, final CharSequence name, } /** - * Build cookie string. + * Build cookie asString. * @param name Cookie name * @param value Value of it * @param attrs Optional attributes, for example "Path=/" diff --git a/src/main/java/org/takes/facets/flash/RsFlash.java b/src/main/java/org/takes/facets/flash/RsFlash.java index 24de70aaa..5d4d023ff 100644 --- a/src/main/java/org/takes/facets/flash/RsFlash.java +++ b/src/main/java/org/takes/facets/flash/RsFlash.java @@ -106,7 +106,7 @@ public final class RsFlash extends RsWrap { private static final String TEXT_FORMAT = "%s/%s"; /** - * To string. + * To asString. */ private final CharSequence text; diff --git a/src/main/java/org/takes/facets/fork/FkEncoding.java b/src/main/java/org/takes/facets/fork/FkEncoding.java index e782c28a8..bf1509fb8 100644 --- a/src/main/java/org/takes/facets/fork/FkEncoding.java +++ b/src/main/java/org/takes/facets/fork/FkEncoding.java @@ -48,7 +48,7 @@ * new FkEncoding("", response) * ) * - *

Empty string as an encoding means that the fork should match + *

Empty asString as an encoding means that the fork should match * in any case. * *

The class is immutable and thread-safe. @@ -64,7 +64,7 @@ public final class FkEncoding implements Fork { private static final Pattern ENCODING_SEP = Pattern.compile("\\s*,\\s*"); /** - * Encoding we can deliver (or empty string). + * Encoding we can deliver (or empty asString). */ private final String encoding; diff --git a/src/main/java/org/takes/facets/fork/RqRegex.java b/src/main/java/org/takes/facets/fork/RqRegex.java index a9f189677..11396e84e 100644 --- a/src/main/java/org/takes/facets/fork/RqRegex.java +++ b/src/main/java/org/takes/facets/fork/RqRegex.java @@ -41,7 +41,7 @@ public interface RqRegex extends Request { /** - * Get matcher of query string. + * Get matcher of query asString. * @return Matcher */ Matcher matcher(); diff --git a/src/main/java/org/takes/facets/hamcrest/HmBody.java b/src/main/java/org/takes/facets/hamcrest/HmBody.java index 99d1601cd..abfa50d80 100644 --- a/src/main/java/org/takes/facets/hamcrest/HmBody.java +++ b/src/main/java/org/takes/facets/hamcrest/HmBody.java @@ -147,7 +147,7 @@ private static InputStream itemBody(final Body item) throws IOException { } /** - * InputStream as bytes. + * InputStream as asBytes. * @param input Input * @return Bytes * @throws IOException If some problem inside diff --git a/src/main/java/org/takes/facets/hamcrest/HmHeader.java b/src/main/java/org/takes/facets/hamcrest/HmHeader.java index a50acb1aa..69c31f1aa 100644 --- a/src/main/java/org/takes/facets/hamcrest/HmHeader.java +++ b/src/main/java/org/takes/facets/hamcrest/HmHeader.java @@ -46,7 +46,7 @@ public final class HmHeader extends TypeSafeMatcher { /** - * Values string used in description of mismatches. + * Values asString used in description of mismatches. */ private static final String VALUES_STR = " -> values: "; diff --git a/src/main/java/org/takes/http/MainRemote.java b/src/main/java/org/takes/http/MainRemote.java index 90aebe55a..6faab7d9c 100644 --- a/src/main/java/org/takes/http/MainRemote.java +++ b/src/main/java/org/takes/http/MainRemote.java @@ -155,7 +155,7 @@ private static int port(final File file) throws Exception { break; } } - port = Integer.parseInt(new Utf8String(buf).string().trim()); + port = Integer.parseInt(new Utf8String(buf).asString().trim()); } return port; } diff --git a/src/main/java/org/takes/misc/EnglishLowerCase.java b/src/main/java/org/takes/misc/EnglishLowerCase.java index e332ceeb9..c133efbf0 100644 --- a/src/main/java/org/takes/misc/EnglishLowerCase.java +++ b/src/main/java/org/takes/misc/EnglishLowerCase.java @@ -26,7 +26,7 @@ import java.util.Locale; /** - * English lower case string representation. + * English lower case asString representation. * @since 0.33 */ public final class EnglishLowerCase { @@ -53,7 +53,7 @@ public EnglishLowerCase(final String string) { } /** - * Returns string value. + * Returns asString value. * @return String value */ public String string() { diff --git a/src/main/java/org/takes/misc/Utf8String.java b/src/main/java/org/takes/misc/Utf8String.java index 48c1f4fdb..936a1bf5b 100644 --- a/src/main/java/org/takes/misc/Utf8String.java +++ b/src/main/java/org/takes/misc/Utf8String.java @@ -24,17 +24,14 @@ package org.takes.misc; import java.nio.charset.Charset; +import org.cactoos.Bytes; +import org.cactoos.Text; /** * String that uses UTF-8 encoding for all byte operations. * @since 0.33 - * @todo #804:30min Make this implements Cactoos Bytes and Text - * and make the places in Takes that use it be able to directly - * take either a Bytes or a Text depending on the situation. - * For example RsWithBody should take Bytes and Text in its constructors. - * Also reimplement this class with BytesOf. */ -public final class Utf8String { +public final class Utf8String implements Bytes, Text { /** * UTF-8 encoding. @@ -56,25 +53,19 @@ public Utf8String(final String string) { /** * Ctor. - * @param bytes Bytes to construct UTF-8 string value + * @param bytes Bytes to construct UTF-8 asString value */ public Utf8String(final byte... bytes) { this(new String(bytes, Charset.forName(Utf8String.ENCODING))); } - /** - * Encodes string value into a sequence of bytes using UTF-8 charset. - * @return Sequence of bytes - */ - public byte[] bytes() { + @Override + public byte[] asBytes() { return this.value.getBytes(Charset.forName(Utf8String.ENCODING)); } - /** - * Returns string value. - * @return String value - */ - public String string() { + @Override + public String asString() { return this.value; } } diff --git a/src/main/java/org/takes/rq/CapInputStream.java b/src/main/java/org/takes/rq/CapInputStream.java index 445e147c2..4328dd506 100644 --- a/src/main/java/org/takes/rq/CapInputStream.java +++ b/src/main/java/org/takes/rq/CapInputStream.java @@ -41,7 +41,7 @@ final class CapInputStream extends InputStream { private final InputStream origin; /** - * More bytes to read. + * More asBytes to read. */ private long more; diff --git a/src/main/java/org/takes/rq/ChunkedInputStream.java b/src/main/java/org/takes/rq/ChunkedInputStream.java index 290a79c60..fab5bd26a 100644 --- a/src/main/java/org/takes/rq/ChunkedInputStream.java +++ b/src/main/java/org/takes/rq/ChunkedInputStream.java @@ -199,7 +199,7 @@ private enum State { */ R, /** - * Inside quoted string. + * Inside quoted asString. */ QUOTED_STRING, /** diff --git a/src/main/java/org/takes/rq/RqFake.java b/src/main/java/org/takes/rq/RqFake.java index 81fcacbbe..8fdd9982f 100644 --- a/src/main/java/org/takes/rq/RqFake.java +++ b/src/main/java/org/takes/rq/RqFake.java @@ -89,7 +89,7 @@ public RqFake(final CharSequence method, final CharSequence query, * @param body Body */ public RqFake(final List head, final CharSequence body) { - this(head, new Utf8String(body.toString()).bytes()); + this(head, new Utf8String(body.toString()).asBytes()); } /** diff --git a/src/main/java/org/takes/rq/RqLengthAware.java b/src/main/java/org/takes/rq/RqLengthAware.java index c4af4df12..18d45b5c0 100644 --- a/src/main/java/org/takes/rq/RqLengthAware.java +++ b/src/main/java/org/takes/rq/RqLengthAware.java @@ -39,7 +39,7 @@ * most cases, the browser will not close the request and will always * return positive number in available() method. Thus, you won't be * able to reach the end of the stream ever. The browser wants you - * to respect the "Content-Length" header and read as many bytes + * to respect the "Content-Length" header and read as many asBytes * as it requests. To solve that, just wrap your request into this * decorator. * diff --git a/src/main/java/org/takes/rq/RqLive.java b/src/main/java/org/takes/rq/RqLive.java index f4873d8fc..12580b408 100644 --- a/src/main/java/org/takes/rq/RqLive.java +++ b/src/main/java/org/takes/rq/RqLive.java @@ -120,7 +120,7 @@ private static void checkLineFeed(final InputStream input, String.format( "there is no LF after CR in header, line #%d: \"%s\"", position, - new Utf8String(baos.toByteArray()).string() + new Utf8String(baos.toByteArray()).asString() ) ); } @@ -137,7 +137,7 @@ private static Opt newHeader(final Opt data, Opt header = new Opt.Empty<>(); if (data.get() != ' ' && data.get() != '\t') { header = new Opt.Single<>( - new Utf8String(baos.toByteArray()).string() + new Utf8String(baos.toByteArray()).asString() ); baos.reset(); } @@ -164,7 +164,7 @@ private static Integer legalCharacter(final Opt data, "illegal character 0x%02X in HTTP header line #%d: \"%s\"", data.get(), position, - new Utf8String(baos.toByteArray()).string() + new Utf8String(baos.toByteArray()).asString() ) ); } @@ -176,7 +176,7 @@ private static Integer legalCharacter(final Opt data, * @param input Stream * @param data Empty or current data * @param available Indicates whether or not it should check first if there - * are available bytes + * are available asBytes * @return Next or current data * @throws IOException if input.read() fails */ diff --git a/src/main/java/org/takes/rq/RqPrint.java b/src/main/java/org/takes/rq/RqPrint.java index 0ebb252a0..d6769a71b 100644 --- a/src/main/java/org/takes/rq/RqPrint.java +++ b/src/main/java/org/takes/rq/RqPrint.java @@ -59,7 +59,7 @@ public RqPrint(final Request req) { public String print() throws IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); this.print(baos); - return new Utf8String(baos.toByteArray()).string(); + return new Utf8String(baos.toByteArray()).asString(); } /** @@ -80,7 +80,7 @@ public void print(final OutputStream output) throws IOException { public String printHead() throws IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); this.printHead(baos); - return new Utf8String(baos.toByteArray()).string(); + return new Utf8String(baos.toByteArray()).asString(); } /** @@ -107,7 +107,7 @@ public void printHead(final OutputStream output) throws IOException { public String printBody() throws IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); this.printBody(baos); - return new Utf8String(baos.toByteArray()).string(); + return new Utf8String(baos.toByteArray()).asString(); } /** diff --git a/src/main/java/org/takes/rq/RqWithBody.java b/src/main/java/org/takes/rq/RqWithBody.java index 23699f73b..a4becf037 100644 --- a/src/main/java/org/takes/rq/RqWithBody.java +++ b/src/main/java/org/takes/rq/RqWithBody.java @@ -54,7 +54,7 @@ public Iterable head() throws IOException { @Override public InputStream body() { return new ByteArrayInputStream( - new Utf8String(bdy.toString()).bytes() + new Utf8String(bdy.toString()).asBytes() ); } }); diff --git a/src/main/java/org/takes/rq/multipart/RqMtFake.java b/src/main/java/org/takes/rq/multipart/RqMtFake.java index decbdb8ef..fb970e1a2 100644 --- a/src/main/java/org/takes/rq/multipart/RqMtFake.java +++ b/src/main/java/org/takes/rq/multipart/RqMtFake.java @@ -164,7 +164,7 @@ public Iterable head() throws IOException { @Override public InputStream body() { return new ByteArrayInputStream( - new Utf8String(this.parts).bytes() + new Utf8String(this.parts).asBytes() ); } } diff --git a/src/main/java/org/takes/rs/RsPrint.java b/src/main/java/org/takes/rs/RsPrint.java index 45215f47f..dc4ec95e5 100644 --- a/src/main/java/org/takes/rs/RsPrint.java +++ b/src/main/java/org/takes/rs/RsPrint.java @@ -79,14 +79,14 @@ public RsPrint(final Response res) { } /** - * Print it into string. + * Print it into asString. * @return Entire HTTP response * @throws IOException If fails */ public String print() throws IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); this.print(baos); - return new Utf8String(baos.toByteArray()).string(); + return new Utf8String(baos.toByteArray()).asString(); } @Override @@ -95,18 +95,18 @@ public String asString() throws IOException { } /** - * Print body into string. + * Print body into asString. * @return Entire body of HTTP response * @throws IOException If fails */ public String printBody() throws IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); this.printBody(baos); - return new Utf8String(baos.toByteArray()).string(); + return new Utf8String(baos.toByteArray()).asString(); } /** - * Print head into string. + * Print head into asString. * @return Entire head of HTTP response * @throws IOException If fails * @since 0.10 @@ -114,7 +114,7 @@ public String printBody() throws IOException { public String printHead() throws IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); this.printHead(baos); - return new Utf8String(baos.toByteArray()).string(); + return new Utf8String(baos.toByteArray()).asString(); } /** diff --git a/src/main/java/org/takes/rs/RsSimple.java b/src/main/java/org/takes/rs/RsSimple.java index 3588ef57a..3d1ba6026 100644 --- a/src/main/java/org/takes/rs/RsSimple.java +++ b/src/main/java/org/takes/rs/RsSimple.java @@ -49,7 +49,7 @@ public class RsSimple extends RsWrap { public RsSimple(final Iterable head, final String body) { this( head, - new ByteArrayInputStream(new Utf8String(body).bytes()) + new ByteArrayInputStream(new Utf8String(body).asBytes()) ); } diff --git a/src/main/java/org/takes/rs/RsVelocity.java b/src/main/java/org/takes/rs/RsVelocity.java index a32b96302..7684a7a62 100644 --- a/src/main/java/org/takes/rs/RsVelocity.java +++ b/src/main/java/org/takes/rs/RsVelocity.java @@ -79,7 +79,7 @@ public RsVelocity(final CharSequence template, final RsVelocity.Pair... params) { this( new ByteArrayInputStream( - new Utf8String(template.toString()).bytes() + new Utf8String(template.toString()).asBytes() ), params ); } diff --git a/src/main/java/org/takes/rs/RsWithBody.java b/src/main/java/org/takes/rs/RsWithBody.java index 463d8a2f8..06b85eab9 100644 --- a/src/main/java/org/takes/rs/RsWithBody.java +++ b/src/main/java/org/takes/rs/RsWithBody.java @@ -90,7 +90,7 @@ public RsWithBody(final URL url) { * @param body Body */ public RsWithBody(final Response res, final CharSequence body) { - this(res, new Utf8String(body.toString()).bytes()); + this(res, new Utf8String(body.toString()).asBytes()); } /** diff --git a/src/main/java/org/takes/rs/RsXslt.java b/src/main/java/org/takes/rs/RsXslt.java index bbac6b0b5..5c8cd1af1 100644 --- a/src/main/java/org/takes/rs/RsXslt.java +++ b/src/main/java/org/takes/rs/RsXslt.java @@ -152,14 +152,14 @@ private static InputStream transform(final TransformerFactory factory, final Source xsl = RsXslt.stylesheet( factory, new StreamSource( new Utf8InputStreamReader( - new ByteArrayInputStream(new Utf8String(input).bytes()) + new ByteArrayInputStream(new Utf8String(input).asBytes()) ) ) ); RsXslt.transformer(factory, xsl).transform( new StreamSource( new Utf8InputStreamReader( - new ByteArrayInputStream(new Utf8String(input).bytes()) + new ByteArrayInputStream(new Utf8String(input).asBytes()) ) ), new StreamResult( @@ -167,7 +167,7 @@ factory, new StreamSource( ) ); return new ByteArrayInputStream( - new Utf8String(baos.toByteArray()).bytes() + new Utf8String(baos.toByteArray()).asBytes() ); } diff --git a/src/test/java/org/takes/facets/auth/PsBasicTest.java b/src/test/java/org/takes/facets/auth/PsBasicTest.java index 3400fdddb..9f0ad355d 100644 --- a/src/test/java/org/takes/facets/auth/PsBasicTest.java +++ b/src/test/java/org/takes/facets/auth/PsBasicTest.java @@ -288,11 +288,11 @@ private static String urn(final String user) { } /** - * Generate the string used on the request that store information about + * Generate the asString used on the request that store information about * authentication. * @param user Username * @param pass Password - * @return Header string. + * @return Header asString. */ private static String header(final String user, final String pass) { final String auth = String.format("%s:%s", user, pass); diff --git a/src/test/java/org/takes/facets/auth/social/PsGithubTest.java b/src/test/java/org/takes/facets/auth/social/PsGithubTest.java index d072c3f0f..ed7a8112b 100644 --- a/src/test/java/org/takes/facets/auth/social/PsGithubTest.java +++ b/src/test/java/org/takes/facets/auth/social/PsGithubTest.java @@ -61,23 +61,23 @@ public final class PsGithubTest { private static final String GIT_HUB_TOKEN = "GitHubToken"; /** - * XPath access_token string. + * XPath access_token asString. */ private static final String ACCESS_TOKEN = "access_token"; /** - * XPath login string. + * XPath login asString. */ private static final String LOGIN = "login"; /** - * Octocat URL string. + * Octocat URL asString. */ private static final String OCTOCAT_GIF_URL = "https://github.com/img/octocat.gif"; /** - * XPath octocat string. + * XPath octocat asString. */ private static final String OCTOCAT = "octocat"; diff --git a/src/test/java/org/takes/facets/auth/social/PsGoogleTest.java b/src/test/java/org/takes/facets/auth/social/PsGoogleTest.java index 3882fd157..5201857d3 100644 --- a/src/test/java/org/takes/facets/auth/social/PsGoogleTest.java +++ b/src/test/java/org/takes/facets/auth/social/PsGoogleTest.java @@ -111,7 +111,7 @@ public final class PsGoogleTest { private static final String AVATAR = "https://google.com/img/avatar.gif"; /** - * XPath access_token string. + * XPath access_token asString. */ private static final String ACCESS_TOKEN = "access_token"; diff --git a/src/test/java/org/takes/facets/fork/RqRegexTest.java b/src/test/java/org/takes/facets/fork/RqRegexTest.java index baf1974eb..6dbd148cc 100644 --- a/src/test/java/org/takes/facets/fork/RqRegexTest.java +++ b/src/test/java/org/takes/facets/fork/RqRegexTest.java @@ -35,7 +35,7 @@ public final class RqRegexTest { /** - * RqRegex can match a string. + * RqRegex can match a asString. * @throws IOException If some problem inside */ @Test diff --git a/src/test/java/org/takes/http/FtBasicTest.java b/src/test/java/org/takes/http/FtBasicTest.java index 8eb95c5d7..30fb7fd3c 100644 --- a/src/test/java/org/takes/http/FtBasicTest.java +++ b/src/test/java/org/takes/http/FtBasicTest.java @@ -225,7 +225,7 @@ public void consumesTwiceInputStreamWithRsText() throws IOException { FtBasicTest.ROOT_PATH, new RsText( new ByteArrayInputStream( - new Utf8String(result).bytes() + new Utf8String(result).asBytes() ) ) ) @@ -262,7 +262,7 @@ public void consumesTwiceInputStreamWithRsHtml() throws IOException { FtBasicTest.ROOT_PATH, new RsHtml( new ByteArrayInputStream( - new Utf8String(result).bytes() + new Utf8String(result).asBytes() ) ) ) diff --git a/src/test/java/org/takes/misc/ExpiresTest.java b/src/test/java/org/takes/misc/ExpiresTest.java index fb042c178..13d0c6f64 100644 --- a/src/test/java/org/takes/misc/ExpiresTest.java +++ b/src/test/java/org/takes/misc/ExpiresTest.java @@ -74,7 +74,7 @@ public void returnsHour() { } /** - * Date can return expires date string in GMT. + * Date can return expires date asString in GMT. */ @Test public void returnsExpiresStringInGmt() { diff --git a/src/test/java/org/takes/misc/Utf8StringTest.java b/src/test/java/org/takes/misc/Utf8StringTest.java index a2413d8f4..c7caaef3c 100644 --- a/src/test/java/org/takes/misc/Utf8StringTest.java +++ b/src/test/java/org/takes/misc/Utf8StringTest.java @@ -40,22 +40,22 @@ public final class Utf8StringTest { private static final String ENCODING = "UTF-8"; /** - * Utf8String can be constructed from string. + * Utf8String can be constructed from asString. * @throws UnsupportedEncodingException If fails */ @Test public void canConstructFromString() throws UnsupportedEncodingException { final String test = "Hello こんにちは Привет"; final Utf8String str = new Utf8String(test); - MatcherAssert.assertThat(str.string(), Matchers.equalTo(test)); + MatcherAssert.assertThat(str.asString(), Matchers.equalTo(test)); MatcherAssert.assertThat( - str.bytes(), + str.asBytes(), Matchers.equalTo(test.getBytes(Utf8StringTest.ENCODING)) ); } /** - * Utf8String can be constructed from bytes array. + * Utf8String can be constructed from asBytes array. * @throws UnsupportedEncodingException If fails */ @Test @@ -65,9 +65,9 @@ public void canBeConstructedFromBytes() final Utf8String str = new Utf8String( test.getBytes(Utf8StringTest.ENCODING) ); - MatcherAssert.assertThat(str.string(), Matchers.equalTo(test)); + MatcherAssert.assertThat(str.asString(), Matchers.equalTo(test)); MatcherAssert.assertThat( - str.bytes(), + str.asBytes(), Matchers.equalTo(test.getBytes(Utf8StringTest.ENCODING)) ); } diff --git a/src/test/java/org/takes/rq/multipart/RqTempTest.java b/src/test/java/org/takes/rq/multipart/RqTempTest.java index a2823df7f..7566f7671 100644 --- a/src/test/java/org/takes/rq/multipart/RqTempTest.java +++ b/src/test/java/org/takes/rq/multipart/RqTempTest.java @@ -50,7 +50,7 @@ public void deletesTempFile() throws IOException { ); Files.write( file.toPath(), - new Utf8String("Temp file deletion test").bytes() + new Utf8String("Temp file deletion test").asBytes() ); final Request request = new RqTemp(file); try { diff --git a/src/test/java/org/takes/rs/BodyTest.java b/src/test/java/org/takes/rs/BodyTest.java index a9ecd3f1c..4a5a940aa 100644 --- a/src/test/java/org/takes/rs/BodyTest.java +++ b/src/test/java/org/takes/rs/BodyTest.java @@ -49,7 +49,7 @@ public final class BodyTest { @Test public void returnsCorrectInputWithByteArray() throws Exception { final byte[] bytes = - new Utf8String("ByteArray returnsCorrectInput!").bytes(); + new Utf8String("ByteArray returnsCorrectInput!").asBytes(); MatcherAssert.assertThat( ByteStreams.toByteArray(new Body.ByteArray(bytes).input()), Matchers.equalTo(bytes) @@ -63,7 +63,7 @@ public void returnsCorrectInputWithByteArray() throws Exception { @Test public void returnsCorrectLengthWithByteArray() throws Exception { final byte[] bytes = - new Utf8String("ByteArray returnsCorrectLength!").bytes(); + new Utf8String("ByteArray returnsCorrectLength!").asBytes(); MatcherAssert.assertThat( new Body.ByteArray(bytes).length(), Matchers.equalTo(bytes.length) @@ -77,7 +77,7 @@ public void returnsCorrectLengthWithByteArray() throws Exception { @Test public void returnsCorrectInputWithStream() throws Exception { final byte[] bytes = - new Utf8String("Stream returnsCorrectInput!").bytes(); + new Utf8String("Stream returnsCorrectInput!").asBytes(); MatcherAssert.assertThat( ByteStreams.toByteArray( new Body.Stream(new ByteArrayInputStream(bytes)).input() @@ -93,7 +93,7 @@ public void returnsCorrectInputWithStream() throws Exception { @Test public void returnsCorrectLengthWithStream() throws Exception { final byte[] bytes = - new Utf8String("Stream returnsCorrectLength!").bytes(); + new Utf8String("Stream returnsCorrectLength!").asBytes(); MatcherAssert.assertThat( new Body.Stream(new ByteArrayInputStream(bytes)).length(), Matchers.equalTo(bytes.length) @@ -107,7 +107,7 @@ public void returnsCorrectLengthWithStream() throws Exception { @Test public void returnsCorrectInputWithTemFile() throws Exception { final byte[] bytes = - new Utf8String("TempFile returnsCorrectInput!").bytes(); + new Utf8String("TempFile returnsCorrectInput!").asBytes(); MatcherAssert.assertThat( ByteStreams.toByteArray( new Body.TempFile(new Body.ByteArray(bytes)).input() @@ -123,7 +123,7 @@ public void returnsCorrectInputWithTemFile() throws Exception { @Test public void returnsCorrectLengthWithTemFile() throws Exception { final byte[] bytes = - new Utf8String("TempFile returnsCorrectLength!").bytes(); + new Utf8String("TempFile returnsCorrectLength!").asBytes(); MatcherAssert.assertThat( new Body.TempFile(new Body.ByteArray(bytes)).length(), Matchers.equalTo(bytes.length) @@ -139,7 +139,7 @@ public void returnsCorrectInputWithUrl() throws Exception { final Path file = BodyTest.createTempFile(); try { final byte[] bytes = - new Utf8String("URL returnsCorrectInput!").bytes(); + new Utf8String("URL returnsCorrectInput!").asBytes(); try (InputStream input = new ByteArrayInputStream(bytes)) { Files.copy(input, file, StandardCopyOption.REPLACE_EXISTING); } @@ -164,7 +164,7 @@ public void returnsCorrectLengthWithUrl() throws Exception { final Path file = BodyTest.createTempFile(); try { final byte[] bytes = - new Utf8String("URL returnsCorrectLength!").bytes(); + new Utf8String("URL returnsCorrectLength!").asBytes(); try (InputStream input = new ByteArrayInputStream(bytes)) { Files.copy(input, file, StandardCopyOption.REPLACE_EXISTING); } diff --git a/src/test/java/org/takes/tk/TkProxyTest.java b/src/test/java/org/takes/tk/TkProxyTest.java index 5fc7cee50..89623f320 100644 --- a/src/test/java/org/takes/tk/TkProxyTest.java +++ b/src/test/java/org/takes/tk/TkProxyTest.java @@ -131,7 +131,7 @@ public void exec(final URI home) throws IOException { } /** - * TkProxy can correctly maps path string. + * TkProxy can correctly maps path asString. * @throws Exception If some problem inside * @checkstyle AnonInnerLengthCheck (100 lines) */ diff --git a/src/test/java/org/takes/tk/TkRedirectTest.java b/src/test/java/org/takes/tk/TkRedirectTest.java index d259547d7..8296385bc 100644 --- a/src/test/java/org/takes/tk/TkRedirectTest.java +++ b/src/test/java/org/takes/tk/TkRedirectTest.java @@ -50,7 +50,7 @@ public final class TkRedirectTest { private static final String NEWLINE = "\r\n"; /** - * TkRedirect can create a response with url string. + * TkRedirect can create a response with url asString. * @throws IOException If some problem inside */ @Test @@ -73,7 +73,7 @@ public void createsRedirectResponseWithUrl() throws IOException { } /** - * TkRedirect can create a response with HTTP status code and url string. + * TkRedirect can create a response with HTTP status code and url asString. * @throws IOException If some problem inside */ @Test