diff --git a/core-java-modules/core-java-string-operations-2/src/main/java/com/baeldung/trim/LTrimRTrim.java b/core-java-modules/core-java-string-operations-2/src/main/java/com/baeldung/trim/LTrimRTrim.java index d1c51b492e..af46f426d8 100644 --- a/core-java-modules/core-java-string-operations-2/src/main/java/com/baeldung/trim/LTrimRTrim.java +++ b/core-java-modules/core-java-string-operations-2/src/main/java/com/baeldung/trim/LTrimRTrim.java @@ -102,38 +102,20 @@ public class LTrimRTrim { return checkStrings(ltrim, rtrim); } - public static String guavaLtrim(String s) { - return CharMatcher.whitespace() - .trimLeadingFrom(s); - } - - public static String guavaRtrim(String s) { - return CharMatcher.whitespace() - .trimTrailingFrom(s); - } - // Guava CharMatcher trimLeadingFrom / trimTrailingFrom @Benchmark public boolean guavaCharMatcher() { - String ltrim = guavaLtrim(src); - String rtrim = guavaRtrim(src); + String ltrim = CharMatcher.whitespace().trimLeadingFrom(src); + String rtrim = CharMatcher.whitespace().trimTrailingFrom(src); return checkStrings(ltrim, rtrim); } - public static String stringUtilsRTrim(String str) { - return org.apache.commons.lang3.StringUtils.stripEnd(str, " "); - } - - public static String stringUtilsLTrim(String str) { - return org.apache.commons.lang3.StringUtils.stripStart(str, " "); - } - // Apache Commons StringUtils containsIgnoreCase @Benchmark public boolean apacheCommonsStringUtils() { - String ltrim = stringUtilsLTrim(src); - String rtrim = stringUtilsRTrim(src); + String ltrim = org.apache.commons.lang3.StringUtils.stripStart(src, " "); + String rtrim = org.apache.commons.lang3.StringUtils.stripEnd(src, " "); return checkStrings(ltrim, rtrim); } diff --git a/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/trim/LTrimRTrimUnitTest.java b/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/trim/LTrimRTrimUnitTest.java index 4da35909f7..18c8608455 100644 --- a/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/trim/LTrimRTrimUnitTest.java +++ b/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/trim/LTrimRTrimUnitTest.java @@ -4,6 +4,8 @@ import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Test; +import com.google.common.base.CharMatcher; + import java.util.regex.Pattern; /** @@ -53,8 +55,8 @@ public class LTrimRTrimUnitTest { @Test public void givenString_whenCallingGuavaCharMatcher_thenReturnsTrue() { // Use StringUtils containsIgnoreCase to avoid case insensitive issues - String ltrim = LTrimRTrim.guavaLtrim(src); - String rtrim = LTrimRTrim.guavaRtrim(src); + String ltrim = CharMatcher.whitespace().trimLeadingFrom(src);; + String rtrim = CharMatcher.whitespace().trimTrailingFrom(src); // Compare the Strings obtained and the expected Assert.assertTrue(ltrimResult.equalsIgnoreCase(ltrim)); @@ -65,8 +67,8 @@ public class LTrimRTrimUnitTest { @Test public void givenString_whenCallingStringUtilsStripStartEnd_thenReturnsTrue() { // Use StringUtils containsIgnoreCase to avoid case insensitive issues - String ltrim = LTrimRTrim.stringUtilsLTrim(src); - String rtrim = LTrimRTrim.stringUtilsRTrim(src); + String ltrim = org.apache.commons.lang3.StringUtils.stripStart(src, " "); + String rtrim = org.apache.commons.lang3.StringUtils.stripEnd(src, " "); // Compare the Strings obtained and the expected Assert.assertTrue(ltrimResult.equalsIgnoreCase(ltrim));