From 874dbc9dba0d526fc4c6ead5166e722032239cba Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 26 Mar 2016 17:23:23 +0000 Subject: Remove Guava usage from MammothLists --- .../java/org/zwobble/mammoth/internal/util/MammothLists.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') 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 > List orderedBy(Iterable iterable, Function getKey) { - return orderBy(getKey).sortedCopy(iterable); + return stream(iterable) + .sorted(orderBy(getKey)) + .collect(Collectors.toList()); } - private static > Ordering orderBy(Function getKey) { - return Ordering.from((first, second) -> getKey.apply(first).compareTo(getKey.apply(second))); + private static > Comparator orderBy(Function getKey) { + return (first, second) -> getKey.apply(first).compareTo(getKey.apply(second)); } public static List toList(Iterable iterable) { -- cgit v1.2.3