Add encodeBase64() supporting padding-less encoding

Author: patrickfav

CHANGELOG

@@ -4,6 +4,7 @@
 
 * add `append()` method supporting multiple byte arrays #26
 * add `toCharArray()` method which decodes internal byte array to char[] #27
+* add `encodeBase64()` supporting padding-less encoding
 
 ## v0.8.0
 

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

@@ -631,7 +631,8 @@ public static Bytes parseBase36(CharSequence base36String) {
     }
 
     /**
-     * Parsing of base64 encoded byte arrays. Supporting RFC 3548 normal and url safe encoding.
+     * Parsing of base64 encoded byte arrays.
+     * Supporting RFC 4648 normal and url safe encoding, with or without padding.
      *
      * @param base64String the encoded string
      * @return decoded instance
@@ -1624,27 +1625,46 @@ public String encodeBase36() {
 
     /**
      * Base64 representation with padding. This is *NOT* the url safe variation. This encoding has a space efficiency of 75%.
+     *
+     * This encoding is <a href="https://tools.ietf.org/html/rfc4648">RFC 4648</a> compatible.
      * <p>
      * Example: <code>SpT9/x6v7Q==</code>
      *
      * @return base64 string
      * @see <a href="https://en.wikipedia.org/wiki/Base64">Base64</a>
      */
     public String encodeBase64() {
-        return encode(new BinaryToTextEncoding.Base64Encoding(false, true));
+        return encodeBase64(false, true);
     }
 
     /**
-     * Base64 representation with padding. This is the url safe variation subsitution '+' and '/' with '-' and '_'
+     * Base64 representation with padding. This is the url safe variation substitution '+' and '/' with '-' and '_'
      * respectively. This encoding has a space efficiency of 75%.
+     *
+     * This encoding is <a href="https://tools.ietf.org/html/rfc4648">RFC 4648</a> compatible.
      * <p>
      * Example: <code>SpT9_x6v7Q==</code>
      *
      * @return base64 url safe string
      * @see <a href="https://en.wikipedia.org/wiki/Base64">Base64</a>
      */
     public String encodeBase64Url() {
-        return encode(new BinaryToTextEncoding.Base64Encoding(true, true));
+        return encodeBase64(true, true);
+    }
+
+    /**
+     * Base64 representation with either padding or without and with or without URL and filename safe alphabet.
+     * This encoding is <a href="https://tools.ietf.org/html/rfc4648">RFC 4648</a> compatible.
+     * <p>
+     * Example: <code>SpT9/x6v7Q==</code>
+     *
+     * @param urlSafe     if true will substitute '+' and '/' with '-' and '_'
+     * @param withPadding if true will add padding the next full byte with '='
+     * @return base64 url safe string
+     * @see <a href="https://en.wikipedia.org/wiki/Base64">Base64</a>
+     */
+    public String encodeBase64(boolean urlSafe, boolean withPadding) {
+        return encode(new BinaryToTextEncoding.Base64Encoding(urlSafe, withPadding));
     }
 
     /**

src/test/java/at/favre/lib/bytes/BytesParseAndEncodingTest.java

@@ -61,7 +61,9 @@ public void encodeHex() {
     @Test
     public void parseBase64() {
         assertArrayEquals(encodingExample, Bytes.parseBase64("SpT9/x6v7Q==").array());
+        assertArrayEquals(encodingExample, Bytes.parseBase64("SpT9/x6v7Q").array());
         assertArrayEquals(encodingExample, Bytes.parseBase64("SpT9_x6v7Q==").array());
+        assertArrayEquals(encodingExample, Bytes.parseBase64("SpT9_x6v7Q").array());
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -83,6 +85,25 @@ public void encodeBase64Url() {
         assertEquals("SpT9_x6v7Q==", Bytes.from(encodingExample).encodeBase64Url());
     }
 
+    @Test
+    public void encodeBase64WithConfig() {
+        assertEquals("", Bytes.from(new byte[0]).encodeBase64(true, true));
+        assertEquals("AA==", Bytes.from(new byte[1]).encodeBase64(true, true));
+        assertEquals("SpT9_x6v7Q==", Bytes.from(encodingExample).encodeBase64(true, true));
+
+        assertEquals("", Bytes.from(new byte[0]).encodeBase64(true, false));
+        assertEquals("AA", Bytes.from(new byte[1]).encodeBase64(true, false));
+        assertEquals("SpT9_x6v7Q", Bytes.from(encodingExample).encodeBase64(true, false));
+
+        assertEquals("", Bytes.from(new byte[0]).encodeBase64(false, true));
+        assertEquals("AA==", Bytes.from(new byte[1]).encodeBase64(false, true));
+        assertEquals("SpT9/x6v7Q==", Bytes.from(encodingExample).encodeBase64(false, true));
+
+        assertEquals("", Bytes.from(new byte[0]).encodeBase64(false, false));
+        assertEquals("AA", Bytes.from(new byte[1]).encodeBase64(false, false));
+        assertEquals("SpT9/x6v7Q", Bytes.from(encodingExample).encodeBase64(false, false));
+    }
+
     @Test
     public void parseBase32() {
         assertArrayEquals(encodingExample, Bytes.parseBase32("JKKP37Y6V7WQ====").array());