2.x: switch to throwing Action, switchMapDelayError (#4357)

Author: akarnokd

src/main/java/io/reactivex/Completable.java

@@ -275,38 +275,38 @@ public static Completable error(final Throwable error) {
         return new CompletableError(error);
     }
 
+    
     /**
-     * Returns a Completable which when subscribed, executes the callable function, ignores its
-     * normal result and emits onError or onCompleted only.
+     * Returns a Completable instance that runs the given Action for each subscriber and
+     * emits either an unchecked exception or simply completes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromCallable} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromAction} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param callable the callable instance to execute for each subscriber
+     * @param run the runnable to run for each subscriber
      * @return the new Completable instance
+     * @throws NullPointerException if run is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable fromCallable(final Callable<?> callable) {
-        Objects.requireNonNull(callable, "callable is null");
-        return new CompletableFromCallable(callable);
+    public static Completable fromAction(final Action run) {
+        Objects.requireNonNull(run, "run is null");
+        return new CompletableFromAction(run);
     }
-    
+
     /**
-     * Returns a Completable instance that subscribes to the given publisher, ignores all values and
-     * emits only the terminal event.
+     * Returns a Completable which when subscribed, executes the callable function, ignores its
+     * normal result and emits onError or onCompleted only.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromCallable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the type of the publisher
-     * @param publisher the Publisher instance to subscribe to, not null
+     * @param callable the callable instance to execute for each subscriber
      * @return the new Completable instance
-     * @throws NullPointerException if publisher is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromPublisher(final Publisher<T> publisher) {
-        Objects.requireNonNull(publisher, "publisher is null");
-        return new CompletableFromPublisher<T>(publisher);
+    public static Completable fromCallable(final Callable<?> callable) {
+        Objects.requireNonNull(callable, "callable is null");
+        return new CompletableFromCallable(callable);
     }
 
     /**
@@ -349,25 +349,25 @@ public static <T> Completable fromObservable(final ObservableSource<T> observabl
         Objects.requireNonNull(observable, "observable is null");
         return new CompletableFromObservable<T>(observable);
     }
-
 
     /**
-     * Returns a Completable instance that runs the given Runnable for each subscriber and
-     * emits either an unchecked exception or simply completes.
+     * Returns a Completable instance that subscribes to the given publisher, ignores all values and
+     * emits only the terminal event.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param run the runnable to run for each subscriber
+     * @param <T> the type of the publisher
+     * @param publisher the Publisher instance to subscribe to, not null
      * @return the new Completable instance
-     * @throws NullPointerException if run is null
+     * @throws NullPointerException if publisher is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable fromRunnable(final Runnable run) {
-        Objects.requireNonNull(run, "run is null");
-        return new CompletableFromRunnable(run);
+    public static <T> Completable fromPublisher(final Publisher<T> publisher) {
+        Objects.requireNonNull(publisher, "publisher is null");
+        return new CompletableFromPublisher<T>(publisher);
     }
-    
+
     /**
      * Returns a Completable instance that when subscribed to, subscribes to the Single instance and
      * emits a completion event if the single emits onSuccess or forwards any onError events.
@@ -944,10 +944,10 @@ public final Completable delay(final long delay, final TimeUnit unit, final Sche
      * @throws NullPointerException if onComplete is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnComplete(Runnable onComplete) {
+    public final Completable doOnComplete(Action onComplete) {
         return doOnLifecycle(Functions.emptyConsumer(), Functions.emptyConsumer(),
-                onComplete, Functions.EMPTY_RUNNABLE,
-                Functions.EMPTY_RUNNABLE, Functions.EMPTY_RUNNABLE);
+                onComplete, Functions.EMPTY_ACTION,
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
 
     /**
@@ -962,10 +962,10 @@ public final Completable doOnComplete(Runnable onComplete) {
      * @throws NullPointerException if onDispose is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnDispose(Runnable onDispose) {
+    public final Completable doOnDispose(Action onDispose) {
         return doOnLifecycle(Functions.emptyConsumer(), Functions.emptyConsumer(),
-                Functions.EMPTY_RUNNABLE, Functions.EMPTY_RUNNABLE,
-                Functions.EMPTY_RUNNABLE, onDispose);
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION,
+                Functions.EMPTY_ACTION, onDispose);
     }
 
     /**
@@ -981,8 +981,8 @@ public final Completable doOnDispose(Runnable onDispose) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable doOnError(Consumer<? super Throwable> onError) {
         return doOnLifecycle(Functions.emptyConsumer(), onError,
-                Functions.EMPTY_RUNNABLE, Functions.EMPTY_RUNNABLE,
-                Functions.EMPTY_RUNNABLE, Functions.EMPTY_RUNNABLE);
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION,
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
 
     /**
@@ -1003,10 +1003,10 @@ public final Completable doOnError(Consumer<? super Throwable> onError) {
     private Completable doOnLifecycle(
             final Consumer<? super Disposable> onSubscribe, 
             final Consumer<? super Throwable> onError, 
-            final Runnable onComplete, 
-            final Runnable onTerminate,
-            final Runnable onAfterTerminate,
-            final Runnable onDisposed) {
+            final Action onComplete, 
+            final Action onTerminate,
+            final Action onAfterTerminate,
+            final Action onDisposed) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
@@ -1030,8 +1030,8 @@ private Completable doOnLifecycle(
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable doOnSubscribe(Consumer<? super Disposable> onSubscribe) {
         return doOnLifecycle(onSubscribe, Functions.emptyConsumer(),
-                Functions.EMPTY_RUNNABLE, Functions.EMPTY_RUNNABLE,
-                Functions.EMPTY_RUNNABLE, Functions.EMPTY_RUNNABLE);
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION,
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
 
     /**
@@ -1045,10 +1045,10 @@ public final Completable doOnSubscribe(Consumer<? super Disposable> onSubscribe)
      * @return the new Completable instance
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnTerminate(final Runnable onTerminate) {
+    public final Completable doOnTerminate(final Action onTerminate) {
         return doOnLifecycle(Functions.emptyConsumer(), Functions.emptyConsumer(),
-                Functions.EMPTY_RUNNABLE, onTerminate,
-                Functions.EMPTY_RUNNABLE, Functions.EMPTY_RUNNABLE);
+                Functions.EMPTY_ACTION, onTerminate,
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
 
     /**
@@ -1062,10 +1062,10 @@ public final Completable doOnTerminate(final Runnable onTerminate) {
      * @return the new Completable instance
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doAfterTerminate(final Runnable onAfterTerminate) {
+    public final Completable doAfterTerminate(final Action onAfterTerminate) {
         return doOnLifecycle(Functions.emptyConsumer(), Functions.emptyConsumer(),
-                onAfterTerminate, Functions.EMPTY_RUNNABLE,
-                Functions.EMPTY_RUNNABLE, Functions.EMPTY_RUNNABLE);
+                onAfterTerminate, Functions.EMPTY_ACTION,
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
 
     /**
@@ -1414,7 +1414,7 @@ public final void subscribe(CompletableObserver s) {
      * @throws NullPointerException if either callback is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(final Runnable onComplete, final Consumer<? super Throwable> onError) {
+    public final Disposable subscribe(final Action onComplete, final Consumer<? super Throwable> onError) {
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
 
@@ -1443,7 +1443,7 @@ public final <T> void subscribe(final Observer<? super T> observer) {
     }
 
     /**
-     * Subscribes to this Completable and calls the given Runnable when this Completable
+     * Subscribes to this Completable and calls the given Action when this Completable
      * completes normally.
      * <p>
      * If this Completable emits an error, it is sent to RxJavaPlugins.onError and gets swallowed.
@@ -1455,7 +1455,7 @@ public final <T> void subscribe(final Observer<? super T> observer) {
      * @return the Disposable that allows cancelling the subscription
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(final Runnable onComplete) {
+    public final Disposable subscribe(final Action onComplete) {
         Objects.requireNonNull(onComplete, "onComplete is null");
 
         CallbackCompletableObserver s = new CallbackCompletableObserver(onComplete);