From 702d533e6fa7698893dd6ac467f5fae4bbdcce31 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Fri, 14 Sep 2018 23:59:45 +0200
Subject: [PATCH] Polishing

---
 .../main/java/org/springframework/core/OrderComparator.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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<Object> {
 	 * @return the adapted comparator
 	 * @since 4.1
 	 */
-	public Comparator<Object> withSourceProvider(final OrderSourceProvider sourceProvider) {
+	public Comparator<Object> withSourceProvider(OrderSourceProvider sourceProvider) {
 		return (o1, o2) -> doCompare(o1, o2, sourceProvider);
 	}
 
@@ -78,10 +78,9 @@ public class OrderComparator implements Comparator<Object> {
 			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);
 	}
 
 	/**