Get rid of Guava (#555)

* Get rid of Guava

* Fix NPE

* Apply suggestions from review

* Checkstyle

* Add braces to precondition checks

* Forbid space

2 files changed, 3 insertions, 5 deletions

diff --git a/enigma/src/test/java/cuchaz/enigma/TokenChecker.java b/enigma/src/test/java/cuchaz/enigma/TokenChecker.java
index 5f510a4..3a4c24a 100644
--- a/enigma/src/test/java/cuchaz/enigma/TokenChecker.java
+++ b/enigma/src/test/java/cuchaz/enigma/TokenChecker.java
@@ -13,11 +13,10 @@ package cuchaz.enigma;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.google.common.collect.Lists;
-
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.classprovider.CachingClassProvider;
 import cuchaz.enigma.classprovider.JarClassProvider;
@@ -63,7 +62,7 @@ public class TokenChecker {
                 SourceIndex index = source.index();
 
                 // get the token values
-                List<String> values = Lists.newArrayList();
+                List<String> values = new ArrayList<>();
 
                 for (Token token : index.getReferenceTokens((EntryReference<Entry<?>, Entry<?>>) reference)) {
                         values.add(string.substring(token.start, token.end));
diff --git a/enigma/src/test/java/cuchaz/enigma/translation/mapping/serde/recaf/TestRecaf.java b/enigma/src/test/java/cuchaz/enigma/translation/mapping/serde/recaf/TestRecaf.java
index bd1ec20..5f3e47c 100644
--- a/enigma/src/test/java/cuchaz/enigma/translation/mapping/serde/recaf/TestRecaf.java
+++ b/enigma/src/test/java/cuchaz/enigma/translation/mapping/serde/recaf/TestRecaf.java
@@ -10,7 +10,6 @@ import java.nio.file.Path;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.google.common.collect.Sets;
 import com.google.common.jimfs.Jimfs;
 import org.junit.Test;
 
@@ -24,7 +23,7 @@ public class TestRecaf {
                 Set<String> contents;
 
                 try (InputStream in = getClass().getResourceAsStream("/recaf.mappings")) {
-                        contents = Sets.newHashSet(new String(in.readAllBytes(), StandardCharsets.UTF_8).split("\\R"));
+                        contents = Set.of(new String(in.readAllBytes(), StandardCharsets.UTF_8).split("\\R"));
                 }
 
                 try (FileSystem fs = Jimfs.newFileSystem()) {