Eat own dog food: StringUtils#isEmpty(String) and replace some but not all String#length() == 0 with String#isEmpty()

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1299411 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/commons/lang3/CharSetUtils.java

@@ -143,7 +143,7 @@ public class CharSetUtils {
             return null;
         }
         if (str.length() == 0 || deepEmpty(set)) {
-            return "";
+            return StringUtils.EMPTY;
         }
         return modify(str, set, true);
     }

src/main/java/org/apache/commons/lang3/ClassUtils.java

@@ -184,10 +184,7 @@ public class ClassUtils {
      * @return the class name of the class without the package name or an empty string
      */
     public static String getShortClassName(String className) {   
-        if (className == null) {
+        if (StringUtils.isEmpty(className)) {
-            return StringUtils.EMPTY;
-        }
-        if (className.length() == 0) {
             return StringUtils.EMPTY;
         }
 
@@ -289,7 +286,7 @@ public class ClassUtils {
      * @return the package name or an empty string
      */
     public static String getPackageName(String className) {
-        if (className == null || className.length() == 0) {
+        if (StringUtils.isEmpty(className)) {
             return StringUtils.EMPTY;
         }
 

src/main/java/org/apache/commons/lang3/LocaleUtils.java

@@ -235,7 +235,7 @@ public class LocaleUtils {
             for (int i = 0; i < locales.size(); i++) {
                 Locale locale = locales.get(i);
                 if (countryCode.equals(locale.getCountry()) &&
-                        locale.getVariant().length() == 0) {
+                        locale.getVariant().isEmpty()) {
                     langs.add(locale);
                 }
             }
@@ -268,7 +268,7 @@ public class LocaleUtils {
                 Locale locale = locales.get(i);
                 if (languageCode.equals(locale.getLanguage()) &&
                         locale.getCountry().length() != 0 &&
-                        locale.getVariant().length() == 0) {
+                        locale.getVariant().isEmpty()) {
                     countries.add(locale);
                 }
             }

src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java

@@ -647,7 +647,7 @@ public class ExceptionUtils {
             String token = frames.nextToken();
             // Determine if the line starts with <whitespace>at
             int at = token.indexOf("at");
-            if (at != -1 && token.substring(0, at).trim().length() == 0) {
+            if (at != -1 && token.substring(0, at).trim().isEmpty()) {
                 traceStarted = true;
                 list.add(token);
             } else if (traceStarted) {

src/main/java/org/apache/commons/lang3/text/StrMatcher.java

@@ -187,7 +187,7 @@ public abstract class StrMatcher {
      * @return a new Matcher for the given characters
      */
     public static StrMatcher charSetMatcher(String chars) {
-        if (chars == null || chars.length() == 0) {
+        if (StringUtils.isEmpty(chars)) {
             return NONE_MATCHER;
         }
         if (chars.length() == 1) {

src/main/java/org/apache/commons/lang3/text/StrTokenizer.java

@@ -23,6 +23,7 @@ import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Tokenizes a string based based on delimiters (separators)
@@ -650,7 +651,7 @@ public class StrTokenizer implements ListIterator<String>, Cloneable {
      * @param tok  the token to add
      */
     private void addToken(List<String> list, String tok) {
-        if (tok == null || tok.length() == 0) {
+        if (StringUtils.isEmpty(tok)) {
             if (isIgnoreEmptyTokens()) {
                 return;
             }

src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java

@@ -86,8 +86,8 @@ public class LocaleUtilsTest extends TestCase {
         assertNotNull("valid locale", locale);
         assertEquals(language, locale.getLanguage());
         //country and variant are empty
-        assertTrue(locale.getCountry() == null || locale.getCountry().length() == 0);
+        assertTrue(locale.getCountry() == null || locale.getCountry().isEmpty());
-        assertTrue(locale.getVariant() == null || locale.getVariant().length() == 0);
+        assertTrue(locale.getVariant() == null || locale.getVariant().isEmpty());
     }
 
     /**
@@ -103,7 +103,7 @@ public class LocaleUtilsTest extends TestCase {
         assertEquals(language, locale.getLanguage());
         assertEquals(country, locale.getCountry());
         //variant is empty
-        assertTrue(locale.getVariant() == null || locale.getVariant().length() == 0);
+        assertTrue(locale.getVariant() == null || locale.getVariant().isEmpty());
     }
 
     /**
@@ -393,7 +393,7 @@ public class LocaleUtilsTest extends TestCase {
                 Locale locale = iterator.next();
                 // should have an en empty variant
                 assertTrue(locale.getVariant() == null
-                        || locale.getVariant().length() == 0);
+                        || locale.getVariant().isEmpty());
                 assertEquals(country, locale.getCountry());
                 if (language.equals(locale.getLanguage())) {
                     found = true;
@@ -443,7 +443,7 @@ public class LocaleUtilsTest extends TestCase {
                 Locale locale = iterator.next();
                 // should have an en empty variant
                 assertTrue(locale.getVariant() == null
-                        || locale.getVariant().length() == 0);
+                        || locale.getVariant().isEmpty());
                 assertEquals(language, locale.getLanguage());
                 if (countrie.equals(locale.getCountry())) {
                     found = true;