From f39c6d36c70fbbbbb0323fabf7a1ee6d1c0f4d7c Mon Sep 17 00:00:00 2001 From: diguage Date: Sun, 27 Jun 2021 17:08:39 +0800 Subject: [PATCH 1/2] Simplify Comparator using method references See gh-27102 --- .../spel/support/ReflectiveConstructorResolver.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java index c2de81e378..6106081f04 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java @@ -19,6 +19,7 @@ package org.springframework.expression.spel.support; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.List; import org.springframework.core.MethodParameter; @@ -59,11 +60,7 @@ public class ReflectiveConstructorResolver implements ConstructorResolver { Class type = context.getTypeLocator().findType(typeName); Constructor[] ctors = type.getConstructors(); - Arrays.sort(ctors, (c1, c2) -> { - int c1pl = c1.getParameterCount(); - int c2pl = c2.getParameterCount(); - return Integer.compare(c1pl, c2pl); - }); + Arrays.sort(ctors, Comparator.comparingInt(Constructor::getParameterCount)); Constructor closeMatch = null; Constructor matchRequiringConversion = null; From 403e1f2505335bc6f5a17546a838a15f53ca2e3a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 2 Jul 2021 08:11:41 +0200 Subject: [PATCH 2/2] Update copyright year of changed file See gh-27102 --- .../expression/spel/support/ReflectiveConstructorResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java index 6106081f04..8ec11fabec 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.