Fix misspelled name of the CloseableIterator

Author: vsilaev

net.tascalate.javaflow.examples/src/main/java/org/apache/commons/javaflow/examples/lambdas/LambdasExampleMinimalIterator.java

@@ -16,7 +16,7 @@
 package org.apache.commons.javaflow.examples.lambdas;
 
 import org.apache.commons.javaflow.api.Continuation;
-import org.apache.commons.javaflow.extras.ClosableIterator;
+import org.apache.commons.javaflow.extras.CloseableIterator;
 import org.apache.commons.javaflow.extras.Continuations;
 
 public class LambdasExampleMinimalIterator {
@@ -39,7 +39,7 @@ public static void main(String[] argv) throws Exception {
         // use try-with-resources to close the coIterator 
         // (and hence terminate underlying continuation) 
         // in case of early exit
-        try (ClosableIterator<Integer> i = Continuations.iterate(cc)) {
+        try (CloseableIterator<Integer> i = Continuations.iterate(cc)) {
             int c = 0;
             while (i.hasNext()) {
                 System.out.println("Interrupted " + i.next());

net.tascalate.javaflow.extras/src/main/java/org/apache/commons/javaflow/extras/ClosableIterator.java renamed to net.tascalate.javaflow.extras/src/main/java/org/apache/commons/javaflow/extras/CloseableIterator.java

@@ -15,18 +15,19 @@
  */
 package org.apache.commons.javaflow.extras;
 
+import java.io.Closeable;
 import java.util.Iterator;
 
 /**
- * Iterator that additionally implements {@link Closable} interface 
+ * Iterator that additionally implements {@link Closeable} interface 
  * to execute clean-up when not fully iterated
  * 
  * @author vsilaev
  *
  * @param <E>
  * Type of objects returned by the iterator 
  */
-public interface ClosableIterator<E> extends Iterator<E>, AutoCloseable {
+public interface CloseableIterator<E> extends Iterator<E>, AutoCloseable {
     @Override
     void close();
 }

net.tascalate.javaflow.extras/src/main/java/org/apache/commons/javaflow/extras/CoIterator.java

@@ -43,7 +43,7 @@
  * @param <E>
  * Type of objects returned by the iterator
  */
-public class CoIterator<E> implements ClosableIterator<E>, Serializable {
+public class CoIterator<E> implements CloseableIterator<E>, Serializable {
     private static final long serialVersionUID = 1L;
 
     private boolean advance;

net.tascalate.javaflow.extras/src/main/java/org/apache/commons/javaflow/extras/Continuations.java

@@ -66,16 +66,16 @@ public static Continuation start(ContinuableRunnable o) {
         return Continuation.startWith(toRunnable(o));
     }
 
-    public static <T> ClosableIterator<T> iterate(Continuation continuation) {
+    public static <T> CloseableIterator<T> iterate(Continuation continuation) {
         return iterate(continuation, false);
     }
 
-    public static <T> ClosableIterator<T> iterate(Continuation continuation, boolean useCurrentValue) {
+    public static <T> CloseableIterator<T> iterate(Continuation continuation, boolean useCurrentValue) {
         return new CoIterator<>(continuation, useCurrentValue);
     }
 
 
-    public static <T> ClosableIterator<T> iterate(ContinuableRunnable generator) {
+    public static <T> CloseableIterator<T> iterate(ContinuableRunnable generator) {
         return iterate(create(generator), false);
     }
 
@@ -84,7 +84,7 @@ public static <T> Stream<T> stream(Continuation continuation) {
     }
 
     public static <T> Stream<T> stream(Continuation continuation, boolean useCurrentValue) {
-        ClosableIterator<T> iterator = iterate(continuation, useCurrentValue);
+        CloseableIterator<T> iterator = iterate(continuation, useCurrentValue);
         return StreamSupport
                .stream(Spliterators.spliteratorUnknownSize(iterator, 0), false)
                .onClose(iterator::close);
@@ -118,7 +118,7 @@ public static <T> void execute(Continuation continuation, Consumer<? super T> ac
      * @param action a non-continuable action to perform on the values yielded
      */
     public static <T> void execute(Continuation continuation, boolean useCurrentValue, Consumer<? super T> action) {
-        try (ClosableIterator<T> iter = iterate(continuation, useCurrentValue)) {
+        try (CloseableIterator<T> iter = iterate(continuation, useCurrentValue)) {
             while (iter.hasNext()) {
                 action.accept(iter.next());
             }
@@ -161,7 +161,7 @@ public static <T> void execute(ContinuableRunnable generator, Consumer<? super T
      * @param action a continuable action to perform on the values yielded
      */
     public @continuable static <T> void executeContinuable(Continuation continuation, boolean useCurrentValue, ContinuableConsumer<? super T> action) {
-        try (ClosableIterator<T> iter = iterate(continuation, useCurrentValue)) {
+        try (CloseableIterator<T> iter = iterate(continuation, useCurrentValue)) {
             forEach(iter, action);
         }
     }
@@ -205,7 +205,7 @@ public static <T> void execute(ContinuableRunnable generator, Consumer<? super T
      */   
     public @continuable static <T> void forEach(Iterable<T> iterable, ContinuableConsumer<? super T> action) {
         Iterator<T> iter = iterable.iterator();
-        try (ClosableIterator<T> closable = asClosable(iter)) {
+        try (CloseableIterator<T> closeable = asCloseable(iter)) {
             forEach(iter, action);
         }
     }
@@ -227,8 +227,8 @@ public static <T> void execute(ContinuableRunnable generator, Consumer<? super T
     }
 
     @SuppressWarnings("unchecked")
-    private static <E> ClosableIterator<E> asClosable(Object o) {
-        return o instanceof ClosableIterator ? (ClosableIterator<E>)o : null;
+    private static <E> CloseableIterator<E> asCloseable(Object o) {
+        return o instanceof CloseableIterator ? (CloseableIterator<E>)o : null;
     }
 
 }