Replace for loop with map

3 files changed, 38 insertions, 7 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 b4929fa..81e0307 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -16,6 +16,7 @@ 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.Iterables.lazyFilter;
+import static org.zwobble.mammoth.internal.util.Lists.eagerMap;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.entry;
 import static org.zwobble.mammoth.internal.util.Maps.lookup;
@@ -267,9 +268,8 @@ public class BodyXmlReader {
             }
         }
 
-        List<DocumentElement> mergedRows = new ArrayList<>();
-        for (int rowIndex = 0; rowIndex < rows.size(); rowIndex += 1) {
-            TableRow row = (TableRow) rows.get(rowIndex);
+        return success(eagerMap(rows, (rowIndex, rowElement) -> {
+            TableRow row = (TableRow) rowElement;
 
             List<DocumentElement> mergedCells = new ArrayList<>();
             for (int cellIndex = 0; cellIndex < row.getChildren().size(); cellIndex += 1) {
@@ -283,10 +283,9 @@ public class BodyXmlReader {
                     ));
                 }
             }
-
-            mergedRows.add(new TableRow(mergedCells));
-        }
-        return success(mergedRows);
+            
+            return new TableRow(mergedCells);
+        }));
     }
 
     private Optional<String> checkTableRows(List<DocumentElement> rows) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java b/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java
index cb2ac36..7297894 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java
@@ -2,6 +2,7 @@ package org.zwobble.mammoth.internal.util;
 
 import java.util.Iterator;
 import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -26,6 +27,15 @@ public class Iterables {
         };
     }
 
+    public static <T, R> Iterable<R> lazyMap(Iterable<T> iterable, BiFunction<Integer, T, R> function) {
+        return new Iterable<R>() {
+            @Override
+            public Iterator<R> iterator() {
+                return map(iterable.iterator(), function);
+            }
+        };
+    }
+
     public static <T> Optional<T> getFirst(Iterable<? extends T> iterable) {
         Iterator<? extends T> iterator = iterable.iterator();
         if (iterator.hasNext()) {
@@ -105,6 +115,22 @@ public class Iterables {
         };
     }
 
+    private static <T, R> Iterator<R> map(Iterator<T> iterator, BiFunction<Integer, T, R> function) {
+        return new Iterator<R>() {
+            private int nextIndex = 0;
+
+            @Override
+            public boolean hasNext() {
+                return iterator.hasNext();
+            }
+
+            @Override
+            public R next() {
+                return function.apply(nextIndex++, iterator.next());
+            }
+        };
+    }
+
     public static <T> boolean any(Iterable<T> iterable, Predicate<T> predicate) {
         return stream(iterable).anyMatch(predicate);
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/Lists.java b/src/main/java/org/zwobble/mammoth/internal/util/Lists.java
index fc45c19..f918716 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/Lists.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Lists.java
@@ -1,12 +1,14 @@
 package org.zwobble.mammoth.internal.util;
 
 import java.util.*;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyMap;
 import static org.zwobble.mammoth.internal.util.Iterables.stream;
 
 public class Lists {
@@ -47,6 +49,10 @@ public class Lists {
         return stream(iterable).map(function).collect(Collectors.toList());
     }
 
+    public static <T, R> List<R> eagerMap(Iterable<T> iterable, BiFunction<Integer, T, R> function) {
+        return toList(lazyMap(iterable, function));
+    }
+
     public static <T, R> List<R> eagerFlatMap(Iterable<T> iterable, Function<T, Iterable<R>> function) {
         return stream(iterable)
             .flatMap(element -> stream(function.apply(element)))