Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.x: Move single-use top-level type to nested class of its only use. #4379

Merged
merged 1 commit into from
Aug 20, 2016
Merged
Show file tree
Hide file tree
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 @@ -14,7 +14,7 @@
package io.reactivex.internal.operators.completable;

import io.reactivex.*;
import io.reactivex.internal.subscribers.completable.ObserverCompletableObserver;
import io.reactivex.disposables.Disposable;

public class CompletableToObservable<T> extends Observable<T> {

Expand All @@ -25,8 +25,30 @@ public CompletableToObservable(CompletableSource source) {
}

@Override
protected void subscribeActual(Observer<? super T> s) {
ObserverCompletableObserver<T> os = new ObserverCompletableObserver<T>(s);
source.subscribe(os);
protected void subscribeActual(Observer<? super T> observer) {
source.subscribe(new ObserverCompletableObserver(observer));
}

static final class ObserverCompletableObserver implements CompletableObserver {
private final Observer<?> observer;

ObserverCompletableObserver(Observer<?> observer) {
this.observer = observer;
}

@Override
public void onComplete() {
observer.onComplete();
}

@Override
public void onError(Throwable e) {
observer.onError(e);
}

@Override
public void onSubscribe(Disposable d) {
observer.onSubscribe(d);
}
}
}

This file was deleted.