Remove Mammoth prefix from util classes

14 files changed, 38 insertions, 38 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 d528622..be2cbb9 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.docx;
 import org.zwobble.mammoth.internal.documents.*;
 import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.util.InputStreamSupplier;
-import org.zwobble.mammoth.internal.util.MammothOptionals;
+import org.zwobble.mammoth.internal.util.Optionals;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 import org.zwobble.mammoth.internal.xml.XmlElementLike;
 import org.zwobble.mammoth.internal.xml.XmlElementList;
@@ -15,10 +15,10 @@ import java.util.function.Function;
 
 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;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Sets.set;
+import static org.zwobble.mammoth.internal.util.Strings.trimLeft;
 
 public class BodyXmlReader {
     private static final Set<String> IMAGE_TYPES_SUPPORTED_BY_BROWSERS = set(
@@ -216,7 +216,7 @@ public class BodyXmlReader {
 
     private Optional<NumberingLevel> readNumbering(XmlElementLike properties) {
         XmlElementLike numberingProperties = properties.findChildOrEmpty("w:numPr");
-        return MammothOptionals.flatMap(
+        return Optionals.flatMap(
             readVal(numberingProperties, "w:numId"),
             readVal(numberingProperties, "w:ilvl"),
             numbering::findLevel);
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
index b2677b2..d3f1c1f 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
@@ -1,18 +1,18 @@
 package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.internal.util.MammothMaps;
+import org.zwobble.mammoth.internal.util.Maps;
 import org.zwobble.mammoth.internal.util.Paths;
 
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class ContentTypes {
     public static final ContentTypes DEFAULT = new ContentTypes(map(), map());
 
-    private static final Map<String, String> imageExtensions = MammothMaps.<String, String>builder()
+    private static final Map<String, String> imageExtensions = Maps.<String, String>builder()
         .put("png", "png")
         .put("gif", "gif")
         .put("jpeg", "jpeg")
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
index 20bb0ab..0347362 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
@@ -5,9 +5,9 @@ import org.zwobble.mammoth.internal.xml.XmlElementList;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
-import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
-import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft;
+import static org.zwobble.mammoth.internal.util.Maps.entry;
+import static org.zwobble.mammoth.internal.util.Maps.toMap;
+import static org.zwobble.mammoth.internal.util.Strings.trimLeft;
 
 public class ContentTypesXml {
     public static ContentTypes readContentTypesXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
index 93caee4..f302c6d 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
@@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.docx;
 import org.zwobble.mammoth.internal.documents.Document;
 import org.zwobble.mammoth.internal.documents.Notes;
 import org.zwobble.mammoth.internal.results.InternalResult;
-import org.zwobble.mammoth.internal.util.MammothLists;
+import org.zwobble.mammoth.internal.util.Lists;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.io.IOException;
@@ -13,7 +13,7 @@ import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class DocumentReader {
     @FunctionalInterface
@@ -71,7 +71,7 @@ public class DocumentReader {
             tryParseOfficeXml(file, "word/endnotes.xml")
                 .map(NotesXmlReader.endnote(bodyReaders.forName("endnotes"))::readElement)
                 .orElse(InternalResult.success(list())),
-            MammothLists::eagerConcat).map(Notes::new);
+            Lists::eagerConcat).map(Notes::new);
     }
 
     private static Styles readStyles(DocxFile file) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
index c17346c..c4ef2c3 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
@@ -10,8 +10,8 @@ import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.eagerMapValues;
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.eagerMapValues;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
 import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
 
 public class InMemoryDocxFile implements DocxFile {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
index b75df9b..e70b1d4 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
@@ -7,7 +7,7 @@ import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.List;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFilter;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter;
 
 public class NotesXmlReader {
     public static NotesXmlReader footnote(BodyXmlReader bodyReader) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
index 9208c82..5ee09db 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
@@ -5,8 +5,8 @@ import org.zwobble.mammoth.internal.documents.NumberingLevel;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class Numbering {
     public static final Numbering EMPTY = new Numbering(map());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
index 2167171..1f2fd41 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
@@ -7,9 +7,9 @@ import org.zwobble.mammoth.internal.xml.XmlElementList;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.Maps.entry;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.toMap;
 
 public class NumberingXml {
     public static Numbering readNumberingXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
index 4088df5..b3a90d6 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
@@ -6,8 +6,8 @@ import org.zwobble.mammoth.internal.xml.parsing.XmlParser;
 import java.io.InputStream;
 import java.util.List;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.eagerFlatMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.eagerFlatMap;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class OfficeXml {
     private static NamespacePrefixes XML_NAMESPACES = NamespacePrefixes.builder()
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 24710c9..fa38338 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
@@ -7,9 +7,9 @@ import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyConcat;
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFlatMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.*;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyConcat;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFlatMap;
+import static org.zwobble.mammoth.internal.util.Lists.*;
 
 public class ReadResult {
     public static final ReadResult EMPTY_SUCCESS = success(list());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
index 7e8c14c..c1dd511 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
@@ -2,8 +2,8 @@ package org.zwobble.mammoth.internal.docx;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class Relationships {
     public static final Relationships EMPTY = new Relationships(map());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
index 0c65e55..a63065b 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
@@ -4,8 +4,8 @@ import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
-import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.Maps.entry;
+import static org.zwobble.mammoth.internal.util.Maps.toMap;
 
 public class RelationshipsXml {
     public static Relationships readRelationshipsXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java b/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
index 5b9b131..7271bd0 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
@@ -5,8 +5,8 @@ import org.zwobble.mammoth.internal.documents.Style;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class Styles {
     public static final Styles EMPTY = new Styles(map(), map());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
index 81a16af..625b830 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
@@ -7,9 +7,9 @@ import org.zwobble.mammoth.internal.xml.XmlElementList;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFilter;
-import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
-import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter;
+import static org.zwobble.mammoth.internal.util.Maps.entry;
+import static org.zwobble.mammoth.internal.util.Maps.toMap;
 
 public class StylesXml {
     public static Styles readStylesXmlElement(XmlElement element) {