Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.reactivex.internal.functions.*;

/**
* Utility methods for creating and using consumers {@link io.reactivex.Maybe}s.
* Utility methods for creating and using consumers {@link io.reactivex.Completable}s.
* @since 0.18.0
*/
public final class CompletableConsumers {
Expand All @@ -39,21 +39,20 @@ private CompletableConsumers() {
* from the given composite.
* <p>
* The CompletableObserver will be removed after the callback for the terminal event has been invoked.
* @param <T> the value type
* @param source the source Maybe to subscribe to.
* @param source the source Completable to subscribe to.
* @param composite the composite Disposable to add and remove the created Disposable CompletableObserver
* @param onComplete the callback for when the upstream completes
* @return the Disposable that allows disposing the particular subscription.
*/
public static <T> Disposable subscribeAutoDispose(
public static Disposable subscribeAutoDispose(
Completable source,
CompositeDisposable composite,
Action onComplete) {
ObjectHelper.requireNonNull(source, "source is null");
ObjectHelper.requireNonNull(composite, "composite is null");
ObjectHelper.requireNonNull(onComplete, "onComplete is null");

DisposableAutoReleaseMultiObserver<T> observer = new DisposableAutoReleaseMultiObserver<T>(
DisposableAutoReleaseMultiObserver<Void> observer = new DisposableAutoReleaseMultiObserver<Void>(
composite, Functions.emptyConsumer(), null, onComplete);
composite.add(observer);
source.subscribe(observer);
Expand All @@ -67,14 +66,13 @@ public static <T> Disposable subscribeAutoDispose(
* from the given composite.
* <p>
* The CompletableObserver will be removed after the callback for the terminal event has been invoked.
* @param <T> the value type
* @param source the source Maybe to subscribe to.
* @param source the source Completable to subscribe to.
* @param composite the composite Disposable to add and remove the created Disposable CompletableObserver
* @param onComplete the callback for when the upstream completes
* @param onError the callback for an upstream error if any
* @return the Disposable that allows disposing the particular subscription.
*/
public static <T> Disposable subscribeAutoDispose(
public static Disposable subscribeAutoDispose(
Completable source,
CompositeDisposable composite,
Action onComplete,
Expand All @@ -84,7 +82,7 @@ public static <T> Disposable subscribeAutoDispose(
ObjectHelper.requireNonNull(onComplete, "onSuccess is null");
ObjectHelper.requireNonNull(onError, "onError is null");

DisposableAutoReleaseMultiObserver<T> observer = new DisposableAutoReleaseMultiObserver<T>(
DisposableAutoReleaseMultiObserver<Void> observer = new DisposableAutoReleaseMultiObserver<Void>(
composite, Functions.emptyConsumer(), onError, onComplete);
composite.add(observer);
source.subscribe(observer);
Expand Down