From 7ce379267231d560c83610d8d0f592e6b2f5a276 Mon Sep 17 00:00:00 2001 From: Issam El-atif Date: Sun, 2 Jun 2019 23:49:35 +0200 Subject: [PATCH 1/2] Replace with 'Integer.compare()' See gh-23071 --- .../org/springframework/util/comparator/InstanceComparator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java index 597930079c..51d7ed8353 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java @@ -56,7 +56,7 @@ public class InstanceComparator implements Comparator { public int compare(T o1, T o2) { int i1 = getOrder(o1); int i2 = getOrder(o2); - return (i1 < i2 ? -1 : (i1 == i2 ? 0 : 1)); + return (Integer.compare(i1, i2)); } private int getOrder(@Nullable T object) { From 0ef4349c4d1e7caa5c4f7cb6c1dfcaea3ff960ef Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jun 2019 08:31:57 +0200 Subject: [PATCH 2/2] Polish "Replace with 'Integer.compare()'" See gh-23071 --- .../org/springframework/util/comparator/InstanceComparator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java index 51d7ed8353..1b47258d26 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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.