Remove more usages of Guava collections

3 files changed, 32 insertions, 11 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 eb4dab9..09a45c7 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
@@ -1,8 +1,8 @@
 package org.zwobble.mammoth.internal.util;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Ordering;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -10,23 +10,29 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.util.Arrays.asList;
 import static org.zwobble.mammoth.internal.util.MammothIterables.stream;
 
 public class MammothLists {
     public static <T> List<T> list() {
-        return ImmutableList.of();
+        return Collections.emptyList();
     }
 
     public static <T> List<T> list(T value1) {
-        return ImmutableList.of(value1);
+        return Collections.singletonList(value1);
     }
 
     public static <T> List<T> list(T value1, T value2) {
-        return ImmutableList.of(value1, value2);
+        return asList(value1, value2);
     }
 
     public static <T> List<T> list(T value1, T value2, T value3) {
-        return ImmutableList.of(value1, value2, value3);
+        return asList(value1, value2, value3);
+    }
+
+    @SafeVarargs
+    public static <T> List<T> list(T... values) {
+        return asList(values);
     }
 
     public static <T> List<T> cons(T head, Iterable<T> tail) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
index 4ca3557..269331f 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
@@ -7,11 +7,11 @@ import java.util.function.Function;
 
 public class MammothMaps {
     public static <K, V> Map<K, V> map() {
-        return ImmutableMap.of();
+        return Collections.emptyMap();
     }
 
     public static <K, V> Map<K, V> map(K key1, V value1) {
-        return ImmutableMap.of(key1, value1);
+        return Collections.singletonMap(key1, value1);
     }
 
     public static <K, V> Map<K, V> map(K key1, V value1, K key2, V value2) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothSets.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothSets.java
index a9658ce..87f7bbe 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothSets.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothSets.java
@@ -1,15 +1,30 @@
 package org.zwobble.mammoth.internal.util;
 
-import com.google.common.collect.ImmutableSet;
-
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
+
+import static java.util.Arrays.asList;
+import static org.zwobble.mammoth.internal.util.MammothIterables.stream;
 
 public class MammothSets {
     public static <T> Set<T> set() {
-        return ImmutableSet.of();
+        return Collections.emptySet();
     }
 
     public static <T> Set<T> set(T value1) {
-        return ImmutableSet.of(value1);
+        return Collections.singleton(value1);
+    }
+
+    @SafeVarargs
+    public static <T> Set<T> set(T... values) {
+        HashSet<T> set = new HashSet<>();
+        set.addAll(asList(values));
+        return set;
+    }
+
+    public static <T> Set<T> toSet(Iterable<T> iterable) {
+        return stream(iterable).collect(Collectors.toSet());
     }
 }