Rollback base64 changes

This reverts ef9f914 and implicitly c6d5c60

Author: jeanbza

google-http-client/src/main/java/com/google/api/client/util/Base64.java

@@ -14,14 +14,19 @@
 
 package com.google.api.client.util;
 
-import com.google.common.io.BaseEncoding;
-
 /**
- * Proxy for base 64 encoding/decoding which matches the Base64 interface in Apache Commons (for
- * historical reasons).
+ * Proxy for version 1.6 (or newer) of the Apache Commons Codec
+ * {@link org.apache.commons.codec.binary.Base64} implementation.
+ *
+ * <p>
+ * This is needed in order to support platforms like Android which already include an older version
+ * of the Apache Commons Codec (Android includes version 1.3). To avoid a dependency library
+ * conflict, this library includes a reduced private copy of version 1.6 (or newer) of the Apache
+ * Commons Codec (using a tool like jarjar).
+ * </p>
  *
- * @author Yaniv Inbar
  * @since 1.8
+ * @author Yaniv Inbar
  */
 public class Base64 {
 
@@ -30,41 +35,36 @@ public class Base64 {
    *
    * @param binaryData binary data to encode or {@code null} for {@code null} result
    * @return byte[] containing Base64 characters in their UTF-8 representation or {@code null} for
-   * {@code null} input
+   *         {@code null} input
+   * @see org.apache.commons.codec.binary.Base64#encodeBase64(byte[])
    */
   public static byte[] encodeBase64(byte[] binaryData) {
-    if (binaryData == null) {
-      return null;
-    }
-    return BaseEncoding.base64().encode(binaryData).getBytes();
+    return org.apache.commons.codec.binary.Base64.encodeBase64(binaryData);
   }
 
   /**
    * Encodes binary data using the base64 algorithm but does not chunk the output.
    *
    * @param binaryData binary data to encode or {@code null} for {@code null} result
    * @return String containing Base64 characters or {@code null} for {@code null} input
+   * @see org.apache.commons.codec.binary.Base64#encodeBase64String(byte[])
    */
   public static String encodeBase64String(byte[] binaryData) {
-    if (binaryData == null) {
-      return null;
-    }
-    return BaseEncoding.base64().encode(binaryData);
+    return org.apache.commons.codec.binary.Base64.encodeBase64String(binaryData);
   }
 
+
   /**
    * Encodes binary data using a URL-safe variation of the base64 algorithm but does not chunk the
    * output. The url-safe variation emits - and _ instead of + and / characters.
    *
    * @param binaryData binary data to encode or {@code null} for {@code null} result
    * @return byte[] containing Base64 characters in their UTF-8 representation or {@code null} for
-   * {@code null} input
+   *         {@code null} input
+   * @see org.apache.commons.codec.binary.Base64#encodeBase64URLSafe(byte[])
    */
   public static byte[] encodeBase64URLSafe(byte[] binaryData) {
-    if (binaryData == null) {
-      return null;
-    }
-    return BaseEncoding.base64Url().omitPadding().encode(binaryData).getBytes();
+    return org.apache.commons.codec.binary.Base64.encodeBase64URLSafe(binaryData);
   }
 
   /**
@@ -73,45 +73,34 @@ public static byte[] encodeBase64URLSafe(byte[] binaryData) {
    *
    * @param binaryData binary data to encode or {@code null} for {@code null} result
    * @return String containing Base64 characters or {@code null} for {@code null} input
+   * @see org.apache.commons.codec.binary.Base64#encodeBase64URLSafeString(byte[])
    */
   public static String encodeBase64URLSafeString(byte[] binaryData) {
-    if (binaryData == null) {
-      return null;
-    }
-    return BaseEncoding.base64Url().omitPadding().encode(binaryData);
+    return org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString(binaryData);
   }
 
   /**
    * Decodes Base64 data into octets.
    *
    * @param base64Data Byte array containing Base64 data or {@code null} for {@code null} result
    * @return Array containing decoded data or {@code null} for {@code null} input
+   * @see org.apache.commons.codec.binary.Base64#decodeBase64(byte[])
    */
   public static byte[] decodeBase64(byte[] base64Data) {
-    if (base64Data == null) {
-      return null;
-    }
-    return decodeBase64(new String(base64Data));
+    return org.apache.commons.codec.binary.Base64.decodeBase64(base64Data);
   }
 
   /**
    * Decodes a Base64 String into octets.
    *
    * @param base64String String containing Base64 data or {@code null} for {@code null} result
    * @return Array containing decoded data or {@code null} for {@code null} input
+   * @see org.apache.commons.codec.binary.Base64#decodeBase64(String)
    */
   public static byte[] decodeBase64(String base64String) {
-    if (base64String == null) {
-      return null;
-    }
-
-    base64String = base64String.replace("\r", "");
-    base64String = base64String.replace("\n", "");
+    return org.apache.commons.codec.binary.Base64.decodeBase64(base64String);
+  }
 
-    try {
-      return BaseEncoding.base64().decode(base64String);
-    } catch (IllegalArgumentException e) {
-      return BaseEncoding.base64Url().omitPadding().decode(base64String);
-    }
+  private Base64() {
   }
 }