From 08af6720105bbb3cf2061e98727ba5ca67da3144 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 26 Mar 2016 09:44:01 +0000 Subject: Push decision over evaluation time into result static methods --- .../java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java') 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 bf7321e..2770984 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java @@ -17,7 +17,6 @@ import java.util.function.Function; import static com.google.common.collect.Iterables.filter; 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; @@ -172,10 +171,7 @@ public class BodyXmlReader { } public ReadResult readElements(Iterable nodes) { - return ReadResult.flatten( - lazyMap( - filter(nodes, XmlElement.class), - this::readElement)); + return ReadResult.flatMap(filter(nodes, XmlElement.class), this::readElement); } private ReadResult readParagraph(XmlElement element) { @@ -286,7 +282,7 @@ public class BodyXmlReader { } private ReadResult readBlips(XmlElementList blips, Optional altText) { - return ReadResult.flatten(lazyMap(blips, blip -> readBlip(blip, altText))); + return ReadResult.flatMap(blips, blip -> readBlip(blip, altText)); } private ReadResult readBlip(XmlElement blip, Optional altText) { -- cgit v1.2.3