From 7651124bec8a74366fcc70af41ccaa2e441dec3b Mon Sep 17 00:00:00 2001 From: XenoAmess Date: Sat, 13 Jun 2020 22:44:05 +0800 Subject: [PATCH] [LANG-1561] use List.sort instead of Collection.sort (#546) * use_List_sort * Update MethodUtils.java * Update ObjectToStringComparatorTest.java --- .../java/org/apache/commons/lang3/reflect/MethodUtils.java | 3 +-- .../lang3/compare/ObjectToStringComparatorTest.java | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java index 1d76ce611..a706ab042 100644 --- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java +++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java @@ -25,7 +25,6 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.LinkedHashSet; @@ -694,7 +693,7 @@ public class MethodUtils { } // Sort methods by signature to force deterministic result - Collections.sort(matchingMethods, METHOD_BY_SIGNATURE); + matchingMethods.sort(METHOD_BY_SIGNATURE); Method bestMatch = null; for (final Method method : matchingMethods) { diff --git a/src/test/java/org/apache/commons/lang3/compare/ObjectToStringComparatorTest.java b/src/test/java/org/apache/commons/lang3/compare/ObjectToStringComparatorTest.java index c233cf1c2..489c3101d 100644 --- a/src/test/java/org/apache/commons/lang3/compare/ObjectToStringComparatorTest.java +++ b/src/test/java/org/apache/commons/lang3/compare/ObjectToStringComparatorTest.java @@ -20,7 +20,6 @@ package org.apache.commons.lang3.compare; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Test; @@ -47,7 +46,7 @@ public class ObjectToStringComparatorTest { @Test public void testNull() { final List things = Arrays.asList(null, new Thing("y"), null); - Collections.sort(things, ObjectToStringComparator.INSTANCE); + things.sort(ObjectToStringComparator.INSTANCE); assertEquals("y", things.get(0).string); assertEquals(null, things.get(1)); assertEquals(null, things.get(2)); @@ -56,7 +55,7 @@ public class ObjectToStringComparatorTest { @Test public void testNullToString() { final List things = Arrays.asList(new Thing(null), new Thing("y"), new Thing(null)); - Collections.sort(things, ObjectToStringComparator.INSTANCE); + things.sort(ObjectToStringComparator.INSTANCE); assertEquals("y", things.get(0).string); assertEquals(null, things.get(1).string); assertEquals(null, things.get(2).string); @@ -65,7 +64,7 @@ public class ObjectToStringComparatorTest { @Test public void testSortCollection() { final List things = Arrays.asList(new Thing("z"), new Thing("y"), new Thing("x")); - Collections.sort(things, ObjectToStringComparator.INSTANCE); + things.sort(ObjectToStringComparator.INSTANCE); assertEquals("x", things.get(0).string); assertEquals("y", things.get(1).string); assertEquals("z", things.get(2).string);