This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git
commit f4ef67145a4709c8516321dbb8e6bd5e0613ad30 Author: Gary Gregory <[email protected]> AuthorDate: Fri Jun 23 22:37:02 2023 -0400 Use Comparator.comparing() --- .../main/java/org/apache/juneau/rest/httppart/RequestFormParams.java | 2 +- .../src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java | 2 +- .../main/java/org/apache/juneau/rest/httppart/RequestPathParams.java | 2 +- .../main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java index b175b88a4..43743fba2 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java @@ -436,7 +436,7 @@ public class RequestFormParams extends ArrayList<RequestFormParam> { public Stream<RequestFormParam> getSorted() { Comparator<RequestFormParam> x; if (caseSensitive) - x = (x1,x2) -> x1.getName().compareTo(x2.getName()); + x = Comparator.comparing(RequestFormParam::getName); else x = (x1,x2) -> String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName()); return stream().sorted(x); diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java index c609bd663..d319469db 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java @@ -394,7 +394,7 @@ public class RequestHeaders extends ArrayList<RequestHeader> { public Stream<RequestHeader> getSorted() { Comparator<RequestHeader> x; if (caseSensitive) - x = (x1,x2) -> x1.getName().compareTo(x2.getName()); + x = Comparator.comparing(RequestHeader::getName); else x = (x1,x2) -> String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName()); return stream().sorted(x); diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java index 8a402934b..fd5644175 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java @@ -394,7 +394,7 @@ public class RequestPathParams extends ArrayList<RequestPathParam> { public Stream<RequestPathParam> getSorted() { Comparator<RequestPathParam> x; if (caseSensitive) - x = (x1,x2) -> x1.getName().compareTo(x2.getName()); + x = Comparator.comparing(RequestPathParam::getName); else x = (x1,x2) -> String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName()); return stream().sorted(x); diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java index 984e6fb58..5a4ca7c04 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java @@ -410,7 +410,7 @@ public class RequestQueryParams extends ArrayList<RequestQueryParam> { public Stream<RequestQueryParam> getSorted() { Comparator<RequestQueryParam> x; if (caseSensitive) - x = (x1,x2) -> x1.getName().compareTo(x2.getName()); + x = Comparator.comparing(RequestQueryParam::getName); else x = (x1,x2) -> String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName()); return stream().sorted(x);
