feat: Drop Enumeration support for Signal.

Author: teletha

src/main/java/kiss/I.java

@@ -1105,7 +1105,7 @@ private static Disposable load(URL source, String pattern, ClassLoader loader) {
 
             if (file.isFile()) {
                 // from jar file
-                names = I.signal(new ZipFile(file).entries()).map(entry -> entry.getName().replace('/', '.'));
+                names = I.signal(new ZipFile(file).entries()::asIterator).map(entry -> entry.getName().replace('/', '.'));
             } else {
                 // from class directory
                 int prefix = file.getPath().length() + 1;
@@ -1950,16 +1950,6 @@ public static <V> Signal<V> signal(Iterable<V> values) {
         return I.<V> signal().startWith(values);
     }
 
-    /**
-     * Signal the specified values.
-     *
-     * @param values A list of values to emit.
-     * @return The {@link Signal} to emit sequencial values.
-     */
-    public static <V> Signal<V> signal(Enumeration<V> values) {
-        return I.<V> signal().startWith(values);
-    }
-
     /**
      * {@link Signal} the specified values.
      *

src/main/java/kiss/Signal.java

@@ -10,7 +10,7 @@
 package kiss;
 
 import static java.lang.Boolean.*;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.*;
 
 import java.lang.reflect.UndeclaredThrowableException;
 import java.time.Duration;
@@ -20,7 +20,6 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Deque;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -1538,21 +1537,6 @@ public final <R> Signal<R> flatArray(WiseFunction<V, R[]> function) {
         return flatMap(v -> I.signal(function.apply(v)));
     }
 
-    /**
-     * Returns an {@link Signal} that emits items based on applying a function that you supply to
-     * each item emitted by the source {@link Signal}, where that function returns an {@link Signal}
-     * , and then merging those resulting {@link Signal} and emitting the results of this merger.
-     *
-     * @param function A function that, when applied to an item emitted by the source {@link Signal}
-     *            , returns an {@link Signal}.
-     * @return An {@link Signal} that emits the result of applying the transformation function to
-     *         each item emitted by the source {@link Signal} and merging the results of the
-     *         {@link Signal} obtained from this transformation.
-     */
-    public final <R> Signal<R> flatEnum(WiseFunction<V, ? extends Enumeration<R>> function) {
-        return flatMap(I.wiseF(function.andThen(I::signal)));
-    }
-
     /**
      * Returns an {@link Signal} that emits items based on applying a function that you supply to
      * each item emitted by the source {@link Signal}, where that function returns an {@link Signal}
@@ -2760,31 +2744,6 @@ public final Signal<V> startWith(Supplier<V> value) {
         });
     }
 
-    /**
-     * <p>
-     * Emit a specified sequence of items before beginning to emit the items from the source
-     * {@link Signal}.
-     * </p>
-     * <p>
-     * If you want an {@link Signal} to emit a specific sequence of items before it begins emitting
-     * the items normally expected from it, apply the StartWith operator to it.
-     * </p>
-     * <p>
-     * If, on the other hand, you want to append a sequence of items to the end of those normally
-     * emitted by an {@link Signal}, you want the {@link #sequenceMap(WiseFunction)} operator.
-     * </p>
-     *
-     * @param values The values that contains the items you want to emit first.
-     * @return {ChainableAPI}
-     */
-    public final Signal<V> startWith(Enumeration<V> values) {
-        // ignore invalid parameter
-        if (values == null) {
-            return this;
-        }
-        return startWith(values::asIterator);
-    }
-
     /**
      * <p>
      * Emit a specified sequence of items before beginning to emit the items from the source

src/test/java/kiss/scan/Classcan.java

@@ -50,7 +50,7 @@ public static <T> Signal<Class<T>> find(Class<T> superClass) {
      * @return list of subclasses
      */
     public static <T> Signal<Class<T>> find(Class<T> type, ClassLoader loader) {
-        return I.signal("META-INF/services/" + type.getName()).flatEnum(loader::getResources).flatIterable(url -> {
+        return I.signal("META-INF/services/" + type.getName()).flatIterable(e -> loader.getResources(e)::asIterator).flatIterable(url -> {
             List<String> lines = new ArrayList();
 
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"))) {

src/test/java/kiss/signal/FlatMapTest.java

@@ -9,7 +9,7 @@
  */
 package kiss.signal;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
 
@@ -123,21 +123,6 @@ void detail() {
         assert another.isDisposed();
     }
 
-    @Test
-    void enumeration() {
-        monitor(() -> signal(10, 20).flatEnum(v -> enume(v, v + 1)));
-
-        assert main.value(10, 11, 20, 21);
-        assert main.isCompleted();
-    }
-
-    @Test
-    void enumerationNull() {
-        assertThrows(NullPointerException.class, () -> {
-            monitor(() -> signal(1, 2).flatEnum(null));
-        });
-    }
-
     @Test
     void array() {
         monitor(String.class, signal -> signal.flatArray(v -> v.split("")));

src/test/java/kiss/signal/SignalTester.java

@@ -9,7 +9,7 @@
  */
 package kiss.signal;
 
-import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -267,16 +267,6 @@ protected <T> Signal<T> signal(Iterable<T> values) {
         return I.signal(values);
     }
 
-    /**
-     * Shorthand method of {@link I#signal(Enumeration)}
-     * 
-     * @param values
-     * @return
-     */
-    protected <T> Signal<T> signal(Enumeration<T> values) {
-        return I.signal(values);
-    }
-
     /**
      * Shorthand method of {@link I#signal(Supplier)}
      * 

src/test/java/kiss/signal/StartWithTest.java

@@ -9,8 +9,6 @@
  */
 package kiss.signal;
 
-import java.util.Enumeration;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -76,31 +74,6 @@ void iterableNull() {
         assert main.isDisposed();
     }
 
-    @Test
-    void enumerable() {
-        monitor(1, () -> signal(3, 4).startWith(enume(0, 1, 2)));
-        assert main.value(0, 1, 2, 3, 4);
-        assert main.isCompleted();
-        assert main.isDisposed();
-    }
-
-    @Test
-    void enumerableError() {
-        monitor(() -> signal(1, 2).startWith(errorEnumeration()));
-        assert main.value();
-        assert main.isError();
-        assert main.isNotCompleted();
-        assert main.isDisposed();
-    }
-
-    @Test
-    void enumerableNull() {
-        monitor(() -> signal(1, 2).startWith((Enumeration) null));
-        assert main.value(1, 2);
-        assert main.isCompleted();
-        assert main.isDisposed();
-    }
-
     @Test
     void signal() {
         monitor(signal -> signal.startWith(other.signal()));