Merge pull request #1452 from diguage

* pr/1452:
  Polish "Refactor duplicate code"
  Refactor duplicate code

Author: snicoll

spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java

@@ -19,6 +19,7 @@
 import java.beans.PropertyDescriptor;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -28,6 +29,7 @@
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Set;
 
 import org.springframework.beans.BeanMetadataElement;
@@ -49,6 +51,17 @@
  */
 abstract class AutowireUtils {
 
+	private static final Comparator<Executable> EXECUTABLE_COMPARATOR = (e1, e2) -> {
+		boolean p1 = Modifier.isPublic(e1.getModifiers());
+		boolean p2 = Modifier.isPublic(e2.getModifiers());
+		if (p1 != p2) {
+			return (p1 ? -1 : 1);
+		}
+		int c1pl = e1.getParameterCount();
+		int c2pl = e2.getParameterCount();
+		return Integer.compare(c2pl, c1pl);
+	};
+
 	/**
 	 * Sort the given constructors, preferring public constructors and "greedy" ones with
 	 * a maximum number of arguments. The result will contain public constructors first,
@@ -57,16 +70,7 @@ abstract class AutowireUtils {
 	 * @param constructors the constructor array to sort
 	 */
 	public static void sortConstructors(Constructor<?>[] constructors) {
-		Arrays.sort(constructors, (c1, c2) -> {
-			boolean p1 = Modifier.isPublic(c1.getModifiers());
-			boolean p2 = Modifier.isPublic(c2.getModifiers());
-			if (p1 != p2) {
-				return (p1 ? -1 : 1);
-			}
-			int c1pl = c1.getParameterCount();
-			int c2pl = c2.getParameterCount();
-			return (c1pl < c2pl ? 1 : (c1pl > c2pl ? -1 : 0));
-		});
+		Arrays.sort(constructors, EXECUTABLE_COMPARATOR);
 	}
 
 	/**
@@ -77,16 +81,7 @@ public static void sortConstructors(Constructor<?>[] constructors) {
 	 * @param factoryMethods the factory method array to sort
 	 */
 	public static void sortFactoryMethods(Method[] factoryMethods) {
-		Arrays.sort(factoryMethods, (fm1, fm2) -> {
-			boolean p1 = Modifier.isPublic(fm1.getModifiers());
-			boolean p2 = Modifier.isPublic(fm2.getModifiers());
-			if (p1 != p2) {
-				return (p1 ? -1 : 1);
-			}
-			int c1pl = fm1.getParameterCount();
-			int c2pl = fm2.getParameterCount();
-			return (c1pl < c2pl ? 1 : (c1pl > c2pl ? -1 : 0));
-		});
+		Arrays.sort(factoryMethods, EXECUTABLE_COMPARATOR);
 	}
 
 	/**