Merge branch 'main' of https://github.com/pjfanning/excel-streaming-r…

…eader into main
pjfanning · Jan 20, 2022 · 944d6a4 · 944d6a4
2 parents c5ae0c2 + 0c1f031
commit 944d6a4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/main/java/com/github/pjfanning/xlsx/impl/StreamingSheet.java b/src/main/java/com/github/pjfanning/xlsx/impl/StreamingSheet.java
@@ -51,6 +51,15 @@ public Iterator<Row> rowIterator() {
     return reader.iterator();
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public Spliterator<Row> spliterator() {
+    // Long.MAX_VALUE is the documented value to use if the size is unknown
+    return Spliterators.spliterator(rowIterator(),  Long.MAX_VALUE, Spliterator.ORDERED);
+  }
+
   /**
    * {@inheritDoc}
    */

diff --git a/src/test/java/com/github/pjfanning/xlsx/StreamingReaderTest.java b/src/test/java/com/github/pjfanning/xlsx/StreamingReaderTest.java
@@ -18,6 +18,7 @@
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.apache.poi.ss.usermodel.CellType.*;
 import static org.apache.poi.ss.usermodel.Row.MissingCellPolicy.CREATE_NULL_AS_BLANK;
@@ -1268,6 +1269,27 @@ public void testReadSharedFormulasStrictFomat() throws Exception {
     }
   }
 
+  @Test
+  public void testSpliterator() throws Exception {
+    try (
+            InputStream is = new FileInputStream("src/test/resources/data_types.xlsx");
+            Workbook wb = StreamingReader.builder().open(is);
+    ) {
+      Map<String, Integer> map = new HashMap<>();
+      wb.spliterator().forEachRemaining(sheet -> {
+        AtomicInteger count = new AtomicInteger();
+        sheet.spliterator().forEachRemaining(row -> {
+          row.spliterator().forEachRemaining(cell -> {
+            count.incrementAndGet();
+          });
+        });
+        map.put(sheet.getSheetName(), count.get());
+      });
+      assertEquals(1, map.size());
+      assertEquals(new Integer(20), map.get("TestSheet1"));
+    }
+  }
+
   private void testReadSharedFormulasDisabled(StreamingReader.Builder builder) throws Exception {
     try (
             InputStream inputStream = new FileInputStream("src/test/resources/bug65464.xlsx");