Author: fanningpj
Date: Thu Dec 23 10:33:59 2021
New Revision: 1896305
URL: http://svn.apache.org/viewvc?rev=1896305&view=rev
Log:
[github-290] Customize Spliterator implementations for better parallelism.
Thanks to Daniel Shuy. This closes #290
Modified:
poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java
poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Row.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Workbook.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SSCellRange.java
poi/trunk/poi/src/main/java/org/apache/poi/util/IntMapper.java
poi/trunk/poi/src/main/java9/module-info.class
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
poi/trunk/poi/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
Modified: poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
Binary files - no diff available.
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
Thu Dec 23 10:33:59 2021
@@ -374,6 +374,16 @@ public final class PackageRelationshipCo
}
/**
+ * Get this collection's spliterator.
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<PackageRelationship> spliterator() {
+ return relationshipsByID.values().spliterator();
+ }
+
+ /**
* Get an iterator of a collection with all relationship with the specified
* type.
*
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
Thu Dec 23 10:33:59 2021
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
+import java.util.Spliterator;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -48,7 +49,7 @@ import org.openxmlformats.schemas.drawin
* is the highest level text separation mechanism.
*/
@Beta
-public class XDDFTextParagraph {
+public class XDDFTextParagraph implements Iterable<XDDFTextRun> {
private XDDFTextBody _parent;
private XDDFParagraphProperties _properties;
private final CTTextParagraph _p;
@@ -115,11 +116,20 @@ public class XDDFTextParagraph {
return _runs;
}
+ @Override
public Iterator<XDDFTextRun> iterator() {
return _runs.iterator();
}
/**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<XDDFTextRun> spliterator() {
+ return _runs.spliterator();
+ }
+
+ /**
* Append a line break.
*
* @return text run representing this line break ('\n').
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
Thu Dec 23 10:33:59 2021
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
+import java.util.Spliterator;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -87,6 +88,14 @@ public abstract class XSLFTextShape exte
return getTextParagraphs().iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<XSLFTextParagraph> spliterator() {
+ return getTextParagraphs().spliterator();
+ }
+
@Override
public String getText() {
StringBuilder out = new StringBuilder();
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
Thu Dec 23 10:33:59 2021
@@ -18,6 +18,7 @@
package org.apache.poi.xssf.streaming;
import java.util.Iterator;
+import java.util.Spliterator;
import org.apache.poi.ss.usermodel.ClientAnchor;
import org.apache.poi.ss.usermodel.Comment;
@@ -66,6 +67,14 @@ public class SXSSFDrawing implements Dra
public Iterator<XSSFShape> iterator() {
return _drawing.getShapes().iterator();
}
-
+
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<XSSFShape> spliterator() {
+ return _drawing.getShapes().spliterator();
+ }
+
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
Thu Dec 23 10:33:59 2021
@@ -21,6 +21,8 @@ import java.util.Iterator;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.SortedMap;
+import java.util.Spliterator;
+import java.util.Spliterators;
import java.util.TreeMap;
import org.apache.poi.ss.SpreadsheetVersion;
@@ -61,6 +63,11 @@ public class SXSSFRow implements Row, Co
return new CellIterator();
}
+ public Spliterator<Cell> allCellsSpliterator()
+ {
+ return Spliterators.spliterator(allCellsIterator(), getLastCellNum(),
0);
+ }
+
public boolean hasCustomHeight()
{
return _height!=-1;
@@ -101,15 +108,6 @@ public class SXSSFRow implements Row, Co
}
//begin of interface implementation
/**
- * {@inheritDoc}
- */
- @Override
- public Iterator<Cell> iterator()
- {
- return new FilledCellIterator();
- }
-
- /**
* Use this to create new cells within the row and return it.
* <p>
* The cell that is returned is a {@link CellType#BLANK}. The type can be
changed
@@ -427,7 +425,23 @@ public class SXSSFRow implements Row, Co
@Override
public Iterator<Cell> cellIterator()
{
- return iterator();
+ return new FilledCellIterator();
+ }
+
+ /**
+ * Create a spliterator over the cells from [0, getLastCellNum()).
+ * Includes blank cells, excludes empty cells
+ *
+ * Returns a spliterator over all filled cells (created via
Row.createCell())
+ * Throws ConcurrentModificationException if cells are added, moved, or
+ * removed after the spliterator is created.
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public Spliterator<Cell> spliterator() {
+ return (Spliterator<Cell>)(Spliterator<? extends Cell>)
_cells.values().spliterator();
}
/**
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
Thu Dec 23 10:33:59 2021
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Spliterator;
import java.util.TreeMap;
import org.apache.poi.ss.SpreadsheetVersion;
@@ -100,11 +101,6 @@ public class SXSSFSheet implements Sheet
}
//start of interface implementation
- @Override
- public Iterator<Row> iterator() {
- return rowIterator();
- }
-
/**
* Create a new row within the sheet and return the high level
representation
*
@@ -509,6 +505,20 @@ public class SXSSFSheet implements Sheet
}
/**
+ * Returns a spliterator of the physical rows
+ *
+ * @return a spliterator of the PHYSICAL rows. Meaning the 3rd element
may not
+ * be the third row if say for instance the second row is undefined.
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public Spliterator<Row> spliterator() {
+ return (Spliterator<Row>)(Spliterator<? extends Row>)
_rows.values().spliterator();
+ }
+
+ /**
* Flag indicating whether the sheet displays Automatic Page Breaks.
*
* @param value <code>true</code> if the sheet displays Automatic Page
Breaks.
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
Thu Dec 23 10:33:59 2021
@@ -31,6 +31,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Spliterator;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.zip.Zip64Mode;
@@ -758,6 +759,19 @@ public class SXSSFWorkbook implements Wo
return new SheetIterator<>();
}
+ /**
+ * Returns a spliterator of the sheets in the workbook
+ * in sheet order. Includes hidden and very hidden sheets.
+ *
+ * @return a spliterator of the sheets.
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<Sheet> spliterator() {
+ return _wb.spliterator();
+ }
+
protected final class SheetIterator<T extends Sheet> implements
Iterator<T> {
final private Iterator<XSSFSheet> it;
@SuppressWarnings("unchecked")
@@ -787,15 +801,6 @@ public class SXSSFWorkbook implements Wo
}
/**
- * Alias for {@link #sheetIterator()} to allow
- * foreach loops
- */
- @Override
- public Iterator<Sheet> iterator() {
- return sheetIterator();
- }
-
- /**
* Get the Sheet object at the given index.
*
* @param index of the sheet number (0-based physical and logical)
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
Thu Dec 23 10:33:59 2021
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import javax.xml.namespace.QName;
@@ -725,6 +726,14 @@ public final class XSSFDrawing extends P
}
/**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<XSSFShape> spliterator() {
+ return getShapes().spliterator();
+ }
+
+ /**
* @return the sheet associated with the drawing
*/
public XSSFSheet getSheet() {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
Thu Dec 23 10:33:59 2021
@@ -22,6 +22,7 @@ import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Objects;
import java.util.Set;
+import java.util.Spliterator;
import java.util.TreeMap;
import org.apache.poi.ss.SpreadsheetVersion;
@@ -120,18 +121,16 @@ public class XSSFRow implements Row, Com
}
/**
- * Alias for {@link #cellIterator()} to allow foreach loops:
- * <blockquote><pre>
- * for(Cell cell : row){
- * ...
- * }
- * </pre></blockquote>
+ * Cell spliterator over the physically defined cells
*
- * @return an iterator over cells in this row.
+ * @return a spliterator over cells in this row.
+ *
+ * @since POI 5.2.0
*/
@Override
- public Iterator<Cell> iterator() {
- return cellIterator();
+ @SuppressWarnings("unchecked")
+ public Spliterator<Cell> spliterator() {
+ return (Spliterator<Cell>)(Spliterator<? extends
Cell>)_cells.values().spliterator();
}
/**
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
Thu Dec 23 10:33:59 2021
@@ -18,6 +18,7 @@
package org.apache.poi.xssf.usermodel;
import java.util.Iterator;
+import java.util.Spliterator;
import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.ss.usermodel.ShapeContainer;
@@ -230,6 +231,14 @@ public final class XSSFShapeGroup extend
return getDrawing().getShapes(this).iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<XSSFShape> spliterator() {
+ return getDrawing().getShapes(this).spliterator();
+ }
+
@Override
public String getShapeName() {
return ctGroup.getNvGrpSpPr().getCNvPr().getName();
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
Thu Dec 23 10:33:59 2021
@@ -2058,12 +2058,16 @@ public class XSSFSheet extends POIXMLDoc
}
/**
- * Alias for {@link #rowIterator()} to
- * allow foreach loops
+ * @return a spliterator of the PHYSICAL rows. Meaning the 3rd element
may not
+ * be the third row if say for instance the second row is undefined.
+ * Call getRowNum() on each row if you care which one it is.
+ *
+ * @since POI 5.2.0
*/
@Override
- public Iterator<Row> iterator() {
- return rowIterator();
+ @SuppressWarnings("unchecked")
+ public Spliterator<Row> spliterator() {
+ return (Spliterator<Row>)(Spliterator<? extends Row>)
_rows.values().spliterator();
}
/**
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
Thu Dec 23 10:33:59 2021
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
+import java.util.Spliterator;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -168,6 +169,14 @@ public class XSSFSimpleShape extends XSS
}
/**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<XSSFTextParagraph> spliterator() {
+ return _paragraphs.spliterator();
+ }
+
+ /**
* Returns the text from all paragraphs in the shape. Paragraphs are
* separated by new lines.
*
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
Thu Dec 23 10:33:59 2021
@@ -35,6 +35,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Spliterator;
import java.util.regex.Pattern;
import javax.xml.namespace.QName;
@@ -1269,6 +1270,20 @@ public class XSSFWorkbook extends POIXML
return sheetIterator();
}
+ /**
+ * Returns a spliterator of the sheets in the workbook
+ * in sheet order. Includes hidden and very hidden sheets.
+ *
+ * @return a spliterator of the sheets.
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public Spliterator<Sheet> spliterator() {
+ return (Spliterator<Sheet>)(Spliterator<? extends Sheet>)
sheets.spliterator();
+ }
+
private final class SheetIterator<T extends Sheet> implements Iterator<T> {
final private Iterator<T> it;
@SuppressWarnings("unchecked")
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
Thu Dec 23 10:33:59 2021
@@ -20,6 +20,7 @@ import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import org.apache.poi.ooxml.POIXMLDocumentPart;
import org.apache.poi.util.Internal;
@@ -113,6 +114,17 @@ public abstract class XWPFAbstractFootno
}
/**
+ * Get a spliterator over the {@link XWPFParagraph}s in the footnote.
+ * @return Spliterator over the paragraph list.
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<XWPFParagraph> spliterator() {
+ return paragraphs.spliterator();
+ }
+
+ /**
* Get the list of {@link XWPFTable}s in the footnote.
* @return List of tables
*/
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Thu Dec 23 10:33:59 2021
@@ -32,6 +32,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Spliterator;
import javax.xml.namespace.QName;
@@ -348,6 +349,15 @@ public class XWPFDocument extends POIXML
return bodyElements.iterator();
}
+ /**
+ * returns a Spliterator with paragraphs and tables
+ *
+ * @since POI 5.2.0
+ */
+ public Spliterator<IBodyElement> getBodyElementsSpliterator() {
+ return bodyElements.spliterator();
+ }
+
@Override
public List<XWPFParagraph> getParagraphs() {
return Collections.unmodifiableList(paragraphs);
@@ -1582,11 +1592,25 @@ public class XWPFDocument extends POIXML
return tables.iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ public Spliterator<XWPFTable> getTablesSpliterator() {
+ return tables.spliterator();
+ }
+
public Iterator<XWPFParagraph> getParagraphsIterator() {
return paragraphs.iterator();
}
/**
+ * @since POI 5.2.0
+ */
+ public Spliterator<XWPFParagraph> getParagraphsSpliterator() {
+ return paragraphs.spliterator();
+ }
+
+ /**
* Returns the paragraph that of position pos
*/
@Override
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
Thu Dec 23 10:33:59 2021
@@ -179,7 +179,9 @@ public final class TestSXSSFSheet extend
assertEquals(2, row0.getRowNum(), "Row 2 knows its row number");
assertEquals(1, sheet.getRowNum(row1), "Sheet knows Row 1's row
number");
assertEquals(2, sheet.getRowNum(row0), "Sheet knows Row 2's row
number");
- assertEquals(row1, sheet.iterator().next(), "Sheet row iteratation
order should be ascending");
+ assertEquals(row1, sheet.iterator().next(), "Sheet row iteration order
should be ascending");
+ sheet.spliterator().tryAdvance(row ->
+ assertEquals(row1, row, "Sheet row iteration order should be
ascending"));
wb.close();
}
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
Thu Dec 23 10:33:59 2021
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.Spliterator;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -86,6 +87,14 @@ public final class PPDrawing extends Rec
}
/**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<EscherRecord> spliterator() {
+ return getEscherRecords().spliterator();
+ }
+
+ /**
* Get access to the atoms inside Textboxes
*/
public EscherTextboxWrapper[] getTextboxWrappers() { return
textboxWrappers; }
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
Thu Dec 23 10:33:59 2021
@@ -21,6 +21,7 @@ import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -261,6 +262,14 @@ implements HSLFShapeContainer, GroupShap
return getShapes().iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<HSLFShape> spliterator() {
+ return getShapes().spliterator();
+ }
+
@Override
public boolean removeShape(HSLFShape shape) {
// TODO: implement!
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
Thu Dec 23 10:33:59 2021
@@ -22,6 +22,7 @@ import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherDgRecord;
@@ -360,6 +361,13 @@ public abstract class HSLFSheet implemen
return getShapes().iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<HSLFShape> spliterator() {
+ return getShapes().spliterator();
+ }
/**
* @return whether shapes on the master sheet should be shown. By default
master graphics is turned off.
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
Thu Dec 23 10:33:59 2021
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -341,6 +342,14 @@ public final class HSLFTextParagraph imp
return _runs.iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<HSLFTextRun> spliterator() {
+ return _runs.spliterator();
+ }
+
@Override
public Double getLeftMargin() {
Integer val = null;
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
Thu Dec 23 10:33:59 2021
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -704,6 +705,14 @@ implements TextShape<HSLFShape,HSLFTextP
return _paragraphs.iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<HSLFTextParagraph> spliterator() {
+ return _paragraphs.spliterator();
+ }
+
@Override
public Insets2D getInsets() {
return new Insets2D(getTopInset(), getLeftInset(), getBottomInset(),
getRightInset());
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java Thu
Dec 23 10:33:59 2021
@@ -20,6 +20,8 @@ package org.apache.poi.ddf;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Spliterator;
+import java.util.Spliterators;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
@@ -263,6 +265,14 @@ public final class EscherArrayProperty e
};
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<byte[]> spliterator() {
+ return Spliterators.spliterator(iterator(),
getNumberOfElementsInArray(), 0);
+ }
+
@Override
public Map<String, Supplier<?>> getGenericProperties() {
return GenericRecordUtil.getGenericProperties(
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
Thu Dec 23 10:33:59 2021
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Spliterator;
import java.util.function.Supplier;
import org.apache.logging.log4j.LogManager;
@@ -170,6 +171,15 @@ public final class EscherContainerRecord
return Collections.unmodifiableList(_childRecords).iterator();
}
+ /**
+ * @return a spliterator over the child records
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<EscherRecord> spliterator() {
+ return _childRecords.spliterator();
+ }
/**
* replaces the internal child list with the contents of the supplied
{@code childRecords}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
Thu Dec 23 10:33:59 2021
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Spliterator;
import java.util.function.Supplier;
import org.apache.poi.common.usermodel.GenericRecord;
@@ -146,6 +147,13 @@ public abstract class PageBreakRecord ex
return _breaks.iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ public final Spliterator<Break> getBreaksSpliterator() {
+ return _breaks.spliterator();
+ }
+
/**
* Adds the page break at the specified parameters
* @param main Depending on sid, will determine row or column to put page
break (zero-based)
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
Thu Dec 23 10:33:59 2021
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Spliterator;
import java.util.TreeMap;
import org.apache.poi.hssf.model.RecordStream;
@@ -307,6 +308,13 @@ public final class RowRecordsAggregate e
return _rowRecords.values().iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ public Spliterator<RowRecord> getSpliterator() {
+ return _rowRecords.values().spliterator();
+ }
+
public int findStartOfRowOutlineGroup(int row) {
// Find the start of the group.
RowRecord rowRecord = this.getRow( row );
@@ -461,6 +469,15 @@ public final class RowRecordsAggregate e
return _valuesAgg.iterator();
}
+ /**
+ * Returns a spliterator for the cell values
+ *
+ * @since POI 5.2.0
+ */
+ public Spliterator<CellValueRecordInterface> getCellValueSpliterator() {
+ return _valuesAgg.spliterator();
+ }
+
public IndexRecord createIndexRecord(int indexRecordOffset, int
sizeOfInitialSheetRecords) {
IndexRecord result = new IndexRecord();
result.setFirstRow(_firstrow);
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
Thu Dec 23 10:33:59 2021
@@ -19,6 +19,8 @@ package org.apache.poi.hssf.record.aggre
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.util.Spliterator;
+import java.util.Spliterators;
import org.apache.poi.hssf.model.RecordStream;
import org.apache.poi.hssf.record.BlankRecord;
@@ -354,4 +356,14 @@ public final class ValueRecordsAggregate
public Iterator<CellValueRecordInterface> iterator() {
return new ValueIterator();
}
+
+ /**
+ * value spliterator
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<CellValueRecordInterface> spliterator() {
+ return Spliterators.spliterator(iterator(),
getPhysicalNumberOfCells(), 0);
+ }
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
Thu Dec 23 10:33:59 2021
@@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Spliterator;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@@ -324,6 +325,16 @@ public class UnicodeString implements Co
return null;
}
+ /**
+ * @since POI 5.2.0
+ */
+ public Spliterator<FormatRun> formatSpliterator() {
+ if (field_4_format_runs != null) {
+ return field_4_format_runs.spliterator();
+ }
+ return null;
+ }
+
public void removeFormatRun(FormatRun r) {
field_4_format_runs.remove(r);
if (field_4_format_runs.size() == 0) {
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
Thu Dec 23 10:33:59 2021
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Spliterator;
import org.apache.poi.ddf.EscherComplexProperty;
import org.apache.poi.ddf.EscherContainerRecord;
@@ -554,6 +555,14 @@ public final class HSSFPatriarch impleme
return _shapes.iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<HSSFShape> spliterator() {
+ return _shapes.spliterator();
+ }
+
protected HSSFSheet getSheet() {
return _sheet;
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java Thu
Dec 23 10:33:59 2021
@@ -630,14 +630,6 @@ public final class HSSFRow implements Ro
{
return new CellIterator();
}
- /**
- * Alias for {@link #cellIterator} to allow
- * foreach loops
- */
- @Override
- public Iterator<Cell> iterator() {
- return cellIterator();
- }
/**
* An iterator over the (physical) cells in the row.
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
Thu Dec 23 10:33:59 2021
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import org.apache.poi.ddf.DefaultEscherRecordFactory;
import org.apache.poi.ddf.EscherBoolProperty;
@@ -410,4 +411,12 @@ public class HSSFShapeGroup extends HSSF
public Iterator<HSSFShape> iterator() {
return shapes.iterator();
}
+
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<HSSFShape> spliterator() {
+ return shapes.spliterator();
+ }
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
Thu Dec 23 10:33:59 2021
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Spliterator;
import java.util.TreeMap;
import java.util.TreeSet;
@@ -963,15 +964,18 @@ public final class HSSFSheet implements
}
/**
- * Alias for {@link #rowIterator()} to allow
- * foreach loops
+ * @return a spliterator of the PHYSICAL rows. Meaning the 3rd element
may not
+ * be the third row if say for instance the second row is
undefined.
+ * Call getRowNum() on each row if you care which one it is.
+ *
+ * @since POI 5.2.0
*/
@Override
- public Iterator<Row> iterator() {
- return rowIterator();
+ @SuppressWarnings("unchecked") // can this clumsy generic syntax be
improved?
+ public Spliterator<Row> spliterator() {
+ return (Spliterator<Row>)(Spliterator<? extends Row>)
_rows.values().spliterator();
}
-
/**
* used internally in the API to get the low level Sheet record
represented by this
* Object.
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
Thu Dec 23 10:33:59 2021
@@ -42,6 +42,7 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.Spliterator;
import java.util.regex.Pattern;
import org.apache.commons.codec.digest.DigestUtils;
@@ -988,12 +989,17 @@ public final class HSSFWorkbook extends
}
/**
- * Alias for {@link #sheetIterator()} to allow
- * foreach loops
+ * Returns a spliterator of the sheets in the workbook
+ * in sheet order. Includes hidden and very hidden sheets.
+ *
+ * @return a spliterator of the sheets.
+ *
+ * @since POI 5.2.0
*/
@Override
- public Iterator<Sheet> iterator() {
- return sheetIterator();
+ @SuppressWarnings("unchecked")
+ public Spliterator<Sheet> spliterator() {
+ return (Spliterator<Sheet>)(Spliterator<? extends Sheet>)
_sheets.spliterator();
}
private final class SheetIterator<T extends Sheet> implements Iterator<T> {
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
Thu Dec 23 10:33:59 2021
@@ -28,6 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Spliterator;
import org.apache.poi.hpsf.ClassID;
import org.apache.poi.poifs.dev.POIFSViewable;
@@ -553,6 +554,16 @@ public class DirectoryNode
return getEntries();
}
+ /**
+ * Returns a Spliterator over all the entries
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<Entry> spliterator() {
+ return _entries.spliterator();
+ }
+
/* ********** END begin implementation of POIFSViewable ********** */
} // end public class DirectoryNode
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
Thu Dec 23 10:33:59 2021
@@ -31,6 +31,8 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
import org.apache.poi.hpsf.ClassID;
@@ -115,6 +117,14 @@ public class FilteringDirectoryNode impl
return getEntries();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<Entry> spliterator() {
+ return Spliterators.spliterator(iterator(), getEntryCount(), 0);
+ }
+
@Override
public int getEntryCount() {
int size = directory.getEntryCount();
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
Thu Dec 23 10:33:59 2021
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.Spliterator;
/**
* Directory property
@@ -243,6 +244,18 @@ public class DirectoryProperty extends P
public Iterator<Property> iterator() {
return getChildren();
}
+ /**
+ * Get a spliterator over the children of this Parent; all elements
+ * are instances of Property.
+ *
+ * @return Spliterator of children; may refer to an empty collection
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<Property> spliterator() {
+ return _children.spliterator();
+ }
/**
* Add a new child to the collection of children
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
Thu Dec 23 10:33:59 2021
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
+import java.util.Spliterator;
/**
* Definition of a custom geometric shape
@@ -110,6 +111,14 @@ public final class CustomGeometry implem
return paths.iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<PathIf> spliterator() {
+ return paths.spliterator();
+ }
+
public Path getTextBounds(){
return textBounds;
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
Thu Dec 23 10:33:59 2021
@@ -21,6 +21,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Spliterator;
+import java.util.Spliterators;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -123,6 +125,12 @@ public final class LookupUtils {
}
};
}
+ /**
+ * @since POI 5.2.0
+ */
+ default Spliterator<Integer> indexSpliterator() {
+ return Spliterators.spliterator(indexIterator(), getSize(), 0);
+ }
default Iterator<Integer> reverseIndexIterator() {
return new Iterator<Integer>() {
int pos = getSize() - 1;
@@ -138,6 +146,12 @@ public final class LookupUtils {
}
};
}
+ /**
+ * @since POI 5.2.0
+ */
+ default Spliterator<Integer> reverseIndexSpliterator() {
+ return Spliterators.spliterator(reverseIndexIterator(), getSize(),
0);
+ }
}
private static final class RowVector implements ValueVector {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Row.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Row.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Row.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Row.java Thu Dec 23
10:33:59 2021
@@ -18,6 +18,8 @@
package org.apache.poi.ss.usermodel;
import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
/**
* High level representation of a row of a spreadsheet.
@@ -212,6 +214,32 @@ public interface Row extends Iterable<Ce
Iterator<Cell> cellIterator();
/**
+ * Alias for {@link #cellIterator()} to allow foreach loops:
+ * <blockquote><pre>
+ * for(Cell cell : row){
+ * ...
+ * }
+ * </pre></blockquote>
+ *
+ * @return an iterator over cells in this row.
+ */
+ @Override
+ default Iterator<Cell> iterator() {
+ return cellIterator();
+ }
+
+ /**
+ * @return Cell spliterator of the physically defined cells. Note element
4 may
+ * actually be row cell depending on how many are defined!
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ default Spliterator<Cell> spliterator() {
+ return Spliterators.spliterator(cellIterator(),
getPhysicalNumberOfCells(), 0);
+ }
+
+ /**
* Returns the Sheet this row belongs to
*
* @return the Sheet that owns this row
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Sheet.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Sheet.java Thu Dec
23 10:33:59 2021
@@ -21,6 +21,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Spliterator;
+import java.util.Spliterators;
import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.ss.util.CellRangeAddress;
@@ -376,6 +378,27 @@ public interface Sheet extends Iterable<
Iterator<Row> rowIterator();
/**
+ * Alias for {@link #rowIterator()} to allow foreach loops
+ */
+ @Override
+ default Iterator<Row> iterator() {
+ return rowIterator();
+ }
+
+ /**
+ * Returns a spliterator of the physical rows
+ *
+ * @return a spliterator of the PHYSICAL rows. Meaning the 3rd element
may not
+ * be the third row if say for instance the second row is undefined.
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ default Spliterator<Row> spliterator() {
+ return Spliterators.spliterator(rowIterator(),
getPhysicalNumberOfRows(), 0);
+ }
+
+ /**
* Control if Excel should be asked to recalculate all formulas on this
sheet
* when the workbook is opened.
*
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Workbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Workbook.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Workbook.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/Workbook.java Thu
Dec 23 10:33:59 2021
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
+import java.util.Spliterators;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.formula.EvaluationWorkbook;
@@ -221,6 +223,27 @@ public interface Workbook extends Closea
Iterator<Sheet> sheetIterator();
/**
+ * Alias for {@link #sheetIterator()} to allow foreach loops
+ */
+ @Override
+ default Iterator<Sheet> iterator() {
+ return sheetIterator();
+ }
+
+ /**
+ * Returns a spliterator of the sheets in the workbook
+ * in sheet order. Includes hidden and very hidden sheets.
+ *
+ * @return a spliterator of the sheets.
+ *
+ * @since POI 5.2.0
+ */
+ @Override
+ default Spliterator<Sheet> spliterator() {
+ return Spliterators.spliterator(sheetIterator(), getNumberOfSheets(),
0);
+ }
+
+ /**
* Get the number of spreadsheets in the workbook
*
* @return the number of sheets
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
Thu Dec 23 10:33:59 2021
@@ -22,6 +22,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
import java.util.function.Supplier;
import org.apache.poi.common.Duplicatable;
@@ -290,6 +292,15 @@ public abstract class CellRangeAddressBa
}
/**
+ * Returns a spliterator over the CellAddresses in this cell range in
row-major order.
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<CellAddress> spliterator() {
+ return Spliterators.spliterator(iterator(), getNumberOfCells(), 0);
+ }
+
+ /**
* Iterates over the cell addresses in a cell range in row major order
*
* The iterator is unaffected by changes to the CellRangeAddressBase
instance
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SSCellRange.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SSCellRange.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SSCellRange.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/SSCellRange.java Thu Dec
23 10:33:59 2021
@@ -20,6 +20,7 @@ package org.apache.poi.ss.util;
import java.lang.reflect.Array;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import java.util.stream.Stream;
import org.apache.poi.ss.usermodel.Cell;
@@ -119,4 +120,12 @@ public final class SSCellRange<K extends
public Iterator<K> iterator() {
return Stream.of(_flattenedArray).iterator();
}
+
+ /**
+ * @since POI 5.2.0
+ */
+ @Override
+ public Spliterator<K> spliterator() {
+ return Stream.of(_flattenedArray).spliterator();
+ }
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/util/IntMapper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/util/IntMapper.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/util/IntMapper.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/util/IntMapper.java Thu Dec 23
10:33:59 2021
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Spliterator;
import org.apache.poi.common.Duplicatable;
@@ -37,7 +38,7 @@ import org.apache.poi.common.Duplicatabl
* update
*/
-public class IntMapper<T> implements Duplicatable {
+public class IntMapper<T> implements Duplicatable, Iterable<T> {
private final List<T> elements;
private final Map<T, Integer> valueKeyMap;
@@ -90,6 +91,13 @@ public class IntMapper<T> implements Dup
return elements.iterator();
}
+ /**
+ * @since POI 5.2.0
+ */
+ public Spliterator<T> spliterator() {
+ return elements.spliterator();
+ }
+
@Override
public IntMapper<T> copy() {
return new IntMapper<>(this);
Modified: poi/trunk/poi/src/main/java9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java9/module-info.class?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
Binary files - no diff available.
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
Thu Dec 23 10:33:59 2021
@@ -25,10 +25,12 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+import java.util.Spliterator;
import org.apache.poi.ddf.EscherBoolProperty;
import org.apache.poi.ddf.EscherContainerRecord;
@@ -700,6 +702,11 @@ class TestDrawingShapes {
assertEquals(s1, iter.next());
assertEquals(s2, iter.next());
assertFalse(iter.hasNext());
+
+ Spliterator<HSSFShape> spliter = patriarch.spliterator();
+ spliter.tryAdvance(s -> assertEquals(s1, s));
+ spliter.tryAdvance(s -> assertEquals(s2, s));
+ assertFalse(spliter.tryAdvance(s -> fail()));
}
}
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
Thu Dec 23 10:33:59 2021
@@ -63,6 +63,9 @@ final class TestDirectoryNode {
}
assertEquals(0, count);
+ // verify that spliterator behaves correctly
+ assertEquals(0, node.spliterator().getExactSizeIfKnown());
+
// verify behavior of isEmpty
assertTrue(node.isEmpty());
@@ -111,6 +114,9 @@ final class TestDirectoryNode {
}
assertEquals(2, count);
+ // verify that spliterator behaves correctly
+ assertEquals(2, node.spliterator().getExactSizeIfKnown());
+
// verify behavior of isEmpty
assertFalse(node.isEmpty());
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
Thu Dec 23 10:33:59 2021
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
@@ -30,6 +31,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Spliterator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -77,6 +79,12 @@ final class TestFilteringDirectoryNode {
assertEquals(dirB, i.next());
assertEquals(eRoot, i.next());
assertThrows(NoSuchElementException.class, i::next, "Should throw
NoSuchElementException when depleted");
+
+ Spliterator<Entry> s = d.spliterator();
+ s.tryAdvance(entry -> assertEquals(dirA, entry));
+ s.tryAdvance(entry -> assertEquals(dirB, entry));
+ s.tryAdvance(entry -> assertEquals(eRoot, entry));
+ assertFalse(s.tryAdvance(entry -> fail("Should be depleted")), "Should
return false when depleted");
}
@Test
@@ -98,6 +106,11 @@ final class TestFilteringDirectoryNode {
assertEquals(dirB, i.next());
assertThrows(NoSuchElementException.class, i::next, "Should throw
NoSuchElementException when depleted");
+ Spliterator<Entry> s1 = d1.spliterator();
+ s1.tryAdvance(entry -> assertEquals(dirA, entry));
+ s1.tryAdvance(entry -> assertEquals(dirB, entry));
+ assertFalse(s1.tryAdvance(entry -> fail("Should be depleted")),
"Should return false when depleted");
+
// Filter more
excl = Arrays.asList("NotThere", "AlsoNotThere", eRoot.getName(),
dirA.getName());
@@ -115,6 +128,10 @@ final class TestFilteringDirectoryNode {
assertEquals(dirB, i.next());
assertThrows(NoSuchElementException.class, i::next, "Should throw
NoSuchElementException when depleted");
+ Spliterator<Entry> s2 = d2.spliterator();
+ s2.tryAdvance(entry -> assertEquals(dirB, entry));
+ assertFalse(s2.tryAdvance(entry -> fail("Should be depleted")),
"Should return false when depleted");
+
// Filter everything
excl = Arrays.asList("NotThere", eRoot.getName(), dirA.getName(),
dirB.getName());
FilteringDirectoryNode d3 = new FilteringDirectoryNode(fs.getRoot(),
excl);
@@ -129,6 +146,9 @@ final class TestFilteringDirectoryNode {
i = d3.getEntries();
assertThrows(NoSuchElementException.class, i::next, "Should throw
NoSuchElementException when depleted");
+
+ Spliterator<Entry> s3 = d3.spliterator();
+ assertFalse(s3.tryAdvance(entry -> fail("Should be depleted")),
"Should return false when depleted");
}
@Test
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
Thu Dec 23 10:33:59 2021
@@ -110,6 +110,7 @@ final class TestDirectoryProperty {
children.add(iter.next());
}
assertEquals(count, children.size());
+ assertEquals(count, _property.spliterator().getExactSizeIfKnown());
if (count != 0)
{
boolean[] found = new boolean[ count ];
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
Thu Dec 23 10:33:59 2021
@@ -24,7 +24,9 @@ import static org.junit.jupiter.api.Asse
import java.awt.geom.Path2D;
import java.awt.geom.Rectangle2D;
+import java.util.stream.StreamSupport;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
class TestPresetGeometries {
@@ -41,6 +43,9 @@ class TestPresetGeometries {
Path2D path = p.getPath(ctx);
assertNotNull(path);
}
+ StreamSupport.stream(geom.spliterator(), true)
+ .map(p -> p.getPath(ctx))
+ .forEach(Assertions::assertNotNull);
}
// we get the same instance on further calls
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
(original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
Thu Dec 23 10:33:59 2021
@@ -25,9 +25,11 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.Iterator;
+import java.util.Spliterator;
import org.apache.poi.ss.ITestDataProvider;
import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
@@ -407,6 +409,54 @@ public abstract class BaseTestRow {
assertEquals(CellType.STRING, cell5.getCellType());
wb.close();
}
+
+ /**
+ * Test adding cells to a row in various places and see if we can find
them again.
+ */
+ @Test
+ void testSpliterator() throws IOException {
+ Workbook wb = _testDataProvider.createWorkbook();
+ Sheet sheet = wb.createSheet();
+ Row row = sheet.createRow(0);
+
+ // One cell at the beginning
+ Cell cell1 = row.createCell(1);
+ Spliterator<Cell> split = row.spliterator();
+ assertTrue(split.tryAdvance(cell -> assertSame(cell1, cell)));
+ assertFalse(split.tryAdvance(cell -> fail()));
+
+ // Add another cell at the end
+ Cell cell2 = row.createCell(99);
+ split = row.spliterator();
+ assertTrue(split.tryAdvance(cell -> assertSame(cell1, cell)));
+ assertTrue(split.tryAdvance(cell -> assertSame(cell2, cell)));
+
+ // Add another cell at the beginning
+ Cell cell3 = row.createCell(0);
+ split = row.spliterator();
+ assertTrue(split.tryAdvance(cell -> assertSame(cell3, cell)));
+ assertTrue(split.tryAdvance(cell -> assertSame(cell1, cell)));
+ assertTrue(split.tryAdvance(cell -> assertSame(cell2, cell)));
+
+ // Replace cell1
+ Cell cell4 = row.createCell(1);
+ split = row.spliterator();
+ assertTrue(split.tryAdvance(cell -> assertSame(cell3, cell)));
+ assertTrue(split.tryAdvance(cell -> assertSame(cell4, cell)));
+ assertTrue(split.tryAdvance(cell -> assertSame(cell2, cell)));
+ assertFalse(split.tryAdvance(cell -> fail()));
+
+ // Add another cell, specifying the cellType
+ Cell cell5 = row.createCell(2, CellType.STRING);
+ split = row.spliterator();
+ assertNotNull(cell5);
+ assertTrue(split.tryAdvance(cell -> assertSame(cell3, cell)));
+ assertTrue(split.tryAdvance(cell -> assertSame(cell4, cell)));
+ assertTrue(split.tryAdvance(cell -> assertSame(cell5, cell)));
+ assertTrue(split.tryAdvance(cell -> assertSame(cell2, cell)));
+ assertEquals(CellType.STRING, cell5.getCellType());
+ wb.close();
+ }
@Test
void testRowStyle() throws IOException {
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
(original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
Thu Dec 23 10:33:59 2021
@@ -37,6 +37,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.Spliterator;
import org.apache.poi.common.usermodel.HyperlinkType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -83,6 +84,9 @@ public abstract class BaseTestSheet {
assertSame(row1, it.next());
assertTrue(it.hasNext());
assertSame(row2, it.next());
+ Spliterator<Row> split = sheet.spliterator();
+ assertTrue(split.tryAdvance(row -> assertSame(row1, row)));
+ assertTrue(split.tryAdvance(row -> assertSame(row2, row)));
assertEquals(1, sheet.getLastRowNum());
// Test row creation with non consecutive index
@@ -102,6 +106,12 @@ public abstract class BaseTestSheet {
Row row2_ovrewritten_ref = it2.next();
assertSame(row2_ovrewritten, row2_ovrewritten_ref);
assertEquals(100.0,
row2_ovrewritten_ref.getCell(0).getNumericCellValue(), 0.0);
+ Spliterator<Row> split2 = sheet.spliterator();
+ assertTrue(split2.tryAdvance(row -> assertSame(row1, row)));
+ assertTrue(split2.tryAdvance(row -> {
+ assertSame(row2_ovrewritten, row);
+ assertEquals(100.0, row.getCell(0).getNumericCellValue(), 0.0);
+ }));
}
}
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
Thu Dec 23 10:33:59 2021
@@ -31,6 +31,7 @@ import static org.junit.jupiter.api.Asse
import java.io.IOException;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
+import java.util.Spliterator;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.ITestDataProvider;
@@ -74,11 +75,15 @@ public abstract class BaseTestWorkbook {
wb.createSheet("Sheet2");
Iterator<Sheet> it = wb.sheetIterator();
+ Spliterator<Sheet> split = wb.spliterator();
it.next();
+ split.tryAdvance(sheet -> {});
wb.setSheetOrder("Sheet2", 1);
// Iterator order should be fixed when iterator is created
assertThrows(ConcurrentModificationException.class, it::next);
+ // Spliterator order should be fixed when spliterator is created
+ assertThrows(ConcurrentModificationException.class, () ->
split.tryAdvance(sheet -> {}));
}
}
@@ -95,10 +100,15 @@ public abstract class BaseTestWorkbook {
wb.createSheet("Sheet2");
Iterator<Sheet> it = wb.sheetIterator();
+ Spliterator<Sheet> split = wb.spliterator();
+ it.next();
+ split.tryAdvance(sheet -> {});
wb.removeSheetAt(1);
// Iterator order should be fixed when iterator is created
assertThrows(ConcurrentModificationException.class, it::next);
+ // Spliterator order should be fixed when spliterator is created
+ assertThrows(ConcurrentModificationException.class, () ->
split.tryAdvance(sheet -> {}));
}
}
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java?rev=1896305&r1=1896304&r2=1896305&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
Thu Dec 23 10:33:59 2021
@@ -28,10 +28,13 @@ import static org.junit.jupiter.api.Asse
import java.io.IOException;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.util.Spliterator;
+import java.util.stream.StreamSupport;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.util.LittleEndianOutputStream;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
final class TestCellRangeAddress {
@@ -275,6 +278,29 @@ final class TestCellRangeAddress {
assertEquals(4, count);
}
+ @Test
+ void spliterator() {
+ final CellRangeAddress A1_B2 = new CellRangeAddress(0, 1, 0, 1);
+
+ // the cell address iterator iterates in row major order
+ final Spliterator<CellAddress> spliter = A1_B2.spliterator();
+ spliter.tryAdvance(addr ->
+ assertEquals(new CellAddress(0, 0), addr, "A1"));
+ spliter.tryAdvance(addr ->
+ assertEquals(new CellAddress(0, 1), addr, "B1"));
+ spliter.tryAdvance(addr ->
+ assertEquals(new CellAddress(1, 0), addr, "A2"));
+ spliter.tryAdvance(addr ->
+ assertEquals(new CellAddress(1, 1), addr, "B2"));
+ assertFalse(spliter.tryAdvance(addr -> fail()));
+
+ // stream
+ long count = StreamSupport.stream(A1_B2.spliterator(), false)
+ .peek(Assertions::assertNotNull)
+ .count();
+ assertEquals(4, count);
+ }
+
private static void assertIntersects(CellRangeAddress regionA,
CellRangeAddress regionB) {
if (!(regionA.intersects(regionB) && regionB.intersects(regionA))) {
final String A = regionA.formatAsString();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
