Replace usages of Iterables.transform with appropriate map methods

3 files changed, 7 insertions, 9 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 0edc7a7..6f705bb 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -15,9 +15,9 @@ import java.util.Set;
 import java.util.function.Function;
 
 import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
 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.lazyMap;
 import static org.zwobble.mammoth.internal.util.MammothLists.list;
 import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft;
 
@@ -173,7 +173,7 @@ public class BodyXmlReader {
 
     public ReadResult readElements(Iterable<XmlNode> nodes) {
         return ReadResult.concat(
-            transform(
+            lazyMap(
                 filter(nodes, XmlElement.class),
                 this::readElement));
     }
@@ -286,7 +286,7 @@ public class BodyXmlReader {
     }
 
     private ReadResult readBlips(XmlElementList blips, Optional<String> altText) {
-        return ReadResult.concat(transform(blips, blip -> readBlip(blip, altText)));
+        return ReadResult.concat(lazyMap(blips, blip -> readBlip(blip, altText)));
     }
 
     private ReadResult readBlip(XmlElement blip, Optional<String> altText) {
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 d2ba221..40219b0 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
@@ -8,7 +8,7 @@ import org.zwobble.mammoth.internal.xml.XmlElement;
 import java.util.List;
 
 import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
+import static org.zwobble.mammoth.internal.util.MammothIterables.lazyMap;
 
 public class NotesXmlReader {
     public static NotesXmlReader footnote(BodyXmlReader bodyReader) {
@@ -31,7 +31,7 @@ public class NotesXmlReader {
 
     public InternalResult<List<Note>> readElement(XmlElement element) {
         Iterable<XmlElement> elements = filter(element.findChildren("w:" + tagName), this::isNoteElement);
-        return InternalResult.concat(transform(elements, this::readNoteElement));
+        return InternalResult.concat(lazyMap(elements, this::readNoteElement));
     }
 
     private boolean isNoteElement(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 2b5c279..edec271 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
@@ -1,7 +1,6 @@
 package org.zwobble.mammoth.internal.docx;
 
 import com.google.common.collect.ImmutableBiMap;
-import com.google.common.collect.ImmutableList;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 import org.zwobble.mammoth.internal.xml.XmlNode;
 import org.zwobble.mammoth.internal.xml.XmlNodeVisitor;
@@ -11,8 +10,7 @@ import org.zwobble.mammoth.internal.xml.parsing.XmlParser;
 import java.io.InputStream;
 import java.util.List;
 
-import static com.google.common.collect.Iterables.concat;
-import static com.google.common.collect.Iterables.transform;
+import static org.zwobble.mammoth.internal.util.MammothLists.eagerFlatMap;
 import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class OfficeXml {
@@ -44,7 +42,7 @@ public class OfficeXml {
                     XmlElement collapsedElement = new XmlElement(
                         element.getName(),
                         element.getAttributes(),
-                        ImmutableList.copyOf(concat(transform(element.children(), OfficeXml::collapseAlternateContent))));
+                        eagerFlatMap(element.children(), OfficeXml::collapseAlternateContent));
                     return list(collapsedElement);
                 }
             }