[tomcat] 03/05: Use method references instead of lambda expressions when possible

[ebourg]

This is an automated email from the ASF dual-hosted git repository.

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 24750228694b58e7631afeedf651a9f15779bad3
Author: Emmanuel Bourg <ebo...@apache.org>
AuthorDate: Wed Dec 2 00:55:34 2020 +0100

    Use method references instead of lambda expressions when possible
---
 .../apache/catalina/filters/RestCsrfPreventionFilter.java  | 14 +++++---------
 java/org/apache/catalina/users/MemoryGroup.java            |  2 +-
 java/org/apache/coyote/http2/Http2UpgradeHandler.java      |  2 +-
 java/org/apache/tomcat/util/modeler/ManagedBean.java       |  2 +-
 .../xreflection/ObjectReflectionPropertyInspector.java     |  2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java 
b/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
index b557ab8..dd787bc 100644
--- a/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
@@ -129,16 +129,13 @@ public class RestCsrfPreventionFilter extends 
CsrfPreventionFilterBase {
     }
 
     private static interface RestCsrfPreventionStrategy {
-        static final NonceSupplier<HttpServletRequest, String> 
nonceFromRequestHeader = (r, k) -> r
-                .getHeader(k);
-        static final NonceSupplier<HttpServletRequest, String[]> 
nonceFromRequestParams = (r, k) -> r
-                .getParameterValues(k);
+        static final NonceSupplier<HttpServletRequest, String> 
nonceFromRequestHeader = HttpServletRequest::getHeader;
+        static final NonceSupplier<HttpServletRequest, String[]> 
nonceFromRequestParams = ServletRequest::getParameterValues;
         static final NonceSupplier<HttpSession, String> nonceFromSession = (s, 
k) -> Objects
                 .isNull(s) ? null : (String) s.getAttribute(k);
 
-        static final NonceConsumer<HttpServletResponse> nonceToResponse = (r, 
k, v) -> r.setHeader(
-                k, v);
-        static final NonceConsumer<HttpSession> nonceToSession = (s, k, v) -> 
s.setAttribute(k, v);
+        static final NonceConsumer<HttpServletResponse> nonceToResponse = 
HttpServletResponse::setHeader;
+        static final NonceConsumer<HttpSession> nonceToSession = 
HttpSession::setAttribute;
 
         boolean apply(HttpServletRequest request, HttpServletResponse 
response) throws IOException;
     }
@@ -194,8 +191,7 @@ public class RestCsrfPreventionFilter extends 
CsrfPreventionFilterBase {
     }
 
     private class FetchRequest implements RestCsrfPreventionStrategy {
-        private final Predicate<String> fetchRequest = s -> 
Constants.CSRF_REST_NONCE_HEADER_FETCH_VALUE
-                .equalsIgnoreCase(s);
+        private final Predicate<String> fetchRequest = 
Constants.CSRF_REST_NONCE_HEADER_FETCH_VALUE::equalsIgnoreCase;
 
         @Override
         public boolean apply(HttpServletRequest request, HttpServletResponse 
response) {
diff --git a/java/org/apache/catalina/users/MemoryGroup.java 
b/java/org/apache/catalina/users/MemoryGroup.java
index 2d793e6..5a8a12c 100644
--- a/java/org/apache/catalina/users/MemoryGroup.java
+++ b/java/org/apache/catalina/users/MemoryGroup.java
@@ -187,7 +187,7 @@ public class MemoryGroup extends AbstractGroup {
         synchronized (roles) {
             if (roles.size() > 0) {
                 sb.append(" roles=\"");
-                StringUtils.join(roles, ',', (x) -> x.getRolename(), sb);
+                StringUtils.join(roles, ',', Role::getRolename, sb);
                 sb.append("\"");
             }
         }
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 0307ece..054f3bc 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1839,7 +1839,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
         }
 
         public long getRoundTripTimeNano() {
-            return (long) roundTripTimes.stream().mapToLong(x -> 
x.longValue()).average().orElse(0);
+            return (long) 
roundTripTimes.stream().mapToLong(Long::longValue).average().orElse(0);
         }
     }
 
diff --git a/java/org/apache/tomcat/util/modeler/ManagedBean.java 
b/java/org/apache/tomcat/util/modeler/ManagedBean.java
index 6215200..36084ad 100644
--- a/java/org/apache/tomcat/util/modeler/ManagedBean.java
+++ b/java/org/apache/tomcat/util/modeler/ManagedBean.java
@@ -559,7 +559,7 @@ public class ManagedBean implements java.io.Serializable {
     private String createOperationKey(OperationInfo operation) {
         StringBuilder key = new StringBuilder(operation.getName());
         key.append('(');
-        StringUtils.join(operation.getSignature(), ',', (x) -> x.getType(), 
key);
+        StringUtils.join(operation.getSignature(), ',', FeatureInfo::getType, 
key);
         key.append(')');
 
         return key.toString().intern();
diff --git 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index 5f2ebb3..520e6a0 100644
--- 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++ 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -52,7 +52,7 @@ public final class ObjectReflectionPropertyInspector {
 
         Set<SetPropertyClass> baseClasses = getKnownClasses()
             .stream()
-            .map(c -> processClass(c))
+            .map(ObjectReflectionPropertyInspector::processClass)
             .collect(Collectors.toSet());
         generateCode(
             baseClasses,


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org