Validate byte and string. (#78)

Author: arturobernalg

src/main/java/org/apache/commons/codec/binary/Base64.java

@@ -235,7 +235,7 @@ public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunk
      */
     public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked,
                                       final boolean urlSafe, final int maxResultSize) {
-        if (binaryData == null || binaryData.length == 0) {
+        if (BinaryCodec.isEmpty(binaryData)) {
             return binaryData;
         }
 

src/main/java/org/apache/commons/codec/binary/BaseNCodec.java

@@ -427,7 +427,7 @@ protected boolean containsAlphabetOrPad(final byte[] arrayOctet) {
      */
     @Override
     public byte[] decode(final byte[] pArray) {
-        if (pArray == null || pArray.length == 0) {
+        if (BinaryCodec.isEmpty(pArray)) {
             return pArray;
         }
         final Context context = new Context();
@@ -483,7 +483,7 @@ public byte[] decode(final String pArray) {
      */
     @Override
     public byte[] encode(final byte[] pArray) {
-        if (pArray == null || pArray.length == 0) {
+        if (BinaryCodec.isEmpty(pArray)) {
             return pArray;
         }
         return encode(pArray, 0, pArray.length);
@@ -503,7 +503,7 @@ public byte[] encode(final byte[] pArray) {
      * @since 1.11
      */
     public byte[] encode(final byte[] pArray, final int offset, final int length) {
-        if (pArray == null || pArray.length == 0) {
+        if (BinaryCodec.isEmpty(pArray)) {
             return pArray;
         }
         final Context context = new Context();

src/main/java/org/apache/commons/codec/binary/BinaryCodec.java

@@ -136,8 +136,10 @@ public static byte[] fromAscii(final char[] ascii) {
      * @param array
      *            the source array
      * @return {@code true} if the given array is {@code null} or empty (size 0.)
+     *
+     * @since 1.16 change visibility to public
      */
-    private static boolean isEmpty(final byte[] array) {
+    static boolean isEmpty(final byte[] array) {
         return array == null || array.length == 0;
     }
 

src/main/java/org/apache/commons/codec/language/Caverphone2.java

@@ -17,6 +17,8 @@
 
 package org.apache.commons.codec.language;
 
+import org.apache.commons.codec.binary.StringUtils;
+
 /**
  * Encodes a string into a Caverphone 2.0 value.
  *
@@ -43,7 +45,7 @@ public class Caverphone2 extends AbstractCaverphone {
     @Override
     public String encode(final String source) {
         String txt = source;
-        if (txt == null || txt.isEmpty()) {
+        if (SoundexUtils.isEmpty(txt)) {
             return TEN_1;
         }
 

src/main/java/org/apache/commons/codec/language/SoundexUtils.java

@@ -19,6 +19,7 @@
 
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.codec.StringEncoder;
+import org.apache.commons.codec.binary.StringUtils;
 
 /**
  * Utility methods for {@link Soundex} and {@link RefinedSoundex} classes.
@@ -38,7 +39,7 @@ final class SoundexUtils {
      * @return A clean String.
      */
     static String clean(final String str) {
-        if (str == null || str.isEmpty()) {
+        if (isEmpty(str)) {
             return str;
         }
         final int len = str.length();
@@ -120,4 +121,23 @@ static int differenceEncoded(final String es1, final String es2) {
         return diff;
     }
 
+    /**
+     * <p>Checks if a CharSequence is empty ("") or null.</p>
+     *
+     * <pre>
+     * StringUtils.isEmpty(null)      = true
+     * StringUtils.isEmpty("")        = true
+     * StringUtils.isEmpty(" ")       = false
+     * StringUtils.isEmpty("bob")     = false
+     * StringUtils.isEmpty("  bob  ") = false
+     * </pre>
+     *
+     * @param cs  the CharSequence to check, may be null
+     * @return {@code true} if the CharSequence is empty or null
+     * @since 1.16
+     */
+    static boolean isEmpty(final CharSequence cs) {
+        return cs == null || cs.length() == 0;
+    }
+
 }