You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2018/06/27 18:56:22 UTC
[3/7] [lang] replaces 'size() == 0' and 'length() == 0' with
'isEmpty()'
replaces 'size() == 0' and 'length() == 0' with 'isEmpty()'
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/214cc7fd
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/214cc7fd
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/214cc7fd
Branch: refs/heads/master
Commit: 214cc7fd596b575ed07a7d7c1006b46d5c75613d
Parents: 9626020
Author: Igor Curdvanovschi <in...@gmail.com>
Authored: Wed Jun 20 13:05:02 2018 +0300
Committer: Igor Curdvanovschi <in...@gmail.com>
Committed: Wed Jun 20 13:05:02 2018 +0300
----------------------------------------------------------------------
src/main/java/org/apache/commons/lang3/ClassUtils.java | 2 +-
src/main/java/org/apache/commons/lang3/LocaleUtils.java | 10 +++++-----
.../java/org/apache/commons/lang3/builder/DiffResult.java | 2 +-
.../commons/lang3/exception/DefaultExceptionContext.java | 2 +-
.../java/org/apache/commons/lang3/math/NumberUtils.java | 4 ++--
.../java/org/apache/commons/lang3/text/StrLookup.java | 2 +-
.../apache/commons/lang3/time/DurationFormatUtils.java | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/214cc7fd/src/main/java/org/apache/commons/lang3/ClassUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index be3770b..7456626 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -1347,7 +1347,7 @@ public class ClassUtils {
? className.length() - 1
: className.length());
} else {
- if (className.length() > 0) {
+ if (!className.isEmpty()) {
className = reverseAbbreviationMap.get(className.substring(0, 1));
}
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/214cc7fd/src/main/java/org/apache/commons/lang3/LocaleUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
index cd11781..d5b5043 100644
--- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java
+++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
@@ -150,8 +150,8 @@ public class LocaleUtils {
final String country = segments[1];
final String variant = segments[2];
if (isISO639LanguageCode(language) &&
- (country.length() == 0 || isISO3166CountryCode(country) || isNumericAreaCode(country)) &&
- variant.length() > 0) {
+ (country.isEmpty() || isISO3166CountryCode(country) || isNumericAreaCode(country)) &&
+ !variant.isEmpty()) {
return new Locale(language, country, variant);
}
}
@@ -227,10 +227,10 @@ public class LocaleUtils {
final List<Locale> list = new ArrayList<>(4);
if (locale != null) {
list.add(locale);
- if (locale.getVariant().length() > 0) {
+ if (!locale.getVariant().isEmpty()) {
list.add(new Locale(locale.getLanguage(), locale.getCountry()));
}
- if (locale.getCountry().length() > 0) {
+ if (!locale.getCountry().isEmpty()) {
list.add(new Locale(locale.getLanguage(), StringUtils.EMPTY));
}
if (!list.contains(defaultLocale)) {
@@ -330,7 +330,7 @@ public class LocaleUtils {
final List<Locale> locales = availableLocaleList();
for (final Locale locale : locales) {
if (languageCode.equals(locale.getLanguage()) &&
- locale.getCountry().length() != 0 &&
+ !locale.getCountry().isEmpty() &&
locale.getVariant().isEmpty()) {
countries.add(locale);
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/214cc7fd/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
index d8fa976..93b7f2f 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
@@ -170,7 +170,7 @@ public class DiffResult implements Iterable<Diff<?>> {
* @return a {@code String} description of the differences.
*/
public String toString(final ToStringStyle style) {
- if (diffs.size() == 0) {
+ if (diffs.isEmpty()) {
return OBJECTS_SAME_STRING;
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/214cc7fd/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java b/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java
index 69a4ccf..277c224 100644
--- a/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java
+++ b/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java
@@ -130,7 +130,7 @@ public class DefaultExceptionContext implements ExceptionContext, Serializable {
buffer.append(baseMessage);
}
- if (contextValues.size() > 0) {
+ if (!contextValues.isEmpty()) {
if (buffer.length() > 0) {
buffer.append('\n');
}
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/214cc7fd/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
index 3837cc9..ff5552d 100644
--- a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
+++ b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
@@ -526,7 +526,7 @@ public class NumberUtils {
case 'L' :
if (dec == null
&& exp == null
- && (numeric.length() > 0 && numeric.charAt(0) == '-' && isDigits(numeric.substring(1)) || isDigits(numeric))) {
+ && (!numeric.isEmpty() && numeric.charAt(0) == '-' && isDigits(numeric.substring(1)) || isDigits(numeric))) {
try {
return createLong(numeric);
} catch (final NumberFormatException nfe) { // NOPMD
@@ -661,7 +661,7 @@ public class NumberUtils {
return false;
}
}
- return str.length() > 0;
+ return !str.isEmpty();
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/214cc7fd/src/main/java/org/apache/commons/lang3/text/StrLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/text/StrLookup.java b/src/main/java/org/apache/commons/lang3/text/StrLookup.java
index a99c1b3..bf6ccb2 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrLookup.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrLookup.java
@@ -171,7 +171,7 @@ public abstract class StrLookup<V> {
*/
@Override
public String lookup(final String key) {
- if (key.length() > 0) {
+ if (!key.isEmpty()) {
try {
return System.getProperty(key);
} catch (final SecurityException scex) {
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/214cc7fd/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
index e09260c..8c6e20a 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
@@ -195,7 +195,7 @@ public class DurationFormatUtils {
}
}
}
- if (duration.length() != 0) {
+ if (!duration.isEmpty()) {
// strip the space off again
duration = duration.substring(1);
}