Skip to content

Commit 6695218

Browse files
JakeWhartonakarnokd
authored andcommittedAug 20, 2016
Move single-use top-level type to nested class of its only use. (#4379)
1 parent d80a261 commit 6695218

File tree

2 files changed

+26
-46
lines changed

2 files changed

+26
-46
lines changed
 

‎src/main/java/io/reactivex/internal/operators/completable/CompletableToObservable.java

+26-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
package io.reactivex.internal.operators.completable;
1515

1616
import io.reactivex.*;
17-
import io.reactivex.internal.subscribers.completable.ObserverCompletableObserver;
17+
import io.reactivex.disposables.Disposable;
1818

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

@@ -25,8 +25,30 @@ public CompletableToObservable(CompletableSource source) {
2525
}
2626

2727
@Override
28-
protected void subscribeActual(Observer<? super T> s) {
29-
ObserverCompletableObserver<T> os = new ObserverCompletableObserver<T>(s);
30-
source.subscribe(os);
28+
protected void subscribeActual(Observer<? super T> observer) {
29+
source.subscribe(new ObserverCompletableObserver(observer));
30+
}
31+
32+
static final class ObserverCompletableObserver implements CompletableObserver {
33+
private final Observer<?> observer;
34+
35+
ObserverCompletableObserver(Observer<?> observer) {
36+
this.observer = observer;
37+
}
38+
39+
@Override
40+
public void onComplete() {
41+
observer.onComplete();
42+
}
43+
44+
@Override
45+
public void onError(Throwable e) {
46+
observer.onError(e);
47+
}
48+
49+
@Override
50+
public void onSubscribe(Disposable d) {
51+
observer.onSubscribe(d);
52+
}
3153
}
3254
}

‎src/main/java/io/reactivex/internal/subscribers/completable/ObserverCompletableObserver.java

-42
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.