Remove more usages of Guava collections

2 files changed, 4 insertions, 12 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
index c8cdc1c..d528622 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -1,6 +1,5 @@
 package org.zwobble.mammoth.internal.docx;
 
-import com.google.common.collect.ImmutableSet;
 import org.zwobble.mammoth.internal.documents.*;
 import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.util.InputStreamSupplier;
@@ -18,10 +17,11 @@ import static org.zwobble.mammoth.internal.docx.ReadResult.EMPTY_SUCCESS;
 import static org.zwobble.mammoth.internal.docx.ReadResult.success;
 import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFilter;
 import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothSets.set;
 import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft;
 
 public class BodyXmlReader {
-    private static final Set<String> IMAGE_TYPES_SUPPORTED_BY_BROWSERS = ImmutableSet.of(
+    private static final Set<String> IMAGE_TYPES_SUPPORTED_BY_BROWSERS = set(
         "image/png", "image/gif", "image/jpeg", "image/svg+xml", "image/tiff");
 
     private final Styles styles;
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
index d61f323..24710c9 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
@@ -1,6 +1,5 @@
 package org.zwobble.mammoth.internal.docx;
 
-import com.google.common.collect.ImmutableList;
 import org.zwobble.mammoth.internal.documents.DocumentElement;
 import org.zwobble.mammoth.internal.results.InternalResult;
 
@@ -68,21 +67,14 @@ public class ReadResult {
     }
 
     public ReadResult toExtra() {
-        return new ReadResult(list(), concat(extra, elements), warnings);
+        return new ReadResult(list(), eagerConcat(extra, elements), warnings);
     }
 
     public ReadResult appendExtra() {
-        return new ReadResult(concat(elements, extra), list(), warnings);
+        return new ReadResult(eagerConcat(elements, extra), list(), warnings);
     }
 
     public InternalResult<List<DocumentElement>> toResult() {
         return new InternalResult<>(elements, warnings);
     }
-
-    private static <T> List<T> concat(List<T> first, List<T> second) {
-        ImmutableList.Builder<T> builder = ImmutableList.builder();
-        builder.addAll(first);
-        builder.addAll(second);
-        return builder.build();
-    }
 }