aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-03-26 17:23:23 +0000
committerMichael Williamson <mike@zwobble.org>2016-03-26 17:23:23 +0000
commit874dbc9dba0d526fc4c6ead5166e722032239cba (patch)
treedd5772e89f54998ee8f83022e13d79f0b3fcf6e1 /src/main
parent177c4bd8f24ec81b2fe5cdfc486d82d74b2c1d28 (diff)
Remove Guava usage from MammothLists
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
index 7bcc416..10d5be3 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
@@ -1,7 +1,5 @@
package org.zwobble.mammoth.internal.util;
-import com.google.common.collect.Ordering;
-
import java.util.*;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -56,11 +54,13 @@ public class MammothLists {
}
public static <T, R extends Comparable<R>> List<T> orderedBy(Iterable<T> iterable, Function<T, R> getKey) {
- return orderBy(getKey).sortedCopy(iterable);
+ return stream(iterable)
+ .sorted(orderBy(getKey))
+ .collect(Collectors.toList());
}
- private static <T, R extends Comparable<R>> Ordering<T> orderBy(Function<T, R> getKey) {
- return Ordering.from((first, second) -> getKey.apply(first).compareTo(getKey.apply(second)));
+ private static <T, R extends Comparable<R>> Comparator<T> orderBy(Function<T, R> getKey) {
+ return (first, second) -> getKey.apply(first).compareTo(getKey.apply(second));
}
public static <T> List<T> toList(Iterable<T> iterable) {