Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-lang.git

This commit is contained in:
Gary Gregory 2020-06-13 10:45:19 -04:00
parent 773f276c23 7651124bec
commit 1c00d14d37
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
View File

@ -25,7 +25,6 @@
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 static Method getMatchingAccessibleMethod(final Class<?> cls,
}
// 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) {

7
src/test/java/org/apache/commons/lang3/compare/ObjectToStringComparatorTest.java
View File

@ -20,7 +20,6 @@
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 String toString() {
@Test
public void testNull() {
final List<Thing> 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 void testNull() {
@Test
public void testNullToString() {
final List<Thing> 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 void testNullToString() {
@Test
public void testSortCollection() {
final List<Thing> 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);