Author: markt
Date: Mon Jul 15 20:38:21 2013
New Revision: 1503465
URL: http://svn.apache.org/r1503465
Log:
EL 3.0 collections operations.
Implement limit.
Modified:
tomcat/trunk/java/org/apache/el/stream/Stream.java
tomcat/trunk/test/org/apache/el/stream/TestCollectionOperations.java
Modified: tomcat/trunk/java/org/apache/el/stream/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/stream/Stream.java?rev=1503465&r1=1503464&r2=1503465&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/stream/Stream.java (original)
+++ tomcat/trunk/java/org/apache/el/stream/Stream.java Mon Jul 15 20:38:21 2013
@@ -209,6 +209,26 @@ public class Stream {
}
+ public Stream limit(final Number count) {
+
+ Iterator<Object> downStream = new OpIterator() {
+
+ private final int limit = count.intValue();
+ private int itemCount = 0;
+
+ @Override
+ protected void findNext() {
+ if (iterator.hasNext() && itemCount < limit) {
+ itemCount ++;
+ next = iterator.next();
+ foundNext = true;
+ }
+ }
+ };
+ return new Stream(downStream);
+ }
+
+
public List<Object> toList() {
List<Object> result = new ArrayList<>();
while (iterator.hasNext()) {
Modified: tomcat/trunk/test/org/apache/el/stream/TestCollectionOperations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/stream/TestCollectionOperations.java?rev=1503465&r1=1503464&r2=1503465&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/stream/TestCollectionOperations.java
(original)
+++ tomcat/trunk/test/org/apache/el/stream/TestCollectionOperations.java Mon
Jul 15 20:38:21 2013
@@ -255,4 +255,21 @@ public class TestCollectionOperations {
Assert.assertEquals(expected, result);
Assert.assertEquals(expected, debug);
}
+
+
+ @Test
+ public void testLimit01() {
+ ELProcessor processor = new ELProcessor();
+ processor.defineBean("beans", beans);
+
+ Object result = processor.getValue(
+ "beans.stream().limit(2).toList()",
+ Object.class);
+
+ List<TesterBeanA> expected = new ArrayList<>(2);
+ expected.add(bean01);
+ expected.add(bean02);
+
+ Assert.assertEquals(expected, result);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
