From fb90d0bd85bf500611e904da67531ee360249049 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 27 Oct 2022 09:51:05 -0400 Subject: [PATCH] Reuse own API --- .../java/org/apache/commons/lang3/StringUtils.java | 3 +-- .../org/apache/commons/lang3/text/StrBuilder.java | 2 +- .../org/apache/commons/lang3/LocaleUtilsTest.java | 12 +++++------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index cf1f4c4c5..680f548a4 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -6716,8 +6716,7 @@ private static String replaceEach( // find the next earliest match // NOTE: logic mostly duplicated above START for (int i = 0; i < searchLength; i++) { - if (noMoreMatchesForReplIndex[i] || searchList[i] == null || - searchList[i].isEmpty() || replacementList[i] == null) { + if (noMoreMatchesForReplIndex[i] || isEmpty(searchList[i]) || 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 299dc591f..b79bd9d88 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java +++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java @@ -173,7 +173,7 @@ public String getNullText() { * @return this, to enable chaining */ public StrBuilder setNullText(String nullText) { - if (nullText != null && nullText.isEmpty()) { + if (StringUtils.isEmpty(nullText)) { nullText = null; } this.nullText = nullText; diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java index fecd7ad70..6d5e32dd2 100644 --- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java @@ -82,8 +82,8 @@ private static void assertValidToLocale(final String language) { assertNotNull(locale, "valid locale"); assertEquals(language, locale.getLanguage()); //country and variant are empty - assertTrue(locale.getCountry() == null || locale.getCountry().isEmpty()); - assertTrue(locale.getVariant() == null || locale.getVariant().isEmpty()); + assertTrue(StringUtils.isEmpty(locale.getCountry())); + assertTrue(StringUtils.isEmpty(locale.getVariant())); } /** @@ -99,7 +99,7 @@ private static void assertValidToLocale(final String localeString, final String assertEquals(language, locale.getLanguage()); assertEquals(country, locale.getCountry()); //variant is empty - assertTrue(locale.getVariant() == null || locale.getVariant().isEmpty()); + assertTrue(StringUtils.isEmpty(locale.getVariant())); } /** @@ -396,8 +396,7 @@ private static void assertLanguageByCountry(final String country, final String[] while (iterator.hasNext()) { final Locale locale = iterator.next(); // should have an en empty variant - assertTrue(locale.getVariant() == null - || locale.getVariant().isEmpty()); + assertTrue(StringUtils.isEmpty(locale.getVariant())); assertEquals(country, locale.getCountry()); if (language.equals(locale.getLanguage())) { found = true; @@ -443,8 +442,7 @@ private static void assertCountriesByLanguage(final String language, final Strin while (iterator.hasNext()) { final Locale locale = iterator.next(); // should have an en empty variant - assertTrue(locale.getVariant() == null - || locale.getVariant().isEmpty()); + assertTrue(StringUtils.isEmpty(locale.getVariant())); assertEquals(language, locale.getLanguage()); if (country.equals(locale.getCountry())) { found = true;