From c6ad3493e8a0b53670776d0c5599c30032411be6 Mon Sep 17 00:00:00 2001 From: "Gary D. Gregory" Date: Wed, 5 Jun 2013 03:35:37 +0000 Subject: [PATCH] Use String#isEmpty() instead of String#length() == 0 git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1489692 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/commons/lang3/CharSetUtils.java | 2 +- .../org/apache/commons/lang3/StringUtils.java | 16 ++++++++-------- .../apache/commons/lang3/text/StrBuilder.java | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/CharSetUtils.java b/src/main/java/org/apache/commons/lang3/CharSetUtils.java index 46cc7e819..929237113 100644 --- a/src/main/java/org/apache/commons/lang3/CharSetUtils.java +++ b/src/main/java/org/apache/commons/lang3/CharSetUtils.java @@ -175,7 +175,7 @@ public static String keep(final String str, final String... set) { if (str == null) { return null; } - if (str.length() == 0 || deepEmpty(set)) { + if (str.isEmpty() || deepEmpty(set)) { return StringUtils.EMPTY; } return modify(str, set, true); diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index 980243f6c..2794161c0 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -423,7 +423,7 @@ public static String stripToNull(String str) { return null; } str = strip(str, null); - return str.length() == 0 ? null : str; + return str.isEmpty() ? null : str; } /** @@ -520,7 +520,7 @@ public static String stripStart(final String str, final String stripChars) { while (start != strLen && Character.isWhitespace(str.charAt(start))) { start++; } - } else if (stripChars.length() == 0) { + } else if (stripChars.isEmpty()) { return str; } else { while (start != strLen && stripChars.indexOf(str.charAt(start)) != INDEX_NOT_FOUND) { @@ -565,7 +565,7 @@ public static String stripEnd(final String str, final String stripChars) { while (end != 0 && Character.isWhitespace(str.charAt(end - 1))) { end--; } - } else if (stripChars.length() == 0) { + } else if (stripChars.isEmpty()) { return str; } else { while (end != 0 && stripChars.indexOf(str.charAt(end - 1)) != INDEX_NOT_FOUND) { @@ -2174,7 +2174,7 @@ public static String substringBefore(final String str, final String separator) { if (isEmpty(str) || separator == null) { return str; } - if (separator.length() == 0) { + if (separator.isEmpty()) { return EMPTY; } final int pos = str.indexOf(separator); @@ -3106,7 +3106,7 @@ private static String[] splitByCharacterType(final String str, final boolean cam if (str == null) { return null; } - if (str.length() == 0) { + if (str.isEmpty()) { return ArrayUtils.EMPTY_STRING_ARRAY; } final char[] c = str.toCharArray(); @@ -4567,7 +4567,7 @@ private static String replaceEach( // mchyzer Performance note: This creates very few new objects (one major goal) // let me know if there are performance requests, we can create a harness to measure - if (text == null || text.length() == 0 || searchList == null || + if (text == null || text.isEmpty() || searchList == null || searchList.length == 0 || replacementList == null || replacementList.length == 0) { return text; } @@ -4601,7 +4601,7 @@ private static String replaceEach( // NOTE: logic duplicated below START for (int i = 0; i < searchLength; i++) { if (noMoreMatchesForReplIndex[i] || searchList[i] == null || - searchList[i].length() == 0 || replacementList[i] == null) { + searchList[i].isEmpty() || replacementList[i] == null) { continue; } tempIndex = text.indexOf(searchList[i]); @@ -4659,7 +4659,7 @@ private static String replaceEach( // NOTE: logic mostly duplicated above START for (int i = 0; i < searchLength; i++) { if (noMoreMatchesForReplIndex[i] || searchList[i] == null || - searchList[i].length() == 0 || replacementList[i] == null) { + searchList[i].isEmpty() || replacementList[i] == null) { continue; } tempIndex = text.indexOf(searchList[i], start); diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java index e2f78a89f..a1835e495 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java +++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java @@ -170,7 +170,7 @@ public String getNullText() { * @return this, to enable chaining */ public StrBuilder setNullText(String nullText) { - if (nullText != null && nullText.length() == 0) { + if (nullText != null && nullText.isEmpty()) { nullText = null; } this.nullText = nullText;