Implement tryGetLast on list instead of iterable

3 files changed, 11 insertions, 7 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/html/Html.java b/src/main/java/org/zwobble/mammoth/internal/html/Html.java
index 12ac11e..8f4d671 100644
--- a/src/main/java/org/zwobble/mammoth/internal/html/Html.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/Html.java
@@ -8,8 +8,8 @@ import java.util.List;
 import java.util.Map;
 
 import static org.zwobble.mammoth.internal.util.Casts.tryCast;
-import static org.zwobble.mammoth.internal.util.MammothIterables.tryGetLast;
 import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.tryGetLast;
 import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class Html {
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
index fececa3..2201a0b 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
@@ -1,7 +1,5 @@
 package org.zwobble.mammoth.internal.util;
 
-import com.google.common.collect.Iterables;
-
 import java.util.Iterator;
 import java.util.Optional;
 import java.util.function.Function;
@@ -10,10 +8,6 @@ import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 public class MammothIterables {
-    public static <T> Optional<T> tryGetLast(Iterable<T> iterable) {
-        return Optional.ofNullable(Iterables.getLast(iterable, null));
-    }
-
     public static <T> Optional<T> tryFind(Iterable<T> iterable, Predicate<T> predicate) {
         for (T element : iterable) {
             if (predicate.test(element)) {
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 7f5b83c..d5efabf 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
@@ -5,6 +5,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -61,4 +62,13 @@ public class MammothLists {
     public static <T> List<T> toList(Iterable<T> iterable) {
         return stream(iterable).collect(Collectors.toList());
     }
+
+    public static <T> Optional<T> tryGetLast(List<T> list) {
+        if (list.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(list.get(list.size() - 1));
+        }
+    }
+
 }