Change parse() methods to now expect more flexible CharSequence instead of String

Author: patrickfav

CHANGELOG

@@ -5,6 +5,11 @@
 * add radix encoding/parsing and fix radix tests #6, #20
 * add support for Base32 RFC4648 non-hex alphabet encoding/parsing #21
 * add constructor for `IntBuffer` and `CharBuffer`
+* `parse()` methods now expect more flexible `CharSequence` instead of `String` #23
+
+### Breaking
+
+* interface `BinaryToTextEncoding.decode()` changed param to `CharSequence` from `String` #23
 
 ### Deprecations (will be removed in v1.0+)
 

src/main/java/at/favre/lib/bytes/Base64.java

@@ -47,7 +47,7 @@ private Base64() {
             '5', '6', '7', '8', '9', '-', '_'
     };
 
-    static byte[] decode(String in) {
+    static byte[] decode(CharSequence in) {
         // Ignore trailing '=' padding and whitespace from the input.
         int limit = in.length();
         for (; limit > 0; limit--) {

src/main/java/at/favre/lib/bytes/BaseEncoding.java

@@ -115,7 +115,7 @@ private String trimTrailingPadding(CharSequence chars) {
     }
 
     @Override
-    public byte[] decode(String encoded) {
+    public byte[] decode(CharSequence encoded) {
         encoded = trimTrailingPadding(encoded);
         byte[] tmp = new byte[maxDecodedSize(encoded.length())];
         int len = decodeTo(tmp, encoded);

src/main/java/at/favre/lib/bytes/BinaryToTextEncoding.java

@@ -59,7 +59,7 @@ interface Decoder {
          * @param encoded string
          * @return byte array represented by given encoded string
          */
-        byte[] decode(String encoded);
+        byte[] decode(CharSequence encoded);
     }
 
     /**
@@ -101,13 +101,13 @@ public String encode(byte[] byteArray, ByteOrder byteOrder) {
         }
 
         @Override
-        public byte[] decode(String hexString) {
+        public byte[] decode(CharSequence hexString) {
             Objects.requireNonNull(hexString, "hex input must not be null");
             if (hexString.length() % 2 != 0)
                 throw new IllegalArgumentException("invalid hex string, must be mod 2 == 0");
 
             int start;
-            if (hexString.startsWith("0x")) {
+            if (hexString.toString().startsWith("0x")) {
                 start = 2;
             } else {
                 start = 0;
@@ -151,7 +151,7 @@ public String encode(byte[] array, ByteOrder byteOrder) {
         }
 
         @Override
-        public byte[] decode(String encoded) {
+        public byte[] decode(CharSequence encoded) {
             return Base64.decode(encoded);
         }
     }
@@ -175,8 +175,8 @@ public String encode(byte[] array, ByteOrder byteOrder) {
         }
 
         @Override
-        public byte[] decode(String encoded) {
-            byte[] array = new BigInteger(encoded, radix).toByteArray();
+        public byte[] decode(CharSequence encoded) {
+            byte[] array = new BigInteger(encoded.toString(), radix).toByteArray();
             if (array[0] == 0) {
                 byte[] tmp = new byte[array.length - 1];
                 System.arraycopy(array, 1, tmp, 0, tmp.length);

src/main/java/at/favre/lib/bytes/Bytes.java

@@ -543,7 +543,7 @@ public static Bytes from(UUID uuid) {
      * @param binaryString the encoded string
      * @return decoded instance
      */
-    public static Bytes parseBinary(String binaryString) {
+    public static Bytes parseBinary(CharSequence binaryString) {
         return parseRadix(binaryString, 2);
     }
 
@@ -553,7 +553,7 @@ public static Bytes parseBinary(String binaryString) {
      * @param octalString the encoded string
      * @return decoded instance
      */
-    public static Bytes parseOctal(String octalString) {
+    public static Bytes parseOctal(CharSequence octalString) {
         return parseRadix(octalString, 8);
     }
 
@@ -563,7 +563,7 @@ public static Bytes parseOctal(String octalString) {
      * @param decString the encoded string
      * @return decoded instance
      */
-    public static Bytes parseDec(String decString) {
+    public static Bytes parseDec(CharSequence decString) {
         return parseRadix(decString, 10);
     }
 
@@ -578,7 +578,7 @@ public static Bytes parseDec(String decString) {
      * @param radix             radix of the String representation (supported are 2-36)
      * @return decoded instance
      */
-    public static Bytes parseRadix(String radixNumberString, int radix) {
+    public static Bytes parseRadix(CharSequence radixNumberString, int radix) {
         return parse(radixNumberString, new BinaryToTextEncoding.BaseRadixNumber(radix));
     }
 
@@ -589,7 +589,7 @@ public static Bytes parseRadix(String radixNumberString, int radix) {
      * @param hexString the encoded string
      * @return decoded instance
      */
-    public static Bytes parseHex(String hexString) {
+    public static Bytes parseHex(CharSequence hexString) {
         return parse(hexString, new BinaryToTextEncoding.Hex());
     }
 
@@ -601,7 +601,7 @@ public static Bytes parseHex(String hexString) {
      * @param base32Rfc4648String the encoded string
      * @return decoded instance
      */
-    public static Bytes parseBase32(String base32Rfc4648String) {
+    public static Bytes parseBase32(CharSequence base32Rfc4648String) {
         return parse(base32Rfc4648String, new BaseEncoding(BaseEncoding.BASE32_RFC4848, BaseEncoding.BASE32_RFC4848_PADDING));
     }
 
@@ -613,10 +613,10 @@ public static Bytes parseBase32(String base32Rfc4648String) {
      *
      * @param base36String the encoded string
      * @return decoded instance
-     * @deprecated use {@link #parseRadix(String, int)} with 36 instead; will be removed in v1.0+
+     * @deprecated use {@link #parseRadix(CharSequence, int)} with 36 instead; will be removed in v1.0+
      */
     @Deprecated
-    public static Bytes parseBase36(String base36String) {
+    public static Bytes parseBase36(CharSequence base36String) {
         return parse(base36String, new BinaryToTextEncoding.BaseRadixNumber(36));
     }
 
@@ -626,7 +626,7 @@ public static Bytes parseBase36(String base36String) {
      * @param base64String the encoded string
      * @return decoded instance
      */
-    public static Bytes parseBase64(String base64String) {
+    public static Bytes parseBase64(CharSequence base64String) {
         return parse(base64String, new BinaryToTextEncoding.Base64Encoding());
     }
 
@@ -637,7 +637,7 @@ public static Bytes parseBase64(String base64String) {
      * @param decoder the decoder used to decode the string
      * @return decoded instance
      */
-    public static Bytes parse(String encoded, BinaryToTextEncoding.Decoder decoder) {
+    public static Bytes parse(CharSequence encoded, BinaryToTextEncoding.Decoder decoder) {
         return wrap(Objects.requireNonNull(decoder, "passed decoder instance must no be null").decode(Objects.requireNonNull(encoded, "encoded data must not be null")));
     }