From 214cc7fd596b575ed07a7d7c1006b46d5c75613d Mon Sep 17 00:00:00 2001 From: Igor Curdvanovschi Date: Wed, 20 Jun 2018 13:05:02 +0300 Subject: [PATCH] replaces 'size() == 0' and 'length() == 0' with 'isEmpty()' --- src/main/java/org/apache/commons/lang3/ClassUtils.java | 2 +- .../java/org/apache/commons/lang3/LocaleUtils.java | 10 +++++----- .../org/apache/commons/lang3/builder/DiffResult.java | 2 +- .../lang3/exception/DefaultExceptionContext.java | 2 +- .../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(-) diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java index be3770b5b..745662637 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 @@ private static String getCanonicalName(String className) { ? className.length() - 1 : className.length()); } else { - if (className.length() > 0) { + if (!className.isEmpty()) { className = reverseAbbreviationMap.get(className.substring(0, 1)); } } diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java index cd1178139..d5b504327 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 @@ private static Locale parseLocale(final String str) { 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 static List localeLookupList(final Locale locale, final Locale de final List 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 static List countriesByLanguage(final String languageCode) { final List 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); } 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 d8fa976c9..93b7f2f74 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 String toString() { * @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; } 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 69a4ccf55..277c224ab 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 String getFormattedExceptionMessage(final String baseMessage){ buffer.append(baseMessage); } - if (contextValues.size() > 0) { + if (!contextValues.isEmpty()) { if (buffer.length() > 0) { buffer.append('\n'); } 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 3837cc97c..ff5552d5a 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 static Number createNumber(final String str) { 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 @@ private static boolean isAllZeros(final String str) { return false; } } - return str.length() > 0; + return !str.isEmpty(); } //----------------------------------------------------------------------- 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 a99c1b348..bf6ccb23f 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 @@ private static class SystemPropertiesStrLookup extends StrLookup { */ @Override public String lookup(final String key) { - if (key.length() > 0) { + if (!key.isEmpty()) { try { return System.getProperty(key); } catch (final SecurityException scex) { 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 e09260cd4..8c6e20a53 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 static String formatDurationWords( } } } - if (duration.length() != 0) { + if (!duration.isEmpty()) { // strip the space off again duration = duration.substring(1); }