From 62022f04bec448ccde5c6e0bcffbc139fd42f9f9 Mon Sep 17 00:00:00 2001 From: Alexey Markevich Date: Fri, 4 Apr 2025 12:34:21 +0200 Subject: [PATCH] replace StringUtils#notEmpty() with predicate (s -> !s.isEmpty()) --- .../main/java/org/apache/cxf/common/util/StringUtils.java | 7 ------- .../main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 2 +- .../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 e65a7c8e9aa..3aa4a161927 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.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 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 static boolean isEmpty(String str) { return true; } - public static Predicate notEmpty() { - return NOT_EMPTY; - } - public static boolean isEmpty(List 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 c2b1d504ec3..5d9368902b7 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 @@ -326,7 +326,7 @@ public static List getPathSegments(String thePath, boolean decode, 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 994679c439b..9864791e8b6 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 static boolean isGrantSupportedForClient(Client client, public static List 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(); }