[commons-lang] 08/10: Use Stream.

[ggregory]

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/commons-lang.git

commit 1297d7c3653d6f66906e5f09719dab40f1f50d56
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Aug 21 11:06:02 2022 -0400

    Use Stream.
---
 .../apache/commons/lang3/reflect/MethodUtils.java  | 25 +++++++---------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java 
b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index 11e995338..81367bb4d 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -665,7 +665,7 @@ public class MethodUtils {
      * @return The accessible method
      */
     public static Method getMatchingAccessibleMethod(final Class<?> cls,
-            final String methodName, final Class<?>... parameterTypes) {
+        final String methodName, final Class<?>... parameterTypes) {
         try {
             return 
MemberUtils.setAccessibleWorkaround(cls.getMethod(methodName, parameterTypes));
         } catch (final NoSuchMethodException ignored) {
@@ -673,14 +673,8 @@ public class MethodUtils {
         }
         // search through all methods
         final Method[] methods = cls.getMethods();
-        final List<Method> matchingMethods = new ArrayList<>();
-        for (final Method method : methods) {
-            // compare name and parameters
-            if (method.getName().equals(methodName) &&
-                    MemberUtils.isMatchingMethod(method, parameterTypes)) {
-                matchingMethods.add(method);
-            }
-        }
+        final List<Method> matchingMethods = Stream.of(methods)
+            .filter(method -> method.getName().equals(methodName) && 
MemberUtils.isMatchingMethod(method, 
parameterTypes)).collect(Collectors.toList());
 
         // Sort methods by signature to force deterministic result
         matchingMethods.sort(METHOD_BY_SIGNATURE);
@@ -689,10 +683,7 @@ public class MethodUtils {
         for (final Method method : matchingMethods) {
             // get accessible version of method
             final Method accessibleMethod = getAccessibleMethod(method);
-            if (accessibleMethod != null && (bestMatch == null || 
MemberUtils.compareMethodFit(
-                        accessibleMethod,
-                        bestMatch,
-                        parameterTypes) < 0)) {
+            if (accessibleMethod != null && (bestMatch == null || 
MemberUtils.compareMethodFit(accessibleMethod, bestMatch, parameterTypes) < 0)) 
{
                 bestMatch = accessibleMethod;
             }
         }
@@ -706,11 +697,11 @@ public class MethodUtils {
             final String methodParameterComponentTypeName = 
ClassUtils.primitiveToWrapper(methodParameterComponentType).getName();
 
             final Class<?> lastParameterType = 
parameterTypes[parameterTypes.length - 1];
-            final String parameterTypeName = lastParameterType==null ? null : 
lastParameterType.getName();
-            final String parameterTypeSuperClassName = lastParameterType==null 
? null : lastParameterType.getSuperclass().getName();
+            final String parameterTypeName = lastParameterType == null ? null 
: lastParameterType.getName();
+            final String parameterTypeSuperClassName = lastParameterType == 
null ? null : lastParameterType.getSuperclass().getName();
 
-            if (parameterTypeName!= null && parameterTypeSuperClassName != 
null && !methodParameterComponentTypeName.equals(parameterTypeName)
-                    && 
!methodParameterComponentTypeName.equals(parameterTypeSuperClassName)) {
+            if (parameterTypeName != null && parameterTypeSuperClassName != 
null && !methodParameterComponentTypeName.equals(parameterTypeName)
+                && 
!methodParameterComponentTypeName.equals(parameterTypeSuperClassName)) {
                 return null;
             }
         }