diff --git a/src/org/redkale/util/Sheet.java b/src/org/redkale/util/Sheet.java index fea7c1cbf..a2ec3e32c 100644 --- a/src/org/redkale/util/Sheet.java +++ b/src/org/redkale/util/Sheet.java @@ -7,6 +7,7 @@ package org.redkale.util; import java.util.*; import java.util.function.Consumer; +import java.util.stream.*; /** * 页集合。 结构由一个total总数和一个List列表组合而成。 @@ -20,8 +21,6 @@ import java.util.function.Consumer; @SuppressWarnings("unchecked") public class Sheet implements java.io.Serializable, Iterable { - private static final List EMPTYLIST = new ArrayList(); - private long total = -1; private Collection rows; @@ -95,7 +94,7 @@ public class Sheet implements java.io.Serializable, Iterable { @Override public Iterator iterator() { - return (this.rows == null) ? EMPTYLIST.iterator() : this.rows.iterator(); + return (this.rows == null) ? new ArrayList().iterator() : this.rows.iterator(); } @Override @@ -105,4 +104,24 @@ public class Sheet implements java.io.Serializable, Iterable { } } + @Override + public Spliterator spliterator() { + return (this.rows == null) ? new ArrayList().spliterator() : this.rows.spliterator(); + } + + public Stream stream() { + return (this.rows == null) ? new ArrayList().stream() : this.rows.stream(); + } + + public Stream parallelStream() { + return (this.rows == null) ? new ArrayList().parallelStream() : this.rows.parallelStream(); + } + + public Object[] toArray() { + return (this.rows == null) ? new ArrayList().toArray() : this.rows.toArray(); + } + + public T[] toArray(T[] a) { + return (this.rows == null) ? new ArrayList().toArray(a) : this.rows.toArray(a); + } }