Skip to content

Commit a5a7189

Browse files
eamonnmcmanusError Prone Team
authored and
Error Prone Team
committed
Replace ComparisonChain with a Comparator chain.
PiperOrigin-RevId: 668477671
1 parent 7e9a100 commit a5a7189

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

check_api/src/main/java/com/google/errorprone/fixes/Replacements.java

+3-11
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import static com.google.common.base.Preconditions.checkArgument;
2020

2121
import com.google.common.base.Joiner;
22-
import com.google.common.collect.ComparisonChain;
2322
import com.google.common.collect.ImmutableSet;
24-
import com.google.common.collect.Ordering;
2523
import com.google.common.collect.Range;
2624
import com.google.common.collect.RangeMap;
2725
import com.google.common.collect.TreeRangeMap;
@@ -41,15 +39,9 @@ public class Replacements {
4139
* length of the input don't affect the position of earlier replacements.
4240
*/
4341
private static final Comparator<Range<Integer>> DESCENDING =
44-
new Comparator<Range<Integer>>() {
45-
@Override
46-
public int compare(Range<Integer> o1, Range<Integer> o2) {
47-
return ComparisonChain.start()
48-
.compare(o1.lowerEndpoint(), o2.lowerEndpoint(), Ordering.natural().reverse())
49-
.compare(o1.upperEndpoint(), o2.upperEndpoint(), Ordering.natural().reverse())
50-
.result();
51-
}
52-
};
42+
Comparator.<Range<Integer>, Integer>comparing(Range::lowerEndpoint)
43+
.thenComparing(Range::upperEndpoint)
44+
.reversed();
5345

5446
private final TreeMap<Range<Integer>, Replacement> replacements = new TreeMap<>(DESCENDING);
5547
private final RangeMap<Integer, Replacement> overlaps = TreeRangeMap.create();

0 commit comments

Comments
 (0)