And there's the iterators.

tommyettinger · Mar 30, 2023 · a87ee5c · a87ee5c
1 parent a9f66b7
commit a87ee5c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 184 deletions.
diff --git a/src/main/java/com/github/tommyettinger/ds/support/util/BooleanIterator.java b/src/main/java/com/github/tommyettinger/ds/support/util/BooleanIterator.java
@@ -19,17 +19,14 @@
 
 import com.github.tommyettinger.function.BooleanConsumer;
 
+import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.PrimitiveIterator;
-import java.util.function.Consumer;
 
 /**
  * An Iterator specialized for {@code boolean} values.
- * This is a {@link PrimitiveIterator}, like the existing {@link OfInt}
- * and {@link OfLong} interfaces, but it can't be a nested interface like
- * those because it is defined outside of the JDK.
+ * This iterates over primitive booleans using {@link #nextBoolean()}.
  */
-public interface BooleanIterator extends PrimitiveIterator<Boolean, BooleanConsumer> {
+public interface BooleanIterator extends Iterator<Boolean> {
 	/**
 	 * Returns the next {@code boolean} element in the iteration.
 	 *
@@ -52,7 +49,6 @@ public interface BooleanIterator extends PrimitiveIterator<Boolean, BooleanConsu
 	 *         action.accept(nextBoolean());
 	 * }</pre>
 	 */
-	@Override
 	default void forEachRemaining (BooleanConsumer action) {
 		while (hasNext()) {action.accept(nextBoolean());}
 	}
@@ -67,23 +63,4 @@ default void forEachRemaining (BooleanConsumer action) {
 	default Boolean next () {
 		return nextBoolean();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @implSpec If the action is an instance of {@code LongConsumer} then it is cast
-	 * to {@code LongConsumer} and passed to {@link #forEachRemaining};
-	 * otherwise the action is adapted to an instance of
-	 * {@code LongConsumer}, by boxing the argument of {@code LongConsumer},
-	 * and then passed to {@link #forEachRemaining}.
-	 */
-	@Override
-	default void forEachRemaining (Consumer<? super Boolean> action) {
-		if (action instanceof BooleanConsumer) {
-			forEachRemaining((BooleanConsumer)action);
-		} else {
-			forEachRemaining((BooleanConsumer)action::accept);
-		}
-	}
-
 }
diff --git a/src/main/java/com/github/tommyettinger/ds/support/util/ByteIterator.java b/src/main/java/com/github/tommyettinger/ds/support/util/ByteIterator.java
@@ -19,17 +19,14 @@
 
 import com.github.tommyettinger.function.ByteConsumer;
 
+import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.PrimitiveIterator;
-import java.util.function.Consumer;
 
 /**
  * An Iterator specialized for {@code byte} values.
- * This is a {@link PrimitiveIterator}, like the existing {@link OfInt}
- * and {@link OfLong} interfaces, but it can't be a nested interface like
- * those because it is defined outside of the JDK.
+ * This iterates over primitive bytes using {@link #nextByte()}.
  */
-public interface ByteIterator extends PrimitiveIterator<Byte, ByteConsumer> {
+public interface ByteIterator extends Iterator<Byte> {
 	/**
 	 * Returns the next {@code byte} element in the iteration.
 	 *
@@ -52,7 +49,6 @@ public interface ByteIterator extends PrimitiveIterator<Byte, ByteConsumer> {
 	 *         action.accept(nextByte());
 	 * }</pre>
 	 */
-	@Override
 	default void forEachRemaining (ByteConsumer action) {
 		while (hasNext()) {action.accept(nextByte());}
 	}
@@ -67,23 +63,4 @@ default void forEachRemaining (ByteConsumer action) {
 	default Byte next () {
 		return nextByte();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @implSpec If the action is an instance of {@code LongConsumer} then it is cast
-	 * to {@code LongConsumer} and passed to {@link #forEachRemaining};
-	 * otherwise the action is adapted to an instance of
-	 * {@code LongConsumer}, by boxing the argument of {@code LongConsumer},
-	 * and then passed to {@link #forEachRemaining}.
-	 */
-	@Override
-	default void forEachRemaining (Consumer<? super Byte> action) {
-		if (action instanceof ByteConsumer) {
-			forEachRemaining((ByteConsumer)action);
-		} else {
-			forEachRemaining((ByteConsumer)action::accept);
-		}
-	}
-
 }
diff --git a/src/main/java/com/github/tommyettinger/ds/support/util/CharIterator.java b/src/main/java/com/github/tommyettinger/ds/support/util/CharIterator.java
@@ -19,17 +19,14 @@
 
 import com.github.tommyettinger.function.CharConsumer;
 
+import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.PrimitiveIterator;
-import java.util.function.Consumer;
 
 /**
  * An Iterator specialized for {@code char} values.
- * This is a {@link PrimitiveIterator}, like the existing {@link OfInt}
- * and {@link OfLong} interfaces, but it can't be a nested interface like
- * those because it is defined outside of the JDK.
+ * This iterates over primitive chars using {@link #nextChar()}.
  */
-public interface CharIterator extends PrimitiveIterator<Character, CharConsumer> {
+public interface CharIterator extends Iterator<Character> {
 	/**
 	 * Returns the next {@code char} element in the iteration.
 	 *
@@ -52,7 +49,6 @@ public interface CharIterator extends PrimitiveIterator<Character, CharConsumer>
 	 *         action.accept(nextChar());
 	 * }</pre>
 	 */
-	@Override
 	default void forEachRemaining (CharConsumer action) {
 		while (hasNext()) {action.accept(nextChar());}
 	}
@@ -67,23 +63,4 @@ default void forEachRemaining (CharConsumer action) {
 	default Character next () {
 		return nextChar();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @implSpec If the action is an instance of {@code LongConsumer} then it is cast
-	 * to {@code LongConsumer} and passed to {@link #forEachRemaining};
-	 * otherwise the action is adapted to an instance of
-	 * {@code LongConsumer}, by boxing the argument of {@code LongConsumer},
-	 * and then passed to {@link #forEachRemaining}.
-	 */
-	@Override
-	default void forEachRemaining (Consumer<? super Character> action) {
-		if (action instanceof CharConsumer) {
-			forEachRemaining((CharConsumer)action);
-		} else {
-			forEachRemaining((CharConsumer)action::accept);
-		}
-	}
-
 }
diff --git a/src/main/java/com/github/tommyettinger/ds/support/util/DoubleIterator.java b/src/main/java/com/github/tommyettinger/ds/support/util/DoubleIterator.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.function.Consumer;
 
 /**
  * An Iterator specialized for {@code double} values.
@@ -67,23 +66,4 @@ default void forEachRemaining (DoubleConsumer action) {
 	default Double next () {
 		return nextDouble();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @implSpec If the action is an instance of {@code DoubleConsumer} then it is cast
-	 * to {@code DoubleConsumer} and passed to {@link #forEachRemaining};
-	 * otherwise the action is adapted to an instance of
-	 * {@code DoubleConsumer}, by boxing the argument of {@code DoubleConsumer},
-	 * and then passed to {@link #forEachRemaining}.
-	 */
-	@Override
-	default void forEachRemaining (Consumer<? super Double> action) {
-		if (action instanceof DoubleConsumer) {
-			forEachRemaining((DoubleConsumer)action);
-		} else {
-			forEachRemaining((DoubleConsumer)action::accept);
-		}
-	}
-
 }
diff --git a/src/main/java/com/github/tommyettinger/ds/support/util/FloatIterator.java b/src/main/java/com/github/tommyettinger/ds/support/util/FloatIterator.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.function.Consumer;
 
 /**
  * An Iterator specialized for {@code float} values.
@@ -64,23 +63,4 @@ default void forEachRemaining (FloatConsumer action) {
 	default Float next () {
 		return nextFloat();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @implSpec If the action is an instance of {@code FloatConsumer} then it is cast
-	 * to {@code FloatConsumer} and passed to {@link #forEachRemaining};
-	 * otherwise the action is adapted to an instance of
-	 * {@code FloatConsumer}, by boxing the argument of {@code FloatConsumer},
-	 * and then passed to {@link #forEachRemaining}.
-	 */
-	@Override
-	default void forEachRemaining (Consumer<? super Float> action) {
-		if (action instanceof FloatConsumer) {
-			forEachRemaining((FloatConsumer)action);
-		} else {
-			forEachRemaining((FloatConsumer)action::accept);
-		}
-	}
-
 }
diff --git a/src/main/java/com/github/tommyettinger/ds/support/util/IntIterator.java b/src/main/java/com/github/tommyettinger/ds/support/util/IntIterator.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.function.Consumer;
 
 /**
  * An Iterator specialized for {@code int} values.
@@ -67,23 +66,4 @@ default void forEachRemaining (IntConsumer action) {
 	default Integer next () {
 		return nextInt();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @implSpec If the action is an instance of {@code IntConsumer} then it is cast
-	 * to {@code IntConsumer} and passed to {@link #forEachRemaining};
-	 * otherwise the action is adapted to an instance of
-	 * {@code IntConsumer}, by boxing the argument of {@code IntConsumer},
-	 * and then passed to {@link #forEachRemaining}.
-	 */
-	@Override
-	default void forEachRemaining (Consumer<? super Integer> action) {
-		if (action instanceof IntConsumer) {
-			forEachRemaining((IntConsumer)action);
-		} else {
-			forEachRemaining((IntConsumer)action::accept);
-		}
-	}
-
 }
diff --git a/src/main/java/com/github/tommyettinger/ds/support/util/LongIterator.java b/src/main/java/com/github/tommyettinger/ds/support/util/LongIterator.java
@@ -21,7 +21,6 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.function.Consumer;
 
 /**
  * An Iterator specialized for {@code long} values.
@@ -67,23 +66,4 @@ default void forEachRemaining (LongConsumer action) {
 	default Long next () {
 		return nextLong();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @implSpec If the action is an instance of {@code LongConsumer} then it is cast
-	 * to {@code LongConsumer} and passed to {@link #forEachRemaining};
-	 * otherwise the action is adapted to an instance of
-	 * {@code LongConsumer}, by boxing the argument of {@code LongConsumer},
-	 * and then passed to {@link #forEachRemaining}.
-	 */
-	@Override
-	default void forEachRemaining (Consumer<? super Long> action) {
-		if (action instanceof LongConsumer) {
-			forEachRemaining((LongConsumer)action);
-		} else {
-			forEachRemaining((LongConsumer)action::accept);
-		}
-	}
-
 }
diff --git a/src/main/java/com/github/tommyettinger/ds/support/util/ShortIterator.java b/src/main/java/com/github/tommyettinger/ds/support/util/ShortIterator.java
@@ -19,17 +19,14 @@
 
 import com.github.tommyettinger.function.ShortConsumer;
 
+import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.PrimitiveIterator;
-import java.util.function.Consumer;
 
 /**
  * An Iterator specialized for {@code short} values.
- * This is a {@link PrimitiveIterator}, like the existing {@link OfInt}
- * and {@link OfLong} interfaces, but it can't be a nested interface like
- * those because it is defined outside of the JDK.
+ * This iterates over primitive shorts using {@link #nextShort()}.
  */
-public interface ShortIterator extends PrimitiveIterator<Short, ShortConsumer> {
+public interface ShortIterator extends Iterator<Short> {
 	/**
 	 * Returns the next {@code short} element in the iteration.
 	 *
@@ -52,7 +49,6 @@ public interface ShortIterator extends PrimitiveIterator<Short, ShortConsumer> {
 	 *         action.accept(nextShort());
 	 * }</pre>
 	 */
-	@Override
 	default void forEachRemaining (ShortConsumer action) {
 		while (hasNext()) {action.accept(nextShort());}
 	}
@@ -67,23 +63,4 @@ default void forEachRemaining (ShortConsumer action) {
 	default Short next () {
 		return nextShort();
 	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @implSpec If the action is an instance of {@code LongConsumer} then it is cast
-	 * to {@code LongConsumer} and passed to {@link #forEachRemaining};
-	 * otherwise the action is adapted to an instance of
-	 * {@code LongConsumer}, by boxing the argument of {@code LongConsumer},
-	 * and then passed to {@link #forEachRemaining}.
-	 */
-	@Override
-	default void forEachRemaining (Consumer<? super Short> action) {
-		if (action instanceof ShortConsumer) {
-			forEachRemaining((ShortConsumer)action);
-		} else {
-			forEachRemaining((ShortConsumer)action::accept);
-		}
-	}
-
 }