changeset 5842:4a7906022b7d it2-bootstrap

more cases of use default parallel rather than throwing nyi
author mduigou
date Fri, 03 Aug 2012 12:32:37 -0700
parents 209cf2d7a552
children 2d1cea74173b
files src/share/classes/java/util/streams/SequentialMapPipeline.java src/share/classes/java/util/streams/ops/AllMatchOp.java src/share/classes/java/util/streams/ops/AnyMatchOp.java src/share/classes/java/util/streams/ops/BiAllMatchOp.java src/share/classes/java/util/streams/ops/GroupByOp.java
diffstat 5 files changed, 79 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/util/streams/SequentialMapPipeline.java	Thu Jul 26 14:48:08 2012 -0700
+++ b/src/share/classes/java/util/streams/SequentialMapPipeline.java	Fri Aug 03 12:32:37 2012 -0700
@@ -233,13 +233,11 @@
 
     @Override
     public Optional<Mapping<K, V>> findAny() {
-        return findFirst();
+        return pipeline(new FindAnyOp<Mapping<K,V>>());
     }
 
     @Override
     public Optional<Mapping<K, V>> findFirst() {
-        MapIterator<K,V> each = iterator();
-
-        return each.hasNext() ? new Optional<>(each.next()) : Optional.empty();
+        return pipeline(new FindFirstOp<Mapping<K,V>>());
     }
 }
--- a/src/share/classes/java/util/streams/ops/AllMatchOp.java	Thu Jul 26 14:48:08 2012 -0700
+++ b/src/share/classes/java/util/streams/ops/AllMatchOp.java	Fri Aug 03 12:32:37 2012 -0700
@@ -46,7 +46,7 @@
         return allMatch(Objects.requireNonNull(iterator), predicate);
     }
 
-    private static <T> boolean allMatch(Iterator<? extends T> iterator, Predicate<? super T> predicate) {
+    public static <T> boolean allMatch(Iterator<? extends T> iterator, Predicate<? super T> predicate) {
         while (iterator.hasNext()) {
             if(!predicate.test(iterator.next())) {
                 return false;
--- a/src/share/classes/java/util/streams/ops/AnyMatchOp.java	Thu Jul 26 14:48:08 2012 -0700
+++ b/src/share/classes/java/util/streams/ops/AnyMatchOp.java	Fri Aug 03 12:32:37 2012 -0700
@@ -48,7 +48,7 @@
         return anyMatch(Objects.requireNonNull(iterator), predicate);
     }
 
-    private static <T> boolean anyMatch(Iterator<? extends T> iterator, Predicate<? super T> predicate) {
+    public static <T> boolean anyMatch(Iterator<? extends T> iterator, Predicate<? super T> predicate) {
         while (iterator.hasNext()) {
             if(predicate.test(iterator.next())) {
                 return true;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/java/util/streams/ops/BiAllMatchOp.java	Fri Aug 03 12:32:37 2012 -0700
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.streams.ops;
+
+import java.util.Iterator;
+import java.util.MapIterator;
+import java.util.Mapping;
+import java.util.Objects;
+import java.util.functions.BiPredicate;
+import java.util.functions.Predicate;
+import java.util.streams.ParallelStreamable;
+
+/**
+ * AllMatchOp
+ *
+ * @author Brian Goetz
+ */
+public class BiAllMatchOp<K,V> implements ShortCircuitEagerOp<Mapping<K,V>, Boolean> {
+    private final BiPredicate<K,V> predicate;
+
+    public BiAllMatchOp(Predicate<Mapping<K,V> predicate) {
+        this.predicate = Objects.requireNonNull(predicate);
+    }
+
+    @Override
+    public Boolean evaluate(Iterator<Mapping<K,V>> iterator) {
+        return allMatch(Objects.requireNonNull(iterator), predicate);
+    }
+    
+    public Boolean evaluate(MapIterator<K,V> iterator) {
+        return allMatch(Objects.requireNonNull(iterator), predicate);
+    }
+
+    public static <K,V> boolean allMatch(Iterator<? extends Mapping<K,V>> iterator, BiPredicate<<K,V>> predicate) {
+        while (iterator.hasNext()) {
+            if(!predicate.test(iterator.next())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+//
+//    @Override
+//    public <V> Boolean computeParallel(ParallelStreamable<V> source, ParallelOpHelper<T, V> helper) {
+//        throw new UnsupportedOperationException("nyi");
+//    }
+}
--- a/src/share/classes/java/util/streams/ops/GroupByOp.java	Thu Jul 26 14:48:08 2012 -0700
+++ b/src/share/classes/java/util/streams/ops/GroupByOp.java	Fri Aug 03 12:32:37 2012 -0700
@@ -68,9 +68,9 @@
             }
         };
     }
-
-    @Override
-    public <V> Map<K, Streamable<T>> computeParallel(ParallelStreamable<V> source, ParallelOpHelper<T, V> helper) {
-        throw new UnsupportedOperationException("nyi");
-    }
+//
+//    @Override
+//    public <V> Map<K, Streamable<T>> computeParallel(ParallelStreamable<V> source, ParallelOpHelper<T, V> helper) {
+//        throw new UnsupportedOperationException("nyi");
+//    }
 }