Prefer Java stdlib classes to Guava

4 files changed, 5 insertions, 7 deletions

diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/DocumentConverter.java
index abd99bb..faa45ef 100644
--- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java
+++ b/src/main/java/org/zwobble/mammoth/DocumentConverter.java
@@ -1,6 +1,5 @@
 package org.zwobble.mammoth;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import org.zwobble.mammoth.internal.DocumentToHtml;
 import org.zwobble.mammoth.internal.DocumentToHtmlOptions;
@@ -21,6 +20,7 @@ import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.zip.ZipFile;
 
 import static org.zwobble.mammoth.internal.docx.DocumentReader.readDocument;
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
index 8b95973..105d348 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
@@ -1,6 +1,5 @@
 package org.zwobble.mammoth.internal.xml;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 
 import java.util.List;
@@ -45,7 +44,7 @@ public class XmlElement implements XmlNode, XmlElementLike {
 
     @Override
     public String innerText() {
-        return Joiner.on("").join(transform(children, XmlNode::innerText));
+        return String.join("", transform(children, XmlNode::innerText));
     }
 
     @Override
diff --git a/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java b/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java
index 8538534..470002e 100644
--- a/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java
+++ b/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java
@@ -1,6 +1,5 @@
 package org.zwobble.mammoth.tests;
 
-import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
@@ -227,7 +226,7 @@ public class DeepReflectionMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
     }
 
     private static String indentedList(Iterable<String> values) {
-        return Joiner.on(",").join(transform(values, value -> "\n  " + indent(value)));
+        return String.join(",", transform(values, value -> "\n  " + indent(value)));
     }
 
     private static String indent(String value) {
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
index bc8eb45..cd63457 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
@@ -1,11 +1,11 @@
 package org.zwobble.mammoth.tests.docx;
 
-import com.google.common.base.Charsets;
 import org.junit.Test;
 import org.zwobble.mammoth.internal.docx.OfficeXml;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
@@ -28,7 +28,7 @@ public class OfficeXmlTests {
             "</mc:AlternateContent>" +
             "</numbering>";
 
-        XmlElement result = OfficeXml.parseXml(new ByteArrayInputStream(xmlString.getBytes(Charsets.UTF_8)));
+        XmlElement result = OfficeXml.parseXml(new ByteArrayInputStream(xmlString.getBytes(StandardCharsets.UTF_8)));
         assertThat(result.children(), deepEquals(list(element("fallback"))));
     }
 }