diff --git a/spring-core/src/main/java/org/springframework/core/OrderComparator.java b/spring-core/src/main/java/org/springframework/core/OrderComparator.java index 513e631481a..ea3332a082d 100644 --- a/spring-core/src/main/java/org/springframework/core/OrderComparator.java +++ b/spring-core/src/main/java/org/springframework/core/OrderComparator.java @@ -59,7 +59,7 @@ public class OrderComparator implements Comparator { * @return the adapted comparator * @since 4.1 */ - public Comparator withSourceProvider(final OrderSourceProvider sourceProvider) { + public Comparator withSourceProvider(OrderSourceProvider sourceProvider) { return (o1, o2) -> doCompare(o1, o2, sourceProvider); } @@ -78,10 +78,9 @@ public class OrderComparator implements Comparator { return 1; } - // Direct evaluation instead of Integer.compareTo to avoid unnecessary object creation. int i1 = getOrder(o1, sourceProvider); int i2 = getOrder(o2, sourceProvider); - return (i1 < i2) ? -1 : (i1 > i2) ? 1 : 0; + return Integer.compare(i1, i2); } /**