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 --- src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java') 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 1045054..d61f323 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java @@ -10,15 +10,13 @@ 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.eagerFlatMap; -import static org.zwobble.mammoth.internal.util.MammothLists.list; -import static org.zwobble.mammoth.internal.util.MammothLists.toList; +import static org.zwobble.mammoth.internal.util.MammothLists.*; public class ReadResult { public static final ReadResult EMPTY_SUCCESS = success(list()); - public static ReadResult flatten(Iterable results) { - results = toList(results); + public static ReadResult flatMap(Iterable iterable, Function function) { + List results = eagerMap(iterable, function); return new ReadResult( eagerFlatMap(results, result -> result.elements), eagerFlatMap(results, result -> result.extra), -- cgit v1.2.3