This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 4.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d61ab04e8a6975f1a71c81be80d43121fbc9721d Author: Alexey Markevich <[email protected]> AuthorDate: Fri Apr 4 12:34:21 2025 +0200 replace StringUtils#notEmpty() with predicate (s -> !s.isEmpty()) (cherry picked from commit 62022f04bec448ccde5c6e0bcffbc139fd42f9f9) --- core/src/main/java/org/apache/cxf/common/util/StringUtils.java | 7 ------- .../jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 2 +- .../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java index e65a7c8e9a..3aa4a16192 100644 --- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java @@ -24,14 +24,11 @@ import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; public final class StringUtils { - private static final Predicate<String> NOT_EMPTY = (String s) -> !s.isEmpty(); - private static final char[] HEX = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; private StringUtils() { @@ -49,10 +46,6 @@ public final class StringUtils { return true; } - public static Predicate<String> notEmpty() { - return NOT_EMPTY; - } - public static boolean isEmpty(List<String> list) { if (list == null || list.isEmpty()) { return true; diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java index c89a2952d5..095de19b98 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java @@ -328,7 +328,7 @@ public final class JAXRSUtils { segments.addAll( Arrays .stream(thePath.substring(start).split("/")) - .filter(StringUtils.notEmpty()) + .filter(s -> !s.isEmpty()) .map(p -> new PathSegmentImpl(p, decode)) .collect(Collectors.toList())); diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java index 994679c439..9864791e8b 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java @@ -251,7 +251,7 @@ public final class OAuthUtils { public static List<String> parseScope(String requestedScope) { if (requestedScope != null) { - return Arrays.stream(requestedScope.split(" ")).filter(StringUtils.notEmpty()).collect(toList()); + return Arrays.stream(requestedScope.split(" ")).filter(s -> !s.isEmpty()).collect(toList()); } else { return Collections.emptyList(); }
