Emulate PrimitiveIterator, Iterator, Iterable Java 8 API.
Change-Id: I553f0bd2d5dad089c4f87ed50457500611bd1d3a
diff --git a/user/super/com/google/gwt/emul/java/lang/Iterable.java b/user/super/com/google/gwt/emul/java/lang/Iterable.java
index 3b0c2ab..b68cb6b 100644
--- a/user/super/com/google/gwt/emul/java/lang/Iterable.java
+++ b/user/super/com/google/gwt/emul/java/lang/Iterable.java
@@ -15,16 +15,26 @@
*/
package java.lang;
+import static javaemul.internal.InternalPreconditions.checkNotNull;
+
import java.util.Iterator;
+import java.util.function.Consumer;
/**
* Allows an instance of a class implementing this interface to be used in the
- * foreach statement. <a
- * href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Iterable.html">[Sun
- * docs]</a>
- *
+ * foreach statement.
+ * See <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html">
+ * the official Java API doc</a> for details.
+ *
* @param <T> type of returned iterator
*/
public interface Iterable<T> {
Iterator<T> iterator();
+
+ default void forEach(Consumer<? super T> action) {
+ checkNotNull(action);
+ for (T t : this) {
+ action.accept(t);
+ }
+ }
}
diff --git a/user/super/com/google/gwt/emul/java/util/Iterator.java b/user/super/com/google/gwt/emul/java/util/Iterator.java
index 698e68f..b01e8cb 100644
--- a/user/super/com/google/gwt/emul/java/util/Iterator.java
+++ b/user/super/com/google/gwt/emul/java/util/Iterator.java
@@ -15,11 +15,14 @@
*/
package java.util;
+import static javaemul.internal.InternalPreconditions.checkNotNull;
+
+import java.util.function.Consumer;
+
/**
- * See <a
- * href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Iterator.html">the
- * official Java API doc</a> for details.
- *
+ * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html">
+ * the official Java API doc</a> for details.
+ *
* @param <E> element type
*/
public interface Iterator<E> {
@@ -28,6 +31,14 @@
E next();
- void remove();
+ default void forEachRemaining(Consumer<? super E> consumer) {
+ checkNotNull(consumer);
+ while (hasNext()) {
+ consumer.accept(next());
+ }
+ }
+ default void remove() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/user/super/com/google/gwt/emul/java/util/PrimitiveIterator.java b/user/super/com/google/gwt/emul/java/util/PrimitiveIterator.java
new file mode 100644
index 0000000..a08b931
--- /dev/null
+++ b/user/super/com/google/gwt/emul/java/util/PrimitiveIterator.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package java.util;
+
+import static javaemul.internal.InternalPreconditions.checkCriticalNotNull;
+import static javaemul.internal.InternalPreconditions.checkNotNull;
+
+import java.util.function.Consumer;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.LongConsumer;
+
+/**
+ * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/PrimitiveIterator.html">
+ * the official Java API doc</a> for details.
+ *
+ * @param <T> element type
+ * @param <C> consumer type
+ */
+public interface PrimitiveIterator<T, C> extends Iterator<T> {
+
+ void forEachRemaining(C consumer);
+
+ /**
+ * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/PrimitiveIterator.OfDouble.html">
+ * the official Java API doc</a> for details.
+ */
+ interface OfDouble extends PrimitiveIterator<Double, DoubleConsumer> {
+ double nextDouble();
+
+ @Override
+ default Double next() {
+ return nextDouble();
+ }
+
+ @Override
+ default void forEachRemaining(DoubleConsumer consumer) {
+ checkNotNull(consumer);
+ while (hasNext()) {
+ consumer.accept(nextDouble());
+ }
+ }
+
+ @Override
+ default void forEachRemaining(Consumer<? super Double> consumer) {
+ if (consumer instanceof DoubleConsumer) {
+ forEachRemaining((DoubleConsumer) consumer);
+ } else {
+ checkCriticalNotNull(consumer);
+ forEachRemaining((DoubleConsumer) consumer::accept);
+ }
+ }
+ }
+
+ /**
+ * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/PrimitiveIterator.OfInt.html">
+ * the official Java API doc</a> for details.
+ */
+ interface OfInt extends PrimitiveIterator<Integer, IntConsumer> {
+ int nextInt();
+
+ @Override
+ default Integer next() {
+ return nextInt();
+ }
+
+ @Override
+ default void forEachRemaining(IntConsumer consumer) {
+ checkNotNull(consumer);
+ while (hasNext()) {
+ consumer.accept(nextInt());
+ }
+ }
+
+ @Override
+ default void forEachRemaining(Consumer<? super Integer> consumer) {
+ if (consumer instanceof IntConsumer) {
+ forEachRemaining((IntConsumer) consumer);
+ } else {
+ checkCriticalNotNull(consumer);
+ forEachRemaining((IntConsumer) consumer::accept);
+ }
+ }
+ }
+
+ /**
+ * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/PrimitiveIterator.OfLong.html">
+ * the official Java API doc</a> for details.
+ */
+ interface OfLong extends PrimitiveIterator<Long, LongConsumer> {
+ long nextLong();
+
+ @Override
+ default Long next() {
+ return nextLong();
+ }
+
+ @Override
+ default void forEachRemaining(LongConsumer consumer) {
+ checkNotNull(consumer);
+ while (hasNext()) {
+ consumer.accept(nextLong());
+ }
+ }
+
+ @Override
+ default void forEachRemaining(Consumer<? super Long> consumer) {
+ if (consumer instanceof LongConsumer) {
+ forEachRemaining((LongConsumer) consumer);
+ } else {
+ checkCriticalNotNull(consumer);
+ forEachRemaining((LongConsumer) consumer::accept);
+ }
+ }
+ }
+
+}
diff --git a/user/test/com/google/gwt/emultest/EmulJava8Suite.java b/user/test/com/google/gwt/emultest/EmulJava8Suite.java
index 4b7dd03..d713785 100644
--- a/user/test/com/google/gwt/emultest/EmulJava8Suite.java
+++ b/user/test/com/google/gwt/emultest/EmulJava8Suite.java
@@ -19,6 +19,7 @@
import com.google.gwt.emultest.java8.util.OptionalIntTest;
import com.google.gwt.emultest.java8.util.OptionalLongTest;
import com.google.gwt.emultest.java8.util.OptionalTest;
+import com.google.gwt.emultest.java8.util.PrimitiveIteratorTest;
import com.google.gwt.emultest.java8.util.StringJoinerTest;
import com.google.gwt.junit.tools.GWTTestSuite;
@@ -37,6 +38,7 @@
suite.addTestSuite(OptionalIntTest.class);
suite.addTestSuite(OptionalLongTest.class);
suite.addTestSuite(OptionalDoubleTest.class);
+ suite.addTestSuite(PrimitiveIteratorTest.class);
suite.addTestSuite(StringJoinerTest.class);
return suite;
diff --git a/user/test/com/google/gwt/emultest/java8/util/PrimitiveIteratorTest.java b/user/test/com/google/gwt/emultest/java8/util/PrimitiveIteratorTest.java
new file mode 100644
index 0000000..0c02cdd2f
--- /dev/null
+++ b/user/test/com/google/gwt/emultest/java8/util/PrimitiveIteratorTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.emultest.java8.util;
+
+import com.google.gwt.junit.client.GWTTestCase;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+import java.util.function.Consumer;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.LongConsumer;
+
+/**
+ * Tests for PrimitiveIterator JRE emulation.
+ */
+public class PrimitiveIteratorTest extends GWTTestCase {
+
+ @Override
+ public String getModuleName() {
+ return "com.google.gwt.emultest.EmulSuite";
+ }
+
+ public void testForEachRemainingDoubleConsumer() {
+ PrimitiveIterator.OfDouble it = createTestPrimitiveDoubleIterator();
+ it.forEachRemaining((Consumer<Double>) new JanusDoubleConsumer() {
+ @Override
+ public void accept(Double value) {
+ fail();
+ }
+
+ @Override
+ public void accept(double value) {
+ }
+ });
+
+ try {
+ it.forEachRemaining((Consumer<Double>) null);
+ fail();
+ } catch (NullPointerException expected) {
+ }
+
+ try {
+ it.forEachRemaining((DoubleConsumer) null);
+ fail();
+ } catch (NullPointerException expected) {
+ }
+ }
+
+ public void testForEachRemainingIntConsumer() {
+ PrimitiveIterator.OfInt it = createTestPrimitiveIntIterator();
+ it.forEachRemaining((Consumer<Integer>) new JanusIntConsumer() {
+ @Override
+ public void accept(Integer value) {
+ fail();
+ }
+
+ @Override
+ public void accept(int value) {
+ }
+ });
+
+ try {
+ it.forEachRemaining((Consumer<Integer>) null);
+ fail();
+ } catch (NullPointerException expected) {
+ }
+
+ try {
+ it.forEachRemaining((IntConsumer) null);
+ fail();
+ } catch (NullPointerException expected) {
+ }
+ }
+
+ public void testForEachRemainingLongConsumer() {
+ PrimitiveIterator.OfLong it = createTestPrimitiveLongIterator();
+ it.forEachRemaining((Consumer<Long>) new JanusLongConsumer() {
+ @Override
+ public void accept(Long value) {
+ fail();
+ }
+
+ @Override
+ public void accept(long value) {
+ }
+ });
+
+ try {
+ it.forEachRemaining((Consumer<Long>) null);
+ fail();
+ } catch (NullPointerException expected) {
+ }
+
+ try {
+ it.forEachRemaining((LongConsumer) null);
+ fail();
+ } catch (NullPointerException expected) {
+ }
+ }
+
+ private static PrimitiveIterator.OfDouble createTestPrimitiveDoubleIterator() {
+ final Iterator<Double> it = Collections.singletonList(1.).iterator();
+ return new PrimitiveIterator.OfDouble() {
+ @Override
+ public double nextDouble() {
+ return it.next();
+ }
+
+ @Override
+ public boolean hasNext() {
+ return it.hasNext();
+ }
+ };
+ }
+
+ private static PrimitiveIterator.OfInt createTestPrimitiveIntIterator() {
+ final Iterator<Integer> it = Collections.singletonList(1).iterator();
+ return new PrimitiveIterator.OfInt() {
+ @Override
+ public int nextInt() {
+ return it.next();
+ }
+
+ @Override
+ public boolean hasNext() {
+ return it.hasNext();
+ }
+ };
+ }
+
+ private static PrimitiveIterator.OfLong createTestPrimitiveLongIterator() {
+ final Iterator<Long> it = Collections.singletonList(1L).iterator();
+ return new PrimitiveIterator.OfLong() {
+ @Override
+ public long nextLong() {
+ return it.next();
+ }
+
+ @Override
+ public boolean hasNext() {
+ return it.hasNext();
+ }
+ };
+ }
+
+ private interface JanusDoubleConsumer extends Consumer<Double>, DoubleConsumer { }
+
+ private interface JanusIntConsumer extends Consumer<Integer>, IntConsumer { }
+
+ private interface JanusLongConsumer extends Consumer<Long>, LongConsumer { }
+
+}
