Skip to content

Commit a100bc6

Browse files
Merge branch 'OperatorSwitch' of github.com:akarnokd/RxJava into merge-prs
2 parents ed66751 + d853038 commit a100bc6

File tree

4 files changed

+252
-193
lines changed

4 files changed

+252
-193
lines changed

rxjava-core/src/main/java/rx/Observable.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import rx.operators.OnSubscribeRange;
5151
import rx.operators.OperationDelay;
5252
import rx.operators.OperationSkipUntil;
53-
import rx.operators.OperationSwitch;
5453
import rx.operators.OperationTakeLast;
5554
import rx.operators.OperationTakeTimed;
5655
import rx.operators.OperationTakeUntil;
@@ -115,6 +114,7 @@
115114
import rx.operators.OperatorSkipTimed;
116115
import rx.operators.OperatorSkipWhile;
117116
import rx.operators.OperatorSubscribeOn;
117+
import rx.operators.OperatorSwitch;
118118
import rx.operators.OperatorTake;
119119
import rx.operators.OperatorTakeWhile;
120120
import rx.operators.OperatorThrottleFirst;
@@ -2483,9 +2483,11 @@ public final static <T> Observable<Boolean> sequenceEqual(Observable<? extends T
24832483
* @return an Observable that emits the items emitted by the Observable most recently emitted by the source
24842484
* Observable
24852485
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#wiki-switchonnext">RxJava Wiki: switchOnNext()</a>
2486+
*
2487+
* @param <T> the element type
24862488
*/
24872489
public final static <T> Observable<T> switchOnNext(Observable<? extends Observable<? extends T>> sequenceOfSequences) {
2488-
return create(OperationSwitch.switchDo(sequenceOfSequences));
2490+
return sequenceOfSequences.lift(new OperatorSwitch<T>());
24892491
}
24902492

24912493
/**

rxjava-core/src/main/java/rx/operators/OperationSwitch.java

Lines changed: 0 additions & 175 deletions
This file was deleted.

0 commit comments

Comments
 (0)