From 59f3a259b1d7340db085c1fd11ad6a7a39285f2c Mon Sep 17 00:00:00 2001 From: Niklas Baudy Date: Sun, 7 Aug 2016 23:14:21 +0200 Subject: [PATCH] 2.x: Rename Observable Base Interface Types for consistency --- src/main/java/io/reactivex/Completable.java | 4 +- src/main/java/io/reactivex/Observable.java | 466 +++++++++--------- .../java/io/reactivex/ObservableOperator.java | 20 + ...eConsumable.java => ObservableSource.java} | 4 +- .../io/reactivex/ObservableTransformer.java | 20 + src/main/java/io/reactivex/Single.java | 2 +- .../CompletableFromObservable.java | 4 +- .../observable/BlockingObservableLatest.java | 6 +- .../BlockingObservableMostRecent.java | 4 +- .../operators/observable/ObservableAll.java | 4 +- .../operators/observable/ObservableAmb.java | 14 +- .../operators/observable/ObservableAny.java | 4 +- .../observable/ObservableBuffer.java | 6 +- .../observable/ObservableBufferBoundary.java | 22 +- .../ObservableBufferBoundarySupplier.java | 14 +- .../ObservableBufferExactBoundary.java | 10 +- .../observable/ObservableBufferTimed.java | 6 +- .../observable/ObservableCollect.java | 2 +- .../observable/ObservableCombineLatest.java | 16 +- .../observable/ObservableConcatMap.java | 10 +- .../operators/observable/ObservableCount.java | 2 +- .../observable/ObservableDebounce.java | 10 +- .../observable/ObservableDebounceTimed.java | 2 +- .../operators/observable/ObservableDefer.java | 6 +- .../operators/observable/ObservableDelay.java | 2 +- .../ObservableDelaySubscriptionOther.java | 8 +- .../observable/ObservableDematerialize.java | 2 +- .../observable/ObservableDistinct.java | 8 +- .../observable/ObservableDoOnEach.java | 8 +- .../observable/ObservableElementAt.java | 2 +- .../observable/ObservableFilter.java | 2 +- .../observable/ObservableFlatMap.java | 22 +- .../observable/ObservableGroupBy.java | 6 +- .../observable/ObservableGroupJoin.java | 28 +- .../observable/ObservableIgnoreElements.java | 2 +- .../operators/observable/ObservableJoin.java | 28 +- .../operators/observable/ObservableJust.java | 4 +- .../operators/observable/ObservableLift.java | 10 +- .../operators/observable/ObservableMap.java | 2 +- .../observable/ObservableMapNotification.java | 40 +- .../observable/ObservableMaterialize.java | 2 +- .../observable/ObservableObserveOn.java | 2 +- .../observable/ObservableOnErrorNext.java | 12 +- .../observable/ObservableOnErrorReturn.java | 2 +- .../observable/ObservablePublish.java | 20 +- .../operators/observable/ObservableRedo.java | 14 +- .../observable/ObservableReplay.java | 16 +- .../observable/ObservableSampleTimed.java | 2 +- .../ObservableSampleWithObservable.java | 8 +- .../operators/observable/ObservableScan.java | 2 +- .../observable/ObservableScanSeed.java | 2 +- .../observable/ObservableSequenceEqual.java | 16 +- .../observable/ObservableSingle.java | 2 +- .../operators/observable/ObservableSkip.java | 2 +- .../observable/ObservableSkipLast.java | 2 +- .../observable/ObservableSkipLastTimed.java | 2 +- .../observable/ObservableSkipUntil.java | 4 +- .../observable/ObservableSkipWhile.java | 2 +- .../observable/ObservableSwitchIfEmpty.java | 8 +- .../observable/ObservableSwitchMap.java | 12 +- .../operators/observable/ObservableTake.java | 2 +- .../observable/ObservableTakeLast.java | 2 +- .../observable/ObservableTakeLastOne.java | 2 +- .../observable/ObservableTakeLastTimed.java | 2 +- .../observable/ObservableTakeUntil.java | 4 +- .../ObservableTakeUntilPredicate.java | 2 +- .../observable/ObservableTakeWhile.java | 2 +- .../ObservableThrottleFirstTimed.java | 2 +- .../observable/ObservableTimeInterval.java | 2 +- .../observable/ObservableTimeout.java | 40 +- .../observable/ObservableTimeoutTimed.java | 10 +- .../observable/ObservableToList.java | 6 +- .../observable/ObservableUnsubscribeOn.java | 2 +- .../operators/observable/ObservableUsing.java | 6 +- .../observable/ObservableWindow.java | 2 +- .../observable/ObservableWindowBoundary.java | 8 +- .../ObservableWindowBoundarySelector.java | 18 +- .../ObservableWindowBoundarySupplier.java | 14 +- .../observable/ObservableWindowTimed.java | 2 +- .../observable/ObservableWithLatestFrom.java | 6 +- .../observable/ObservableWithUpstream.java | 6 +- .../observable/ObservableWrapper.java | 4 +- .../operators/observable/ObservableZip.java | 16 +- .../single/SingleDelayWithObservable.java | 4 +- .../io/reactivex/subjects/AsyncSubject.java | 4 +- .../reactivex/subjects/BehaviorSubject.java | 2 +- .../io/reactivex/subjects/PublishSubject.java | 4 +- .../io/reactivex/subjects/ReplaySubject.java | 2 +- .../io/reactivex/subjects/UnicastSubject.java | 4 +- .../reactivex/exceptions/ExceptionsTest.java | 8 +- .../BlockingObservableNextTest.java | 6 +- .../BlockingObservableToIteratorTest.java | 6 +- .../observable/ObservableAmbTest.java | 4 +- .../observable/ObservableBufferTest.java | 18 +- .../observable/ObservableCacheTest.java | 8 +- .../observable/ObservableConcatTest.java | 12 +- .../observable/ObservableDebounceTest.java | 8 +- .../ObservableDoOnSubscribeTest.java | 4 +- .../ObservableFromIterableTest.java | 6 +- .../observable/ObservableGroupByTest.java | 20 +- .../observable/ObservableMaterializeTest.java | 4 +- .../ObservableMergeDelayErrorTest.java | 18 +- .../ObservableMergeMaxConcurrentTest.java | 4 +- .../observable/ObservableMergeTest.java | 24 +- ...vableOnErrorResumeNextViaFunctionTest.java | 12 +- ...bleOnErrorResumeNextViaObservableTest.java | 8 +- .../ObservableOnErrorReturnTest.java | 4 +- ...nExceptionResumeNextViaObservableTest.java | 4 +- .../observable/ObservablePublishTest.java | 6 +- .../observable/ObservableRefCountTest.java | 6 +- .../observable/ObservableRepeatTest.java | 6 +- .../observable/ObservableReplayTest.java | 6 +- .../observable/ObservableRetryTest.java | 20 +- .../ObservableRetryWithPredicateTest.java | 10 +- .../observable/ObservableSampleTest.java | 6 +- .../observable/ObservableSerializeTest.java | 6 +- .../observable/ObservableSubscribeOnTest.java | 10 +- .../ObservableSwitchIfEmptyTest.java | 8 +- .../observable/ObservableSwitchTest.java | 48 +- .../observable/ObservableTakeTest.java | 12 +- .../observable/ObservableTakeUntilTest.java | 4 +- .../observable/ObservableTakeWhileTest.java | 6 +- .../ObservableThrottleFirstTest.java | 6 +- .../observable/ObservableTimeoutTests.java | 10 +- .../ObservableTimeoutWithSelectorTest.java | 4 +- .../ObservableUnsubscribeOnTest.java | 6 +- .../observable/ObservableUsingTest.java | 4 +- .../ObservableWindowWithSizeTest.java | 6 +- ...vableWindowWithStartEndObservableTest.java | 12 +- .../ObservableWindowWithTimeTest.java | 6 +- .../observable/ObservableZipTest.java | 8 +- .../observable/ObservableConcatTests.java | 6 +- .../observable/ObservableCovarianceTest.java | 4 +- .../observable/ObservableNullTests.java | 6 +- .../observable/ObservableSubscriberTest.java | 6 +- .../reactivex/observable/ObservableTests.java | 14 +- .../ReplaySubjectBoundedConcurrencyTest.java | 6 +- .../ReplaySubjectConcurrencyTest.java | 6 +- 138 files changed, 809 insertions(+), 777 deletions(-) create mode 100644 src/main/java/io/reactivex/ObservableOperator.java rename src/main/java/io/reactivex/{ObservableConsumable.java => ObservableSource.java} (89%) create mode 100644 src/main/java/io/reactivex/ObservableTransformer.java diff --git a/src/main/java/io/reactivex/Completable.java b/src/main/java/io/reactivex/Completable.java index 516d7a5261..19738c5e05 100644 --- a/src/main/java/io/reactivex/Completable.java +++ b/src/main/java/io/reactivex/Completable.java @@ -266,7 +266,7 @@ public Object call() throws Exception { * @throws NullPointerException if flowable is null */ @SchedulerSupport(SchedulerSupport.NONE) - public static Completable fromObservable(final ObservableConsumable observable) { + public static Completable fromObservable(final ObservableSource observable) { Objects.requireNonNull(observable, "observable is null"); return new CompletableFromObservable(observable); } @@ -817,7 +817,7 @@ public final Completable endWith(CompletableSource other) { * @throws NullPointerException if next is null */ @SchedulerSupport(SchedulerSupport.CUSTOM) - public final Observable endWith(ObservableConsumable next) { + public final Observable endWith(ObservableSource next) { return this.toObservable().endWith(next); } diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java index 1d2eacb334..62ea847e9d 100644 --- a/src/main/java/io/reactivex/Observable.java +++ b/src/main/java/io/reactivex/Observable.java @@ -38,17 +38,9 @@ * Observable for delivering a sequence of values without backpressure. * @param */ -public abstract class Observable implements ObservableConsumable { +public abstract class Observable implements ObservableSource { static final Object OBJECT = new Object(); - - public interface Operator extends Function, Observer> { - - } - - public interface Transformer extends Function, ObservableConsumable> { - - } - + /** An empty observable instance as there is no need to instantiate this more than once. */ static final Observable EMPTY = new Observable() { @Override @@ -66,14 +58,14 @@ protected void subscribeActual(Observer o) { } }; - public static Observable amb(Iterable> sources) { + public static Observable amb(Iterable> sources) { Objects.requireNonNull(sources, "sources is null"); return new ObservableAmb(null, sources); } @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) - public static Observable amb(ObservableConsumable... sources) { + public static Observable amb(ObservableSource... sources) { Objects.requireNonNull(sources, "sources is null"); int len = sources.length; if (len == 0) { @@ -94,22 +86,22 @@ static int bufferSize() { } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable combineLatest(Function combiner, boolean delayError, int bufferSize, ObservableConsumable... sources) { + public static Observable combineLatest(Function combiner, boolean delayError, int bufferSize, ObservableSource... sources) { return combineLatest(sources, combiner, delayError, bufferSize); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable combineLatest(Iterable> sources, Function combiner) { + public static Observable combineLatest(Iterable> sources, Function combiner) { return combineLatest(sources, combiner, false, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable combineLatest(Iterable> sources, Function combiner, boolean delayError) { + public static Observable combineLatest(Iterable> sources, Function combiner, boolean delayError) { return combineLatest(sources, combiner, delayError, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable combineLatest(Iterable> sources, Function combiner, boolean delayError, int bufferSize) { + public static Observable combineLatest(Iterable> sources, Function combiner, boolean delayError, int bufferSize) { Objects.requireNonNull(sources, "sources is null"); Objects.requireNonNull(combiner, "combiner is null"); validateBufferSize(bufferSize); @@ -120,17 +112,17 @@ public static Observable combineLatest(Iterable Observable combineLatest(ObservableConsumable[] sources, Function combiner) { + public static Observable combineLatest(ObservableSource[] sources, Function combiner) { return combineLatest(sources, combiner, false, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable combineLatest(ObservableConsumable[] sources, Function combiner, boolean delayError) { + public static Observable combineLatest(ObservableSource[] sources, Function combiner, boolean delayError) { return combineLatest(sources, combiner, delayError, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable combineLatest(ObservableConsumable[] sources, Function combiner, boolean delayError, int bufferSize) { + public static Observable combineLatest(ObservableSource[] sources, Function combiner, boolean delayError, int bufferSize) { validateBufferSize(bufferSize); Objects.requireNonNull(combiner, "combiner is null"); if (sources.length == 0) { @@ -144,7 +136,7 @@ public static Observable combineLatest(ObservableConsumable Observable combineLatest( - ObservableConsumable p1, ObservableConsumable p2, + ObservableSource p1, ObservableSource p2, BiFunction combiner) { return combineLatest(Functions.toFunction(combiner), false, bufferSize(), p1, p2); } @@ -152,8 +144,8 @@ public static Observable combineLatest( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable combineLatest( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, + ObservableSource p1, ObservableSource p2, + ObservableSource p3, Function3 combiner) { return combineLatest(Functions.toFunction(combiner), false, bufferSize(), p1, p2, p3); } @@ -161,8 +153,8 @@ public static Observable combineLatest( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable combineLatest( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, Function4 combiner) { return combineLatest(Functions.toFunction(combiner), false, bufferSize(), p1, p2, p3, p4); } @@ -170,9 +162,9 @@ public static Observable combineLatest( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable combineLatest( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, Function5 combiner) { return combineLatest(Functions.toFunction(combiner), false, bufferSize(), p1, p2, p3, p4, p5); } @@ -180,9 +172,9 @@ public static Observable combineLatest( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable combineLatest( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, ObservableConsumable p6, + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, ObservableSource p6, Function6 combiner) { return combineLatest(Functions.toFunction(combiner), false, bufferSize(), p1, p2, p3, p4, p5, p6); } @@ -190,10 +182,10 @@ public static Observable combineLatest( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable combineLatest( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7, + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, ObservableSource p6, + ObservableSource p7, Function7 combiner) { return combineLatest(Functions.toFunction(combiner), false, bufferSize(), p1, p2, p3, p4, p5, p6, p7); } @@ -201,10 +193,10 @@ public static Observable combineLatest( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable combineLatest( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7, ObservableConsumable p8, + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, ObservableSource p6, + ObservableSource p7, ObservableSource p8, Function8 combiner) { return combineLatest(Functions.toFunction(combiner), false, bufferSize(), p1, p2, p3, p4, p5, p6, p7, p8); } @@ -212,69 +204,69 @@ public static Observable combineLatest( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable combineLatest( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7, ObservableConsumable p8, - ObservableConsumable p9, + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, ObservableSource p6, + ObservableSource p7, ObservableSource p8, + ObservableSource p9, Function9 combiner) { return combineLatest(Functions.toFunction(combiner), false, bufferSize(), p1, p2, p3, p4, p5, p6, p7, p8, p9); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable concat(int prefetch, Iterable> sources) { + public static Observable concat(int prefetch, Iterable> sources) { Objects.requireNonNull(sources, "sources is null"); return fromIterable(sources).concatMap((Function)Functions.identity(), prefetch); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable concat(Iterable> sources) { + public static Observable concat(Iterable> sources) { Objects.requireNonNull(sources, "sources is null"); return fromIterable(sources).concatMap((Function)Functions.identity()); } @SchedulerSupport(SchedulerSupport.NONE) - public static final Observable concat(ObservableConsumable> sources) { + public static final Observable concat(ObservableSource> sources) { return concat(sources, bufferSize()); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static final Observable concat(ObservableConsumable> sources, int bufferSize) { + public static final Observable concat(ObservableSource> sources, int bufferSize) { Objects.requireNonNull(sources, "sources is null"); return new ObservableConcatMap(sources, Functions.identity(), bufferSize); } @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) - public static Observable concat(ObservableConsumable p1, ObservableConsumable p2) { + public static Observable concat(ObservableSource p1, ObservableSource p2) { return concatArray(p1, p2); } @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable concat( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3) { + ObservableSource p1, ObservableSource p2, + ObservableSource p3) { return concatArray(p1, p2, p3); } @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable concat( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4) { + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4) { return concatArray(p1, p2, p3, p4); } @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable concat( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5 + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5 ) { return concatArray(p1, p2, p3, p4, p5); } @@ -282,9 +274,9 @@ public static Observable concat( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable concat( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, ObservableConsumable p6 + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, ObservableSource p6 ) { return concatArray(p1, p2, p3, p4, p5, p6); } @@ -292,10 +284,10 @@ public static Observable concat( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable concat( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7 + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, ObservableSource p6, + ObservableSource p7 ) { return concatArray(p1, p2, p3, p4, p5, p6, p7); } @@ -303,10 +295,10 @@ public static Observable concat( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable concat( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7, ObservableConsumable p8 + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, ObservableSource p6, + ObservableSource p7, ObservableSource p8 ) { return concatArray(p1, p2, p3, p4, p5, p6, p7, p8); } @@ -314,18 +306,18 @@ public static Observable concat( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable concat( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4, - ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7, ObservableConsumable p8, - ObservableConsumable p9 + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4, + ObservableSource p5, ObservableSource p6, + ObservableSource p7, ObservableSource p8, + ObservableSource p9 ) { return concatArray(p1, p2, p3, p4, p5, p6, p7, p8, p9); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable concatArray(int prefetch, ObservableConsumable... sources) { + public static Observable concatArray(int prefetch, ObservableSource... sources) { Objects.requireNonNull(sources, "sources is null"); return fromArray(sources).concatMap((Function)Functions.identity(), prefetch); } @@ -341,22 +333,22 @@ public static Observable concatArray(int prefetch, ObservableConsumable Observable concatArray(ObservableConsumable... sources) { + public static Observable concatArray(ObservableSource... sources) { if (sources.length == 0) { return empty(); } else if (sources.length == 1) { - return wrap((ObservableConsumable)sources[0]); + return wrap((ObservableSource)sources[0]); } return fromArray(sources).concatMap((Function)Functions.identity()); } - public static Observable create(ObservableConsumable onSubscribe) { + public static Observable create(ObservableSource onSubscribe) { Objects.requireNonNull(onSubscribe, "onSubscribe is null"); return new ObservableWrapper(onSubscribe); } - public static Observable wrap(ObservableConsumable onSubscribe) { + public static Observable wrap(ObservableSource onSubscribe) { Objects.requireNonNull(onSubscribe, "onSubscribe is null"); // TODO plugin wrapper? if (onSubscribe instanceof Observable) { @@ -366,7 +358,7 @@ public static Observable wrap(ObservableConsumable onSubscribe) { } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable defer(Callable> supplier) { + public static Observable defer(Callable> supplier) { Objects.requireNonNull(supplier, "supplier is null"); return new ObservableDefer(supplier); } @@ -696,50 +688,50 @@ public static final Observable just(T v1, T v2, T v3, T v4, T v5, T v6, T @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(int maxConcurrency, int bufferSize, Iterable> sources) { + public static Observable merge(int maxConcurrency, int bufferSize, Iterable> sources) { return fromIterable(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(int maxConcurrency, int bufferSize, ObservableConsumable... sources) { + public static Observable merge(int maxConcurrency, int bufferSize, ObservableSource... sources) { return fromArray(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(int maxConcurrency, ObservableConsumable... sources) { + public static Observable merge(int maxConcurrency, ObservableSource... sources) { return fromArray(sources).flatMap((Function)Functions.identity(), maxConcurrency); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(Iterable> sources) { + public static Observable merge(Iterable> sources) { return fromIterable(sources).flatMap((Function)Functions.identity()); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(Iterable> sources, int maxConcurrency) { + public static Observable merge(Iterable> sources, int maxConcurrency) { return fromIterable(sources).flatMap((Function)Functions.identity(), maxConcurrency); } @SuppressWarnings({ "unchecked", "rawtypes" }) - public static Observable merge(ObservableConsumable> sources) { + public static Observable merge(ObservableSource> sources) { return new ObservableFlatMap(sources, Functions.identity(), false, Integer.MAX_VALUE, bufferSize()); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(ObservableConsumable> sources, int maxConcurrency) { + public static Observable merge(ObservableSource> sources, int maxConcurrency) { return new ObservableFlatMap(sources, Functions.identity(), false, maxConcurrency, bufferSize()); } @SuppressWarnings({ "unchecked", "rawtypes" }) @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(ObservableConsumable p1, ObservableConsumable p2) { + public static Observable merge(ObservableSource p1, ObservableSource p2) { Objects.requireNonNull(p1, "p1 is null"); Objects.requireNonNull(p2, "p2 is null"); return fromArray(p1, p2).flatMap((Function)Functions.identity(), false, 2); @@ -748,7 +740,7 @@ public static Observable merge(ObservableConsumable p1, Obse @SuppressWarnings({ "unchecked", "rawtypes" }) @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(ObservableConsumable p1, ObservableConsumable p2, Observable p3) { + public static Observable merge(ObservableSource p1, ObservableSource p2, Observable p3) { Objects.requireNonNull(p1, "p1 is null"); Objects.requireNonNull(p2, "p2 is null"); Objects.requireNonNull(p3, "p3 is null"); @@ -759,8 +751,8 @@ public static Observable merge(ObservableConsumable p1, Obse @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Observable merge( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4) { + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4) { Objects.requireNonNull(p1, "p1 is null"); Objects.requireNonNull(p2, "p2 is null"); Objects.requireNonNull(p3, "p3 is null"); @@ -770,55 +762,55 @@ public static Observable merge( @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable merge(ObservableConsumable... sources) { + public static Observable merge(ObservableSource... sources) { return fromArray(sources).flatMap((Function)Functions.identity(), sources.length); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable mergeDelayError(boolean delayErrors, Iterable> sources) { + public static Observable mergeDelayError(boolean delayErrors, Iterable> sources) { return fromIterable(sources).flatMap((Function)Functions.identity(), true); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable mergeDelayError(int maxConcurrency, int bufferSize, Iterable> sources) { + public static Observable mergeDelayError(int maxConcurrency, int bufferSize, Iterable> sources) { return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable mergeDelayError(int maxConcurrency, int bufferSize, ObservableConsumable... sources) { + public static Observable mergeDelayError(int maxConcurrency, int bufferSize, ObservableSource... sources) { return fromArray(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable mergeDelayError(int maxConcurrency, Iterable> sources) { + public static Observable mergeDelayError(int maxConcurrency, Iterable> sources) { return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable mergeDelayError(int maxConcurrency, ObservableConsumable... sources) { + public static Observable mergeDelayError(int maxConcurrency, ObservableSource... sources) { return fromArray(sources).flatMap((Function)Functions.identity(), true, maxConcurrency); } @SuppressWarnings({ "unchecked", "rawtypes" }) - public static Observable mergeDelayError(ObservableConsumable> sources) { + public static Observable mergeDelayError(ObservableSource> sources) { return new ObservableFlatMap(sources, Functions.identity(), true, Integer.MAX_VALUE, bufferSize()); } @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable mergeDelayError(ObservableConsumable> sources, int maxConcurrency) { + public static Observable mergeDelayError(ObservableSource> sources, int maxConcurrency) { return new ObservableFlatMap(sources, Functions.identity(), true, maxConcurrency, bufferSize()); } @SuppressWarnings({ "unchecked", "rawtypes" }) @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable mergeDelayError(ObservableConsumable p1, ObservableConsumable p2) { + public static Observable mergeDelayError(ObservableSource p1, ObservableSource p2) { Objects.requireNonNull(p1, "p1 is null"); Objects.requireNonNull(p2, "p2 is null"); return fromArray(p1, p2).flatMap((Function)Functions.identity(), true, 2); @@ -827,7 +819,7 @@ public static Observable mergeDelayError(ObservableConsumable Observable mergeDelayError(ObservableConsumable p1, ObservableConsumable p2, Observable p3) { + public static Observable mergeDelayError(ObservableSource p1, ObservableSource p2, Observable p3) { Objects.requireNonNull(p1, "p1 is null"); Objects.requireNonNull(p2, "p2 is null"); Objects.requireNonNull(p3, "p3 is null"); @@ -838,8 +830,8 @@ public static Observable mergeDelayError(ObservableConsumable Observable mergeDelayError( - ObservableConsumable p1, ObservableConsumable p2, - ObservableConsumable p3, ObservableConsumable p4) { + ObservableSource p1, ObservableSource p2, + ObservableSource p3, ObservableSource p4) { Objects.requireNonNull(p1, "p1 is null"); Objects.requireNonNull(p2, "p2 is null"); Objects.requireNonNull(p3, "p3 is null"); @@ -849,7 +841,7 @@ public static Observable mergeDelayError( @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable mergeDelayError(ObservableConsumable... sources) { + public static Observable mergeDelayError(ObservableSource... sources) { return fromArray(sources).flatMap((Function)Functions.identity(), true, sources.length); } @@ -891,17 +883,17 @@ protected void subscribeActual(Observer o) { } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable sequenceEqual(ObservableConsumable p1, ObservableConsumable p2) { + public static Observable sequenceEqual(ObservableSource p1, ObservableSource p2) { return sequenceEqual(p1, p2, Objects.equalsPredicate(), bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable sequenceEqual(ObservableConsumable p1, ObservableConsumable p2, BiPredicate isEqual) { + public static Observable sequenceEqual(ObservableSource p1, ObservableSource p2, BiPredicate isEqual) { return sequenceEqual(p1, p2, isEqual, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable sequenceEqual(ObservableConsumable p1, ObservableConsumable p2, BiPredicate isEqual, int bufferSize) { + public static Observable sequenceEqual(ObservableSource p1, ObservableSource p2, BiPredicate isEqual, int bufferSize) { Objects.requireNonNull(p1, "p1 is null"); Objects.requireNonNull(p2, "p2 is null"); Objects.requireNonNull(isEqual, "isEqual is null"); @@ -910,20 +902,20 @@ public static Observable sequenceEqual(ObservableConsumable Observable sequenceEqual(ObservableConsumable p1, ObservableConsumable p2, int bufferSize) { + public static Observable sequenceEqual(ObservableSource p1, ObservableSource p2, int bufferSize) { return sequenceEqual(p1, p2, Objects.equalsPredicate(), bufferSize); } @SuppressWarnings({ "rawtypes", "unchecked" }) @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) - public static Observable switchOnNext(int bufferSize, ObservableConsumable> sources) { + public static Observable switchOnNext(int bufferSize, ObservableSource> sources) { Objects.requireNonNull(sources, "sources is null"); return new ObservableSwitchMap(sources, Functions.identity(), bufferSize); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable switchOnNext(ObservableConsumable> sources) { + public static Observable switchOnNext(ObservableSource> sources) { return switchOnNext(bufferSize(), sources); } @@ -944,12 +936,12 @@ public static Observable timer(long delay, TimeUnit unit, Scheduler schedu } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable using(Callable resourceSupplier, Function> sourceSupplier, Consumer disposer) { + public static Observable using(Callable resourceSupplier, Function> sourceSupplier, Consumer disposer) { return using(resourceSupplier, sourceSupplier, disposer, true); } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable using(Callable resourceSupplier, Function> sourceSupplier, Consumer disposer, boolean eager) { + public static Observable using(Callable resourceSupplier, Function> sourceSupplier, Consumer disposer, boolean eager) { Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); Objects.requireNonNull(sourceSupplier, "sourceSupplier is null"); Objects.requireNonNull(disposer, "disposer is null"); @@ -963,7 +955,7 @@ private static void validateBufferSize(int bufferSize) { } @SchedulerSupport(SchedulerSupport.NONE) - public static Observable zip(Iterable> sources, Function zipper) { + public static Observable zip(Iterable> sources, Function zipper) { Objects.requireNonNull(zipper, "zipper is null"); Objects.requireNonNull(sources, "sources is null"); return new ObservableZip(null, sources, zipper, bufferSize(), false); @@ -971,14 +963,14 @@ public static Observable zip(Iterable Observable zip(ObservableConsumable> sources, final Function zipper) { + public static Observable zip(ObservableSource> sources, final Function zipper) { Objects.requireNonNull(zipper, "zipper is null"); Objects.requireNonNull(sources, "sources is null"); // FIXME don't want to fiddle with manual type inference, this will be inlined later anyway return new ObservableToList(sources, 16) - .flatMap(new Function>, Observable>() { + .flatMap(new Function>, Observable>() { @Override - public Observable apply(List> list) { + public Observable apply(List> list) { return zipIterable(zipper, false, bufferSize(), list); } }); @@ -987,7 +979,7 @@ public Observable apply(List> lis @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, + ObservableSource p1, ObservableSource p2, BiFunction zipper) { return zipArray(Functions.toFunction(zipper), false, bufferSize(), p1, p2); } @@ -995,7 +987,7 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, + ObservableSource p1, ObservableSource p2, BiFunction zipper, boolean delayError) { return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), p1, p2); } @@ -1003,7 +995,7 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, + ObservableSource p1, ObservableSource p2, BiFunction zipper, boolean delayError, int bufferSize) { return zipArray(Functions.toFunction(zipper), delayError, bufferSize, p1, p2); } @@ -1011,7 +1003,7 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, ObservableConsumable p3, + ObservableSource p1, ObservableSource p2, ObservableSource p3, Function3 zipper) { return zipArray(Functions.toFunction(zipper), false, bufferSize(), p1, p2, p3); } @@ -1019,8 +1011,8 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, ObservableConsumable p3, - ObservableConsumable p4, + ObservableSource p1, ObservableSource p2, ObservableSource p3, + ObservableSource p4, Function4 zipper) { return zipArray(Functions.toFunction(zipper), false, bufferSize(), p1, p2, p3, p4); } @@ -1028,8 +1020,8 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, ObservableConsumable p3, - ObservableConsumable p4, ObservableConsumable p5, + ObservableSource p1, ObservableSource p2, ObservableSource p3, + ObservableSource p4, ObservableSource p5, Function5 zipper) { return zipArray(Functions.toFunction(zipper), false, bufferSize(), p1, p2, p3, p4, p5); } @@ -1037,8 +1029,8 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, ObservableConsumable p3, - ObservableConsumable p4, ObservableConsumable p5, ObservableConsumable p6, + ObservableSource p1, ObservableSource p2, ObservableSource p3, + ObservableSource p4, ObservableSource p5, ObservableSource p6, Function6 zipper) { return zipArray(Functions.toFunction(zipper), false, bufferSize(), p1, p2, p3, p4, p5, p6); } @@ -1046,9 +1038,9 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, ObservableConsumable p3, - ObservableConsumable p4, ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7, + ObservableSource p1, ObservableSource p2, ObservableSource p3, + ObservableSource p4, ObservableSource p5, ObservableSource p6, + ObservableSource p7, Function7 zipper) { return zipArray(Functions.toFunction(zipper), false, bufferSize(), p1, p2, p3, p4, p5, p6, p7); } @@ -1056,9 +1048,9 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, ObservableConsumable p3, - ObservableConsumable p4, ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7, ObservableConsumable p8, + ObservableSource p1, ObservableSource p2, ObservableSource p3, + ObservableSource p4, ObservableSource p5, ObservableSource p6, + ObservableSource p7, ObservableSource p8, Function8 zipper) { return zipArray(Functions.toFunction(zipper), false, bufferSize(), p1, p2, p3, p4, p5, p6, p7, p8); } @@ -1066,16 +1058,16 @@ public static Observable zip( @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip( - ObservableConsumable p1, ObservableConsumable p2, ObservableConsumable p3, - ObservableConsumable p4, ObservableConsumable p5, ObservableConsumable p6, - ObservableConsumable p7, ObservableConsumable p8, ObservableConsumable p9, + ObservableSource p1, ObservableSource p2, ObservableSource p3, + ObservableSource p4, ObservableSource p5, ObservableSource p6, + ObservableSource p7, ObservableSource p8, ObservableSource p9, Function9 zipper) { return zipArray(Functions.toFunction(zipper), false, bufferSize(), p1, p2, p3, p4, p5, p6, p7, p8, p9); } @SchedulerSupport(SchedulerSupport.NONE) public static Observable zipArray(Function zipper, - boolean delayError, int bufferSize, ObservableConsumable... sources) { + boolean delayError, int bufferSize, ObservableSource... sources) { if (sources.length == 0) { return empty(); } @@ -1087,7 +1079,7 @@ public static Observable zipArray(Function z @SchedulerSupport(SchedulerSupport.NONE) public static Observable zipIterable(Function zipper, boolean delayError, int bufferSize, - Iterable> sources) { + Iterable> sources) { Objects.requireNonNull(zipper, "zipper is null"); Objects.requireNonNull(sources, "sources is null"); validateBufferSize(bufferSize); @@ -1103,7 +1095,7 @@ public final Observable all(Predicate predicate) { @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) - public final Observable ambWith(ObservableConsumable other) { + public final Observable ambWith(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return amb(this, other); } @@ -1207,15 +1199,15 @@ public final Observable> buffer(long timespan, TimeUnit unit, Scheduler @SchedulerSupport(SchedulerSupport.NONE) public final Observable> buffer( - ObservableConsumable bufferOpenings, - Function> bufferClosingSelector) { + ObservableSource bufferOpenings, + Function> bufferClosingSelector) { return buffer(bufferOpenings, bufferClosingSelector, ArrayListSupplier.instance()); } @SchedulerSupport(SchedulerSupport.NONE) public final > Observable buffer( - ObservableConsumable bufferOpenings, - Function> bufferClosingSelector, + ObservableSource bufferOpenings, + Function> bufferClosingSelector, Callable bufferSupplier) { Objects.requireNonNull(bufferOpenings, "bufferOpenings is null"); Objects.requireNonNull(bufferClosingSelector, "bufferClosingSelector is null"); @@ -1224,7 +1216,7 @@ public final > Observable } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable> buffer(ObservableConsumable boundary) { + public final Observable> buffer(ObservableSource boundary) { /* * XXX: javac complains if this is not manually cast, Eclipse is fine */ @@ -1232,7 +1224,7 @@ public final Observable> buffer(ObservableConsumable boundary) { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable> buffer(ObservableConsumable boundary, final int initialCapacity) { + public final Observable> buffer(ObservableSource boundary, final int initialCapacity) { return buffer(boundary, new Callable>() { @Override public List call() { @@ -1242,20 +1234,20 @@ public List call() { } @SchedulerSupport(SchedulerSupport.NONE) - public final > Observable buffer(ObservableConsumable boundary, Callable bufferSupplier) { + public final > Observable buffer(ObservableSource boundary, Callable bufferSupplier) { Objects.requireNonNull(boundary, "boundary is null"); Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return new ObservableBufferExactBoundary(this, boundary, bufferSupplier); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable> buffer(Callable> boundarySupplier) { + public final Observable> buffer(Callable> boundarySupplier) { return buffer(boundarySupplier, ArrayListSupplier.instance()); } @SchedulerSupport(SchedulerSupport.NONE) - public final > Observable buffer(Callable> boundarySupplier, Callable bufferSupplier) { + public final > Observable buffer(Callable> boundarySupplier, Callable bufferSupplier) { Objects.requireNonNull(boundarySupplier, "boundarySupplier is null"); Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return new ObservableBufferBoundarySupplier(this, boundarySupplier, bufferSupplier); @@ -1300,17 +1292,17 @@ public U call() { }, collector); } - public final Observable compose(Function, ? extends ObservableConsumable> convert) { + public final Observable compose(Function, ? extends ObservableSource> convert) { return wrap(to(convert)); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable concatMap(Function> mapper) { + public final Observable concatMap(Function> mapper) { return concatMap(mapper, 2); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable concatMap(Function> mapper, int prefetch) { + public final Observable concatMap(Function> mapper, int prefetch) { Objects.requireNonNull(mapper, "mapper is null"); if (prefetch <= 0) { throw new IllegalArgumentException("prefetch > 0 required but it was " + prefetch); @@ -1340,7 +1332,7 @@ public Observable apply(T v) throws Exception { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable concatWith(ObservableConsumable other) { + public final Observable concatWith(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return concat(this, other); } @@ -1362,7 +1354,7 @@ public final Observable count() { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable debounce(Function> debounceSelector) { + public final Observable debounce(Function> debounceSelector) { Objects.requireNonNull(debounceSelector, "debounceSelector is null"); return new ObservableDebounce(this, debounceSelector); } @@ -1388,7 +1380,7 @@ public final Observable defaultIfEmpty(T value) { @SchedulerSupport(SchedulerSupport.NONE) // TODO a more efficient implementation if necessary - public final Observable delay(final Function> itemDelay) { + public final Observable delay(final Function> itemDelay) { Objects.requireNonNull(itemDelay, "itemDelay is null"); return flatMap(new Function>() { @Override @@ -1427,8 +1419,8 @@ public final Observable delay(long delay, TimeUnit unit, Scheduler scheduler, } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable delay(Callable> delaySupplier, - Function> itemDelay) { + public final Observable delay(Callable> delaySupplier, + Function> itemDelay) { return delaySubscription(delaySupplier).delay(itemDelay); } @@ -1451,7 +1443,7 @@ public final Observable delay(Callable Observable delaySubscription(ObservableConsumable other) { + public final Observable delaySubscription(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return new ObservableDelaySubscriptionOther(this, other); } @@ -1477,7 +1469,7 @@ public Observable apply(Long v) { @SuppressWarnings({ "unchecked", "rawtypes" }) @SchedulerSupport(SchedulerSupport.NONE) - public final Observable delaySubscription(final Callable> delaySupplier) { + public final Observable delaySubscription(final Callable> delaySupplier) { Objects.requireNonNull(delaySupplier, "delaySupplier is null"); return fromCallable(delaySupplier) .flatMap((Function)Functions.identity()) @@ -1619,7 +1611,7 @@ public final Observable doOnError(Consumer onError) { public final Observable doOnLifecycle(final Consumer onSubscribe, final Runnable onCancel) { Objects.requireNonNull(onSubscribe, "onSubscribe is null"); Objects.requireNonNull(onCancel, "onCancel is null"); - return lift(new Operator() { + return lift(new ObservableOperator() { @Override public Observer apply(Observer s) { return new SubscriptionLambdaObserver(s, onSubscribe, onCancel); @@ -1672,7 +1664,7 @@ public final Observable endWith(Iterable values) { @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) - public final Observable endWith(ObservableConsumable other) { + public final Observable endWith(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return concatArray(this, other); } @@ -1715,22 +1707,22 @@ public final Observable first(T defaultValue) { return take(1).single(defaultValue); } - public final Observable flatMap(Function> mapper) { + public final Observable flatMap(Function> mapper) { return flatMap(mapper, false); } - public final Observable flatMap(Function> mapper, boolean delayError) { + public final Observable flatMap(Function> mapper, boolean delayError) { return flatMap(mapper, delayError, Integer.MAX_VALUE); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable flatMap(Function> mapper, boolean delayErrors, int maxConcurrency) { + public final Observable flatMap(Function> mapper, boolean delayErrors, int maxConcurrency) { return flatMap(mapper, delayErrors, maxConcurrency, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable flatMap(Function> mapper, + public final Observable flatMap(Function> mapper, boolean delayErrors, int maxConcurrency, int bufferSize) { Objects.requireNonNull(mapper, "mapper is null"); if (maxConcurrency <= 0) { @@ -1746,9 +1738,9 @@ public final Observable flatMap(Function Observable flatMap( - Function> onNextMapper, - Function> onErrorMapper, - Callable> onCompleteSupplier) { + Function> onNextMapper, + Function> onErrorMapper, + Callable> onCompleteSupplier) { Objects.requireNonNull(onNextMapper, "onNextMapper is null"); Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); @@ -1757,9 +1749,9 @@ public final Observable flatMap( @SchedulerSupport(SchedulerSupport.NONE) public final Observable flatMap( - Function> onNextMapper, - Function> onErrorMapper, - Callable> onCompleteSupplier, + Function> onNextMapper, + Function> onErrorMapper, + Callable> onCompleteSupplier, int maxConcurrency) { Objects.requireNonNull(onNextMapper, "onNextMapper is null"); Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); @@ -1768,27 +1760,27 @@ public final Observable flatMap( } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable flatMap(Function> mapper, int maxConcurrency) { + public final Observable flatMap(Function> mapper, int maxConcurrency) { return flatMap(mapper, false, maxConcurrency, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable flatMap(Function> mapper, BiFunction resultSelector) { + public final Observable flatMap(Function> mapper, BiFunction resultSelector) { return flatMap(mapper, resultSelector, false, bufferSize(), bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable flatMap(Function> mapper, BiFunction combiner, boolean delayError) { + public final Observable flatMap(Function> mapper, BiFunction combiner, boolean delayError) { return flatMap(mapper, combiner, delayError, bufferSize(), bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable flatMap(Function> mapper, BiFunction combiner, boolean delayError, int maxConcurrency) { + public final Observable flatMap(Function> mapper, BiFunction combiner, boolean delayError, int maxConcurrency) { return flatMap(mapper, combiner, delayError, maxConcurrency, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable flatMap(final Function> mapper, final BiFunction combiner, boolean delayError, int maxConcurrency, int bufferSize) { + public final Observable flatMap(final Function> mapper, final BiFunction combiner, boolean delayError, int maxConcurrency, int bufferSize) { Objects.requireNonNull(mapper, "mapper is null"); Objects.requireNonNull(combiner, "combiner is null"); return flatMap(new Function>() { @@ -1807,7 +1799,7 @@ public R apply(U w) throws Exception{ } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable flatMap(Function> mapper, BiFunction combiner, int maxConcurrency) { + public final Observable flatMap(Function> mapper, BiFunction combiner, int maxConcurrency) { return flatMap(mapper, combiner, false, maxConcurrency, bufferSize()); } @@ -1961,9 +1953,9 @@ public final Observable> groupBy(Function Observable groupJoin( - ObservableConsumable other, - Function> leftEnd, - Function> rightEnd, + ObservableSource other, + Function> leftEnd, + Function> rightEnd, BiFunction, ? extends R> resultSelector ) { return new ObservableGroupJoin( @@ -1988,9 +1980,9 @@ public boolean test(T v) { @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.NONE) public final Observable join( - ObservableConsumable other, - Function> leftEnd, - Function> rightEnd, + ObservableSource other, + Function> leftEnd, + Function> rightEnd, BiFunction resultSelector ) { return new ObservableJoin( @@ -2007,7 +1999,7 @@ public final Observable last(T defaultValue) { return takeLast(1).single(defaultValue); } - public final Observable lift(Operator onLift) { + public final Observable lift(ObservableOperator onLift) { Objects.requireNonNull(onLift, "onLift is null"); return new ObservableLift(this, onLift); } @@ -2023,7 +2015,7 @@ public final Observable>> materialize() { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable mergeWith(ObservableConsumable other) { + public final Observable mergeWith(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return merge(this, other); } @@ -2063,17 +2055,17 @@ public boolean test(T v) { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable onErrorResumeNext(Function> resumeFunction) { + public final Observable onErrorResumeNext(Function> resumeFunction) { Objects.requireNonNull(resumeFunction, "resumeFunction is null"); return new ObservableOnErrorNext(this, resumeFunction, false); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable onErrorResumeNext(final ObservableConsumable next) { + public final Observable onErrorResumeNext(final ObservableSource next) { Objects.requireNonNull(next, "next is null"); - return onErrorResumeNext(new Function>() { + return onErrorResumeNext(new Function>() { @Override - public ObservableConsumable apply(Throwable e) { + public ObservableSource apply(Throwable e) { return next; } }); @@ -2098,11 +2090,11 @@ public T apply(Throwable e) { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable onExceptionResumeNext(final ObservableConsumable next) { + public final Observable onExceptionResumeNext(final ObservableSource next) { Objects.requireNonNull(next, "next is null"); - return new ObservableOnErrorNext(this, new Function>() { + return new ObservableOnErrorNext(this, new Function>() { @Override - public ObservableConsumable apply(Throwable e) { + public ObservableSource apply(Throwable e) { return next; } }, true); @@ -2114,12 +2106,12 @@ public final ConnectableObservable publish() { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable publish(Function, ? extends ObservableConsumable> selector) { + public final Observable publish(Function, ? extends ObservableSource> selector) { return publish(selector, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable publish(Function, ? extends ObservableConsumable> selector, int bufferSize) { + public final Observable publish(Function, ? extends ObservableSource> selector, int bufferSize) { validateBufferSize(bufferSize); Objects.requireNonNull(selector, "selector is null"); return ObservablePublish.create(this, selector, bufferSize); @@ -2170,12 +2162,12 @@ public final Observable repeatUntil(BooleanSupplier stop) { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable repeatWhen(final Function, ? extends ObservableConsumable> handler) { + public final Observable repeatWhen(final Function, ? extends ObservableSource> handler) { Objects.requireNonNull(handler, "handler is null"); - Function>>, ObservableConsumable> f = new Function>>, ObservableConsumable>() { + Function>>, ObservableSource> f = new Function>>, ObservableSource>() { @Override - public ObservableConsumable apply(Observable>> no) throws Exception { + public ObservableSource apply(Observable>> no) throws Exception { return handler.apply(no.map(new Function>, Object>() { @Override public Object apply(Try> v) { @@ -2195,7 +2187,7 @@ public final ConnectableObservable replay() { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable replay(Function, ? extends ObservableConsumable> selector) { + public final Observable replay(Function, ? extends ObservableSource> selector) { Objects.requireNonNull(selector, "selector is null"); return ObservableReplay.multicastSelector(new Callable>() { @Override @@ -2206,7 +2198,7 @@ public ConnectableObservable call() { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable replay(Function, ? extends ObservableConsumable> selector, final int bufferSize) { + public final Observable replay(Function, ? extends ObservableSource> selector, final int bufferSize) { Objects.requireNonNull(selector, "selector is null"); return ObservableReplay.multicastSelector(new Callable>() { @Override @@ -2217,12 +2209,12 @@ public ConnectableObservable call() { } @SchedulerSupport(SchedulerSupport.COMPUTATION) - public final Observable replay(Function, ? extends ObservableConsumable> selector, int bufferSize, long time, TimeUnit unit) { + public final Observable replay(Function, ? extends ObservableSource> selector, int bufferSize, long time, TimeUnit unit) { return replay(selector, bufferSize, time, unit, Schedulers.computation()); } @SchedulerSupport(SchedulerSupport.CUSTOM) - public final Observable replay(Function, ? extends ObservableConsumable> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) { + public final Observable replay(Function, ? extends ObservableSource> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) { if (bufferSize < 0) { throw new IllegalArgumentException("bufferSize < 0"); } @@ -2236,7 +2228,7 @@ public ConnectableObservable call() { } @SchedulerSupport(SchedulerSupport.CUSTOM) - public final Observable replay(final Function, ? extends ObservableConsumable> selector, final int bufferSize, final Scheduler scheduler) { + public final Observable replay(final Function, ? extends ObservableSource> selector, final int bufferSize, final Scheduler scheduler) { return ObservableReplay.multicastSelector(new Callable>() { @Override public ConnectableObservable call() { @@ -2252,12 +2244,12 @@ public Observable apply(Observable t) throws Exception { } @SchedulerSupport(SchedulerSupport.COMPUTATION) - public final Observable replay(Function, ? extends ObservableConsumable> selector, long time, TimeUnit unit) { + public final Observable replay(Function, ? extends ObservableSource> selector, long time, TimeUnit unit) { return replay(selector, time, unit, Schedulers.computation()); } @SchedulerSupport(SchedulerSupport.CUSTOM) - public final Observable replay(Function, ? extends ObservableConsumable> selector, final long time, final TimeUnit unit, final Scheduler scheduler) { + public final Observable replay(Function, ? extends ObservableSource> selector, final long time, final TimeUnit unit, final Scheduler scheduler) { Objects.requireNonNull(selector, "selector is null"); Objects.requireNonNull(unit, "unit is null"); Objects.requireNonNull(scheduler, "scheduler is null"); @@ -2270,7 +2262,7 @@ public ConnectableObservable call() { } @SchedulerSupport(SchedulerSupport.CUSTOM) - public final Observable replay(final Function, ? extends ObservableConsumable> selector, final Scheduler scheduler) { + public final Observable replay(final Function, ? extends ObservableSource> selector, final Scheduler scheduler) { Objects.requireNonNull(selector, "selector is null"); Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.multicastSelector(new Callable>() { @@ -2376,12 +2368,12 @@ public boolean test(Throwable e) throws Exception { @SchedulerSupport(SchedulerSupport.NONE) public final Observable retryWhen( - final Function, ? extends ObservableConsumable> handler) { + final Function, ? extends ObservableSource> handler) { Objects.requireNonNull(handler, "handler is null"); - Function>>, ObservableConsumable> f = new Function>>, ObservableConsumable>() { + Function>>, ObservableSource> f = new Function>>, ObservableSource>() { @Override - public ObservableConsumable apply(Observable>> no) throws Exception { + public ObservableSource apply(Observable>> no) throws Exception { return handler.apply(no .takeWhile(new Predicate>>() { @Override @@ -2427,7 +2419,7 @@ public final Observable sample(long period, TimeUnit unit, Scheduler schedule } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable sample(ObservableConsumable sampler) { + public final Observable sample(ObservableSource sampler) { Objects.requireNonNull(sampler, "sampler is null"); return new ObservableSampleWithObservable(this, sampler); } @@ -2459,7 +2451,7 @@ public final Observable scanWith(Callable seedSupplier, BiFunction serialize() { - return lift(new Operator() { + return lift(new ObservableOperator() { @Override public Observer apply(Observer s) { return new SerializedObserver(s); @@ -2543,7 +2535,7 @@ public final Observable skipLast(long time, TimeUnit unit, Scheduler schedule } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable skipUntil(ObservableConsumable other) { + public final Observable skipUntil(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return new ObservableSkipUntil(this, other); } @@ -2562,7 +2554,7 @@ public final Observable startWith(Iterable values) { @SuppressWarnings("unchecked") @SchedulerSupport(SchedulerSupport.NONE) - public final Observable startWith(ObservableConsumable other) { + public final Observable startWith(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return concatArray(other, this); } @@ -2638,18 +2630,18 @@ public final Observable subscribeOn(Scheduler scheduler) { } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable switchIfEmpty(ObservableConsumable other) { + public final Observable switchIfEmpty(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return new ObservableSwitchIfEmpty(this, other); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable switchMap(Function> mapper) { + public final Observable switchMap(Function> mapper) { return switchMap(mapper, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable switchMap(Function> mapper, int bufferSize) { + public final Observable switchMap(Function> mapper, int bufferSize) { Objects.requireNonNull(mapper, "mapper is null"); validateBufferSize(bufferSize); return new ObservableSwitchMap(this, mapper, bufferSize); @@ -2765,7 +2757,7 @@ public final Observable> takeLastBuffer(long time, TimeUnit unit, Schedu } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable takeUntil(ObservableConsumable other) { + public final Observable takeUntil(ObservableSource other) { Objects.requireNonNull(other, "other is null"); return new ObservableTakeUntil(this, other); } @@ -2837,12 +2829,12 @@ public final Observable> timeInterval(TimeUnit unit, Scheduler schedule } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable timeout(Function> timeoutSelector) { + public final Observable timeout(Function> timeoutSelector) { return timeout0(null, timeoutSelector, null); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable timeout(Function> timeoutSelector, ObservableConsumable other) { + public final Observable timeout(Function> timeoutSelector, ObservableSource other) { Objects.requireNonNull(other, "other is null"); return timeout0(null, timeoutSelector, other); } @@ -2853,13 +2845,13 @@ public final Observable timeout(long timeout, TimeUnit timeUnit) { } @SchedulerSupport(SchedulerSupport.COMPUTATION) - public final Observable timeout(long timeout, TimeUnit timeUnit, ObservableConsumable other) { + public final Observable timeout(long timeout, TimeUnit timeUnit, ObservableSource other) { Objects.requireNonNull(other, "other is null"); return timeout0(timeout, timeUnit, other, Schedulers.computation()); } @SchedulerSupport(SchedulerSupport.CUSTOM) - public final Observable timeout(long timeout, TimeUnit timeUnit, ObservableConsumable other, Scheduler scheduler) { + public final Observable timeout(long timeout, TimeUnit timeUnit, ObservableSource other, Scheduler scheduler) { Objects.requireNonNull(other, "other is null"); return timeout0(timeout, timeUnit, other, scheduler); } @@ -2869,23 +2861,23 @@ public final Observable timeout(long timeout, TimeUnit timeUnit, Scheduler sc return timeout0(timeout, timeUnit, null, scheduler); } - public final Observable timeout(Callable> firstTimeoutSelector, - Function> timeoutSelector) { + public final Observable timeout(Callable> firstTimeoutSelector, + Function> timeoutSelector) { Objects.requireNonNull(firstTimeoutSelector, "firstTimeoutSelector is null"); return timeout0(firstTimeoutSelector, timeoutSelector, null); } @SchedulerSupport(SchedulerSupport.NONE) public final Observable timeout( - Callable> firstTimeoutSelector, - Function> timeoutSelector, - ObservableConsumable other) { + Callable> firstTimeoutSelector, + Function> timeoutSelector, + ObservableSource other) { Objects.requireNonNull(firstTimeoutSelector, "firstTimeoutSelector is null"); Objects.requireNonNull(other, "other is null"); return timeout0(firstTimeoutSelector, timeoutSelector, other); } - private Observable timeout0(long timeout, TimeUnit timeUnit, ObservableConsumable other, + private Observable timeout0(long timeout, TimeUnit timeUnit, ObservableSource other, Scheduler scheduler) { Objects.requireNonNull(timeUnit, "timeUnit is null"); Objects.requireNonNull(scheduler, "scheduler is null"); @@ -2893,9 +2885,9 @@ private Observable timeout0(long timeout, TimeUnit timeUnit, ObservableConsum } private Observable timeout0( - Callable> firstTimeoutSelector, - Function> timeoutSelector, - ObservableConsumable other) { + Callable> firstTimeoutSelector, + Function> timeoutSelector, + ObservableSource other) { Objects.requireNonNull(timeoutSelector, "timeoutSelector is null"); return new ObservableTimeout(this, firstTimeoutSelector, timeoutSelector, other); } @@ -3322,45 +3314,45 @@ public final Observable> window( } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable> window(ObservableConsumable boundary) { + public final Observable> window(ObservableSource boundary) { return window(boundary, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable> window(ObservableConsumable boundary, int bufferSize) { + public final Observable> window(ObservableSource boundary, int bufferSize) { Objects.requireNonNull(boundary, "boundary is null"); return new ObservableWindowBoundary(this, boundary, bufferSize); } @SchedulerSupport(SchedulerSupport.NONE) public final Observable> window( - ObservableConsumable windowOpen, - Function> windowClose) { + ObservableSource windowOpen, + Function> windowClose) { return window(windowOpen, windowClose, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) public final Observable> window( - ObservableConsumable windowOpen, - Function> windowClose, int bufferSize) { + ObservableSource windowOpen, + Function> windowClose, int bufferSize) { Objects.requireNonNull(windowOpen, "windowOpen is null"); Objects.requireNonNull(windowClose, "windowClose is null"); return new ObservableWindowBoundarySelector(this, windowOpen, windowClose, bufferSize); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable> window(Callable> boundary) { + public final Observable> window(Callable> boundary) { return window(boundary, bufferSize()); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable> window(Callable> boundary, int bufferSize) { + public final Observable> window(Callable> boundary, int bufferSize) { Objects.requireNonNull(boundary, "boundary is null"); return new ObservableWindowBoundarySupplier(this, boundary, bufferSize); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable withLatestFrom(ObservableConsumable other, BiFunction combiner) { + public final Observable withLatestFrom(ObservableSource other, BiFunction combiner) { Objects.requireNonNull(other, "other is null"); Objects.requireNonNull(combiner, "combiner is null"); @@ -3375,20 +3367,20 @@ public final Observable zipWith(Iterable other, BiFunction Observable zipWith(ObservableConsumable other, BiFunction zipper) { + public final Observable zipWith(ObservableSource other, BiFunction zipper) { Objects.requireNonNull(other, "other is null"); return zip(this, other, zipper); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable zipWith(ObservableConsumable other, BiFunction zipper, boolean delayError) { + public final Observable zipWith(ObservableSource other, BiFunction zipper, boolean delayError) { return zip(this, other, zipper, delayError); } @SchedulerSupport(SchedulerSupport.NONE) - public final Observable zipWith(ObservableConsumable other, BiFunction zipper, boolean delayError, int bufferSize) { + public final Observable zipWith(ObservableSource other, BiFunction zipper, boolean delayError, int bufferSize) { return zip(this, other, zipper, delayError, bufferSize); } - } \ No newline at end of file + } diff --git a/src/main/java/io/reactivex/ObservableOperator.java b/src/main/java/io/reactivex/ObservableOperator.java new file mode 100644 index 0000000000..923c570325 --- /dev/null +++ b/src/main/java/io/reactivex/ObservableOperator.java @@ -0,0 +1,20 @@ +/** + * Copyright 2016 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is + * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See + * the License for the specific language governing permissions and limitations under the License. + */ + +package io.reactivex; + +import io.reactivex.functions.Function; + +public interface ObservableOperator extends Function, Observer> { + +} diff --git a/src/main/java/io/reactivex/ObservableConsumable.java b/src/main/java/io/reactivex/ObservableSource.java similarity index 89% rename from src/main/java/io/reactivex/ObservableConsumable.java rename to src/main/java/io/reactivex/ObservableSource.java index 34c820814b..49ad389404 100644 --- a/src/main/java/io/reactivex/ObservableConsumable.java +++ b/src/main/java/io/reactivex/ObservableSource.java @@ -17,12 +17,12 @@ * consumable via an {@link Observer}. *

* This class also serves the base type for custom operators wrapped into - * Observable via {@link Observable#create(ObservableConsumable)}. + * Observable via {@link Observable#create(ObservableSource)}. * * @param the element type * @since 2.0 */ -public interface ObservableConsumable { +public interface ObservableSource { void subscribe(Observer observer); } diff --git a/src/main/java/io/reactivex/ObservableTransformer.java b/src/main/java/io/reactivex/ObservableTransformer.java new file mode 100644 index 0000000000..cee63bf095 --- /dev/null +++ b/src/main/java/io/reactivex/ObservableTransformer.java @@ -0,0 +1,20 @@ +/** + * Copyright 2016 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is + * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See + * the License for the specific language governing permissions and limitations under the License. + */ + +package io.reactivex; + +import io.reactivex.functions.Function; + +public interface ObservableTransformer extends Function, ObservableSource> { + +} diff --git a/src/main/java/io/reactivex/Single.java b/src/main/java/io/reactivex/Single.java index 2a07a02930..5e978f6b40 100644 --- a/src/main/java/io/reactivex/Single.java +++ b/src/main/java/io/reactivex/Single.java @@ -641,7 +641,7 @@ public final Single delaySubscription(SingleSource other) { return new SingleDelayWithSingle(this, other); } - public final Single delaySubscription(ObservableConsumable other) { + public final Single delaySubscription(ObservableSource other) { return new SingleDelayWithObservable(this, other); } diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromObservable.java b/src/main/java/io/reactivex/internal/operators/completable/CompletableFromObservable.java index aff4f772ce..b49e41b60b 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromObservable.java +++ b/src/main/java/io/reactivex/internal/operators/completable/CompletableFromObservable.java @@ -18,9 +18,9 @@ public final class CompletableFromObservable extends Completable { - final ObservableConsumable observable; + final ObservableSource observable; - public CompletableFromObservable(ObservableConsumable observable) { + public CompletableFromObservable(ObservableSource observable) { this.observable = observable; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableLatest.java b/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableLatest.java index de301f9306..3e189183cc 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableLatest.java +++ b/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableLatest.java @@ -40,14 +40,14 @@ public enum BlockingObservableLatest { * @return an {@code Iterable} that blocks until or unless the {@code Observable} emits an item that has not * been returned by the {@code Iterable}, then returns that item */ - public static Iterable latest(final ObservableConsumable source) { + public static Iterable latest(final ObservableSource source) { return new Iterable() { @Override public Iterator iterator() { LatestObserverIterator lio = new LatestObserverIterator(); @SuppressWarnings("unchecked") - Observable>> materialized = Observable.wrap((ObservableConsumable)source).materialize(); + Observable>> materialized = Observable.wrap((ObservableSource)source).materialize(); materialized.subscribe(lio); return lio; @@ -126,4 +126,4 @@ public void remove() { } } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecent.java b/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecent.java index 9c8b7404fe..8c46b5ebf9 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecent.java +++ b/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecent.java @@ -16,7 +16,7 @@ import java.util.*; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.exceptions.Exceptions; import io.reactivex.internal.util.NotificationLite; import io.reactivex.observers.DefaultObserver; @@ -41,7 +41,7 @@ public enum BlockingObservableMostRecent { * @return an {@code Iterable} that always returns the item most recently emitted by {@code source}, or * {@code initialValue} if {@code source} has not yet emitted any items */ - public static Iterable mostRecent(final ObservableConsumable source, final T initialValue) { + public static Iterable mostRecent(final ObservableSource source, final T initialValue) { return new Iterable() { @Override public Iterator iterator() { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAll.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableAll.java index 2f799defc0..0965f5a1f1 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAll.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableAll.java @@ -19,10 +19,10 @@ import io.reactivex.plugins.RxJavaPlugins; public final class ObservableAll extends Observable { - final ObservableConsumable source; + final ObservableSource source; final Predicate predicate; - public ObservableAll(ObservableConsumable source, Predicate predicate) { + public ObservableAll(ObservableSource source, Predicate predicate) { this.source = source; this.predicate = predicate; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAmb.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableAmb.java index a48bebcf12..1eebc055f0 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAmb.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableAmb.java @@ -21,10 +21,10 @@ import io.reactivex.plugins.RxJavaPlugins; public final class ObservableAmb extends Observable { - final ObservableConsumable[] sources; - final Iterable> sourcesIterable; + final ObservableSource[] sources; + final Iterable> sourcesIterable; - public ObservableAmb(ObservableConsumable[] sources, Iterable> sourcesIterable) { + public ObservableAmb(ObservableSource[] sources, Iterable> sourcesIterable) { this.sources = sources; this.sourcesIterable = sourcesIterable; } @@ -32,11 +32,11 @@ public ObservableAmb(ObservableConsumable[] sources, Iterable s) { - ObservableConsumable[] sources = this.sources; + ObservableSource[] sources = this.sources; int count = 0; if (sources == null) { sources = new Observable[8]; - for (ObservableConsumable p : sourcesIterable) { + for (ObservableSource p : sourcesIterable) { if (count == sources.length) { Observable[] b = new Observable[count + (count >> 2)]; System.arraycopy(sources, 0, b, 0, count); @@ -73,7 +73,7 @@ public AmbCoordinator(Observer actual, int count) { this.subscribers = new AmbInnerSubscriber[count]; } - public void subscribe(ObservableConsumable[] sources) { + public void subscribe(ObservableSource[] sources) { AmbInnerSubscriber[] as = subscribers; int len = as.length; for (int i = 0; i < len; i++) { @@ -199,4 +199,4 @@ public boolean isDisposed() { return get() == DisposableHelper.DISPOSED; } } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAny.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableAny.java index 09324add0e..48ac31524f 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAny.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableAny.java @@ -18,9 +18,9 @@ import io.reactivex.internal.disposables.DisposableHelper; public final class ObservableAny extends Observable { - final ObservableConsumable source; + final ObservableSource source; final Predicate predicate; - public ObservableAny(ObservableConsumable source, Predicate predicate) { + public ObservableAny(ObservableSource source, Predicate predicate) { this.source = source; this.predicate = predicate; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBuffer.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableBuffer.java index 7771bbdbd7..e0370c203e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBuffer.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableBuffer.java @@ -18,18 +18,18 @@ import java.util.concurrent.atomic.AtomicBoolean; import io.reactivex.Observable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.internal.disposables.*; public final class ObservableBuffer> extends Observable { - final ObservableConsumable source; + final ObservableSource source; final int count; final int skip; final Callable bufferSupplier; - public ObservableBuffer(ObservableConsumable source, int count, int skip, Callable bufferSupplier) { + public ObservableBuffer(ObservableSource source, int count, int skip, Callable bufferSupplier) { this.source = source; this.count = count; this.skip = skip; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundary.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundary.java index 695cd050e9..11734ca172 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundary.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundary.java @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicInteger; import io.reactivex.Observable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.*; import io.reactivex.functions.Function; @@ -32,13 +32,13 @@ public final class ObservableBufferBoundary, Open, Close> extends Observable { - final ObservableConsumable source; + final ObservableSource source; final Callable bufferSupplier; - final ObservableConsumable bufferOpen; - final Function> bufferClose; + final ObservableSource bufferOpen; + final Function> bufferClose; - public ObservableBufferBoundary(ObservableConsumable source, ObservableConsumable bufferOpen, - Function> bufferClose, Callable bufferSupplier) { + public ObservableBufferBoundary(ObservableSource source, ObservableSource bufferOpen, + Function> bufferClose, Callable bufferSupplier) { this.source = source; this.bufferOpen = bufferOpen; this.bufferClose = bufferClose; @@ -55,8 +55,8 @@ protected void subscribeActual(Observer t) { static final class BufferBoundarySubscriber, Open, Close> extends QueueDrainObserver implements Disposable { - final ObservableConsumable bufferOpen; - final Function> bufferClose; + final ObservableSource bufferOpen; + final Function> bufferClose; final Callable bufferSupplier; final CompositeDisposable resources; @@ -67,8 +67,8 @@ static final class BufferBoundarySubscriber, final AtomicInteger windows = new AtomicInteger(); public BufferBoundarySubscriber(Observer actual, - ObservableConsumable bufferOpen, - Function> bufferClose, + ObservableSource bufferOpen, + Function> bufferClose, Callable bufferSupplier) { super(actual, new MpscLinkedQueue()); this.bufferOpen = bufferOpen; @@ -171,7 +171,7 @@ void open(Open window) { return; } - ObservableConsumable p; + ObservableSource p; try { p = bufferClose.apply(window); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundarySupplier.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundarySupplier.java index 4f7c1d9222..ba26c47322 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundarySupplier.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundarySupplier.java @@ -28,11 +28,11 @@ public final class ObservableBufferBoundarySupplier, B> extends Observable { - final ObservableConsumable source; - final Callable> boundarySupplier; + final ObservableSource source; + final Callable> boundarySupplier; final Callable bufferSupplier; - public ObservableBufferBoundarySupplier(ObservableConsumable source, Callable> boundarySupplier, Callable bufferSupplier) { + public ObservableBufferBoundarySupplier(ObservableSource source, Callable> boundarySupplier, Callable bufferSupplier) { this.source = source; this.boundarySupplier = boundarySupplier; this.bufferSupplier = bufferSupplier; @@ -47,7 +47,7 @@ static final class BufferBondarySupplierSubscriber implements Observer, Disposable { /** */ final Callable bufferSupplier; - final Callable> boundarySupplier; + final Callable> boundarySupplier; Disposable s; @@ -56,7 +56,7 @@ static final class BufferBondarySupplierSubscriber actual, Callable bufferSupplier, - Callable> boundarySupplier) { + Callable> boundarySupplier) { super(actual, new MpscLinkedQueue()); this.bufferSupplier = bufferSupplier; this.boundarySupplier = boundarySupplier; @@ -88,7 +88,7 @@ public void onSubscribe(Disposable s) { } buffer = b; - ObservableConsumable boundary; + ObservableSource boundary; try { boundary = boundarySupplier.call(); @@ -191,7 +191,7 @@ void next() { return; } - ObservableConsumable boundary; + ObservableSource boundary; try { boundary = boundarySupplier.call(); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferExactBoundary.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferExactBoundary.java index 87ea9b50a9..138e9cff35 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferExactBoundary.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferExactBoundary.java @@ -26,11 +26,11 @@ public final class ObservableBufferExactBoundary, B> extends Observable { - final ObservableConsumable source; - final ObservableConsumable boundary; + final ObservableSource source; + final ObservableSource boundary; final Callable bufferSupplier; - public ObservableBufferExactBoundary(ObservableConsumable source, ObservableConsumable boundary, Callable bufferSupplier) { + public ObservableBufferExactBoundary(ObservableSource source, ObservableSource boundary, Callable bufferSupplier) { this.source = source; this.boundary = boundary; this.bufferSupplier = bufferSupplier; @@ -45,7 +45,7 @@ static final class BufferExactBondarySubscriber implements Observer, Disposable { /** */ final Callable bufferSupplier; - final ObservableConsumable boundary; + final ObservableSource boundary; Disposable s; @@ -54,7 +54,7 @@ static final class BufferExactBondarySubscriber actual, Callable bufferSupplier, - ObservableConsumable boundary) { + ObservableSource boundary) { super(actual, new MpscLinkedQueue()); this.bufferSupplier = bufferSupplier; this.boundary = boundary; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferTimed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferTimed.java index fc60e189e3..b430a06ffb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferTimed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferTimed.java @@ -31,7 +31,7 @@ public final class ObservableBufferTimed> extends Observable { - final ObservableConsumable source; + final ObservableSource source; final long timespan; final long timeskip; final TimeUnit unit; @@ -40,8 +40,8 @@ public final class ObservableBufferTimed> final int maxSize; final boolean restartTimerOnMaxSize; - public ObservableBufferTimed(ObservableConsumable source, long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, Callable bufferSupplier, int maxSize, - boolean restartTimerOnMaxSize) { + public ObservableBufferTimed(ObservableSource source, long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, Callable bufferSupplier, int maxSize, + boolean restartTimerOnMaxSize) { this.source = source; this.timespan = timespan; this.timeskip = timeskip; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCollect.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableCollect.java index 4f4504ed97..392f02a647 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCollect.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableCollect.java @@ -23,7 +23,7 @@ public final class ObservableCollect extends ObservableWithUpstream final Callable initialSupplier; final BiConsumer collector; - public ObservableCollect(ObservableConsumable source, + public ObservableCollect(ObservableSource source, Callable initialSupplier, BiConsumer collector) { super(source); this.initialSupplier = initialSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCombineLatest.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableCombineLatest.java index 12ac6a6f8e..ea320fc51c 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCombineLatest.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableCombineLatest.java @@ -25,14 +25,14 @@ import io.reactivex.plugins.RxJavaPlugins; public final class ObservableCombineLatest extends Observable { - final ObservableConsumable[] sources; - final Iterable> sourcesIterable; + final ObservableSource[] sources; + final Iterable> sourcesIterable; final Function combiner; final int bufferSize; final boolean delayError; - public ObservableCombineLatest(ObservableConsumable[] sources, - Iterable> sourcesIterable, + public ObservableCombineLatest(ObservableSource[] sources, + Iterable> sourcesIterable, Function combiner, int bufferSize, boolean delayError) { this.sources = sources; @@ -46,11 +46,11 @@ public ObservableCombineLatest(ObservableConsumable[] sources, @Override @SuppressWarnings("unchecked") public void subscribeActual(Observer s) { - ObservableConsumable[] sources = this.sources; + ObservableSource[] sources = this.sources; int count = 0; if (sources == null) { sources = new Observable[8]; - for (ObservableConsumable p : sourcesIterable) { + for (ObservableSource p : sourcesIterable) { if (count == sources.length) { Observable[] b = new Observable[count + (count >> 2)]; System.arraycopy(sources, 0, b, 0, count); @@ -106,7 +106,7 @@ public LatestCoordinator(Observer actual, this.queue = new SpscLinkedArrayQueue(bufferSize); } - public void subscribe(ObservableConsumable[] sources) { + public void subscribe(ObservableSource[] sources) { Observer[] as = subscribers; int len = as.length; for (int i = 0; i < len; i++) { @@ -371,4 +371,4 @@ public boolean isDisposed() { return s.get() == DisposableHelper.DISPOSED; } } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMap.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMap.java index 5216c68519..2f8ff9a712 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMap.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMap.java @@ -26,9 +26,9 @@ import io.reactivex.plugins.RxJavaPlugins; public final class ObservableConcatMap extends ObservableWithUpstream { - final Function> mapper; + final Function> mapper; final int bufferSize; - public ObservableConcatMap(ObservableConsumable source, Function> mapper, int bufferSize) { + public ObservableConcatMap(ObservableSource source, Function> mapper, int bufferSize) { super(source); this.mapper = mapper; this.bufferSize = Math.max(8, bufferSize); @@ -44,7 +44,7 @@ static final class SourceSubscriber extends AtomicInteger implements Obser private static final long serialVersionUID = 8828587559905699186L; final Observer actual; final SerialDisposable sa; - final Function> mapper; + final Function> mapper; final Observer inner; final int bufferSize; @@ -61,7 +61,7 @@ static final class SourceSubscriber extends AtomicInteger implements Obser int fusionMode; public SourceSubscriber(Observer actual, - Function> mapper, int bufferSize) { + Function> mapper, int bufferSize) { this.actual = actual; this.mapper = mapper; this.bufferSize = bufferSize; @@ -193,7 +193,7 @@ void drain() { } if (!empty) { - ObservableConsumable o; + ObservableSource o; try { o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableConsumable"); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCount.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableCount.java index fa9d7b35ac..d7c3c03965 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCount.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableCount.java @@ -18,7 +18,7 @@ import io.reactivex.internal.disposables.DisposableHelper; public final class ObservableCount extends ObservableWithUpstream { - public ObservableCount(ObservableConsumable source) { + public ObservableCount(ObservableSource source) { super(source); } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounce.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounce.java index a4786d2381..dcff857ab6 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounce.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounce.java @@ -24,9 +24,9 @@ import io.reactivex.plugins.RxJavaPlugins; public final class ObservableDebounce extends ObservableWithUpstream { - final Function> debounceSelector; + final Function> debounceSelector; - public ObservableDebounce(ObservableConsumable source, Function> debounceSelector) { + public ObservableDebounce(ObservableSource source, Function> debounceSelector) { super(source); this.debounceSelector = debounceSelector; } @@ -39,7 +39,7 @@ public void subscribeActual(Observer t) { static final class DebounceSubscriber implements Observer, Disposable { final Observer actual; - final Function> debounceSelector; + final Function> debounceSelector; volatile boolean gate; @@ -52,7 +52,7 @@ static final class DebounceSubscriber boolean done; public DebounceSubscriber(Observer actual, - Function> debounceSelector) { + Function> debounceSelector) { this.actual = actual; this.debounceSelector = debounceSelector; } @@ -79,7 +79,7 @@ public void onNext(T t) { d.dispose(); } - ObservableConsumable p; + ObservableSource p; try { p = debounceSelector.apply(t); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounceTimed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounceTimed.java index 5c40427dd2..8869abe6ed 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounceTimed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounceTimed.java @@ -28,7 +28,7 @@ public final class ObservableDebounceTimed extends ObservableWithUpstream source, long timeout, TimeUnit unit, Scheduler scheduler) { + public ObservableDebounceTimed(ObservableSource source, long timeout, TimeUnit unit, Scheduler scheduler) { super(source); this.timeout = timeout; this.unit = unit; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDefer.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDefer.java index 554be4d8f6..6a5081d7b5 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDefer.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDefer.java @@ -19,13 +19,13 @@ import io.reactivex.internal.disposables.EmptyDisposable; public final class ObservableDefer extends Observable { - final Callable> supplier; - public ObservableDefer(Callable> supplier) { + final Callable> supplier; + public ObservableDefer(Callable> supplier) { this.supplier = supplier; } @Override public void subscribeActual(Observer s) { - ObservableConsumable pub; + ObservableSource pub; try { pub = supplier.call(); } catch (Throwable t) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDelay.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDelay.java index 30f5295a38..87c890f022 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDelay.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDelay.java @@ -27,7 +27,7 @@ public final class ObservableDelay extends ObservableWithUpstream { final Scheduler scheduler; final boolean delayError; - public ObservableDelay(ObservableConsumable source, long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) { + public ObservableDelay(ObservableSource source, long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) { super(source); this.delay = delay; this.unit = unit; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOther.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOther.java index 51094874a0..1d5cd9d091 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOther.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOther.java @@ -24,10 +24,10 @@ * @param the other value type, ignored */ public final class ObservableDelaySubscriptionOther extends Observable { - final ObservableConsumable main; - final ObservableConsumable other; + final ObservableSource main; + final ObservableSource other; - public ObservableDelaySubscriptionOther(ObservableConsumable main, ObservableConsumable other) { + public ObservableDelaySubscriptionOther(ObservableSource main, ObservableSource other) { this.main = main; this.other = other; } @@ -92,4 +92,4 @@ public void onComplete() { other.subscribe(otherSubscriber); } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDematerialize.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDematerialize.java index d942f51c1d..149d230aba 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDematerialize.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDematerialize.java @@ -20,7 +20,7 @@ public final class ObservableDematerialize extends ObservableWithUpstream>, T> { - public ObservableDematerialize(ObservableConsumable>> source) { + public ObservableDematerialize(ObservableSource>> source) { super(source); } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java index 7037c26725..1709de13c5 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java @@ -27,13 +27,13 @@ public final class ObservableDistinct extends ObservableWithUpstream final Function keySelector; final Callable> predicateSupplier; - public ObservableDistinct(ObservableConsumable source, Function keySelector, Callable> predicateSupplier) { + public ObservableDistinct(ObservableSource source, Function keySelector, Callable> predicateSupplier) { super(source); this.predicateSupplier = predicateSupplier; this.keySelector = keySelector; } - public static ObservableDistinct withCollection(ObservableConsumable source, final Function keySelector, final Callable> collectionSupplier) { + public static ObservableDistinct withCollection(ObservableSource source, final Function keySelector, final Callable> collectionSupplier) { Callable> p = new Callable>() { @Override public Predicate call() throws Exception { @@ -55,7 +55,7 @@ public boolean test(K t) { return new ObservableDistinct(source, keySelector, p); } - public static ObservableDistinct untilChanged(ObservableConsumable source) { + public static ObservableDistinct untilChanged(ObservableSource source) { Callable> p = new Callable>() { @Override public Predicate call() { @@ -78,7 +78,7 @@ public boolean test(T t) { return new ObservableDistinct(source, Functions.identity(), p); } - public static ObservableDistinct untilChanged(ObservableConsumable source, Function keySelector) { + public static ObservableDistinct untilChanged(ObservableSource source, Function keySelector) { Callable> p = new Callable>() { @Override public Predicate call() { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnEach.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnEach.java index 2d68538deb..57fcf120d9 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnEach.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnEach.java @@ -26,10 +26,10 @@ public final class ObservableDoOnEach extends ObservableWithUpstream { final Runnable onComplete; final Runnable onAfterTerminate; - public ObservableDoOnEach(ObservableConsumable source, Consumer onNext, - Consumer onError, - Runnable onComplete, - Runnable onAfterTerminate) { + public ObservableDoOnEach(ObservableSource source, Consumer onNext, + Consumer onError, + Runnable onComplete, + Runnable onAfterTerminate) { super(source); this.onNext = onNext; this.onError = onError; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAt.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAt.java index fa34c4cce5..d3434001f7 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAt.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAt.java @@ -20,7 +20,7 @@ public final class ObservableElementAt extends ObservableWithUpstream { final long index; final T defaultValue; - public ObservableElementAt(ObservableConsumable source, long index, T defaultValue) { + public ObservableElementAt(ObservableSource source, long index, T defaultValue) { super(source); this.index = index; this.defaultValue = defaultValue; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java index 167eeab17f..aa6cd1893f 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java @@ -20,7 +20,7 @@ public final class ObservableFilter extends ObservableWithUpstream { final Predicate predicate; - public ObservableFilter(ObservableConsumable source, Predicate predicate) { + public ObservableFilter(ObservableSource source, Predicate predicate) { super(source); this.predicate = predicate; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMap.java index 757ebafd2e..777cc82104 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMap.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMap.java @@ -16,7 +16,7 @@ import java.util.*; import java.util.concurrent.atomic.*; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.exceptions.*; @@ -26,13 +26,13 @@ import io.reactivex.internal.queue.*; public final class ObservableFlatMap extends ObservableWithUpstream { - final Function> mapper; + final Function> mapper; final boolean delayErrors; final int maxConcurrency; final int bufferSize; - public ObservableFlatMap(ObservableConsumable source, - Function> mapper, + public ObservableFlatMap(ObservableSource source, + Function> mapper, boolean delayErrors, int maxConcurrency, int bufferSize) { super(source); this.mapper = mapper; @@ -51,7 +51,7 @@ static final class MergeSubscriber extends AtomicInteger implements Dispos private static final long serialVersionUID = -2117620485640801370L; final Observer actual; - final Function> mapper; + final Function> mapper; final boolean delayErrors; final int maxConcurrency; final int bufferSize; @@ -78,11 +78,11 @@ static final class MergeSubscriber extends AtomicInteger implements Dispos long lastId; int lastIndex; - Queue> sources; + Queue> sources; int wip; - public MergeSubscriber(Observer actual, Function> mapper, + public MergeSubscriber(Observer actual, Function> mapper, boolean delayErrors, int maxConcurrency, int bufferSize) { this.actual = actual; this.mapper = mapper; @@ -90,7 +90,7 @@ public MergeSubscriber(Observer actual, Function>(maxConcurrency); + sources = new ArrayDeque>(maxConcurrency); } this.subscribers = new AtomicReference[]>(EMPTY); } @@ -109,7 +109,7 @@ public void onNext(T t) { if (done) { return; } - ObservableConsumable p; + ObservableSource p; try { p = mapper.apply(t); } catch (Throwable e) { @@ -134,7 +134,7 @@ public void onNext(T t) { } } - void subscribeInner(ObservableConsumable p) { + void subscribeInner(ObservableSource p) { InnerSubscriber inner = new InnerSubscriber(this, uniqueId++); addInner(inner); p.subscribe(inner); @@ -425,7 +425,7 @@ void drainLoop() { if (innerCompleted) { if (maxConcurrency != Integer.MAX_VALUE) { - ObservableConsumable p; + ObservableSource p; synchronized (this) { p = sources.poll(); if (p == null) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupBy.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupBy.java index 595bb37423..b0e2724497 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupBy.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupBy.java @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.*; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Function; @@ -31,7 +31,7 @@ public final class ObservableGroupBy extends ObservableWithUpstream source, + public ObservableGroupBy(ObservableSource source, Function keySelector, Function valueSelector, int bufferSize, boolean delayError) { super(source); @@ -208,7 +208,7 @@ public void onComplete() { } } - static final class State extends AtomicInteger implements Disposable, ObservableConsumable { + static final class State extends AtomicInteger implements Disposable, ObservableSource { /** */ private static final long serialVersionUID = -3852313036005250360L; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupJoin.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupJoin.java index abb5665a95..08459bf49c 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupJoin.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupJoin.java @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.*; import io.reactivex.Observable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.*; import io.reactivex.exceptions.Exceptions; @@ -36,19 +36,19 @@ public class ObservableGroupJoin extends ObservableWithUpstream { - final ObservableConsumable other; + final ObservableSource other; - final Function> leftEnd; + final Function> leftEnd; - final Function> rightEnd; + final Function> rightEnd; final BiFunction, ? extends R> resultSelector; public ObservableGroupJoin( - ObservableConsumable source, - ObservableConsumable other, - Function> leftEnd, - Function> rightEnd, + ObservableSource source, + ObservableSource other, + Function> leftEnd, + Function> rightEnd, BiFunction, ? extends R> resultSelector) { super(source); this.other = other; @@ -105,9 +105,9 @@ static final class GroupJoinSubscription final AtomicReference error; - final Function> leftEnd; + final Function> leftEnd; - final Function> rightEnd; + final Function> rightEnd; final BiFunction, ? extends R> resultSelector; @@ -129,8 +129,8 @@ static final class GroupJoinSubscription public GroupJoinSubscription( Observer actual, - Function> leftEnd, - Function> rightEnd, + Function> leftEnd, + Function> rightEnd, BiFunction, ? extends R> resultSelector) { this.actual = actual; this.disposables = new CompositeDisposable(); @@ -243,7 +243,7 @@ void drain() { int idx = leftIndex++; lefts.put(idx, up); - ObservableConsumable p; + ObservableSource p; try { p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher"); @@ -288,7 +288,7 @@ else if (mode == RIGHT_VALUE) { rights.put(idx, right); - ObservableConsumable p; + ObservableSource p; try { p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher"); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElements.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElements.java index af55ada563..0032b7fe33 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElements.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElements.java @@ -18,7 +18,7 @@ public final class ObservableIgnoreElements extends ObservableWithUpstream { - public ObservableIgnoreElements(ObservableConsumable source) { + public ObservableIgnoreElements(ObservableSource source) { super(source); } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableJoin.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableJoin.java index 3bac4ebc7c..2326dd9685 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableJoin.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableJoin.java @@ -21,7 +21,7 @@ import java.util.*; import java.util.concurrent.atomic.*; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.*; import io.reactivex.exceptions.Exceptions; @@ -34,19 +34,19 @@ public class ObservableJoin extends ObservableWithUpstream { - final ObservableConsumable other; + final ObservableSource other; - final Function> leftEnd; + final Function> leftEnd; - final Function> rightEnd; + final Function> rightEnd; final BiFunction resultSelector; public ObservableJoin( - ObservableConsumable source, - ObservableConsumable other, - Function> leftEnd, - Function> rightEnd, + ObservableSource source, + ObservableSource other, + Function> leftEnd, + Function> rightEnd, BiFunction resultSelector) { super(source); this.other = other; @@ -91,9 +91,9 @@ static final class GroupJoinSubscription final AtomicReference error; - final Function> leftEnd; + final Function> leftEnd; - final Function> rightEnd; + final Function> rightEnd; final BiFunction resultSelector; @@ -114,8 +114,8 @@ static final class GroupJoinSubscription static final Integer RIGHT_CLOSE = 4; public GroupJoinSubscription(Observer actual, - Function> leftEnd, - Function> rightEnd, + Function> leftEnd, + Function> rightEnd, BiFunction resultSelector) { this.actual = actual; this.disposables = new CompositeDisposable(); @@ -220,7 +220,7 @@ void drain() { int idx = leftIndex++; lefts.put(idx, left); - ObservableConsumable p; + ObservableSource p; try { p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher"); @@ -264,7 +264,7 @@ else if (mode == RIGHT_VALUE) { rights.put(idx, right); - ObservableConsumable p; + ObservableSource p; try { p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher"); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableJust.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableJust.java index 54b872103d..d4bf08fcea 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableJust.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableJust.java @@ -38,11 +38,11 @@ public T value() { return value; } - public Observable scalarFlatMap(final Function> mapper) { + public Observable scalarFlatMap(final Function> mapper) { return new Observable() { @Override public void subscribeActual(Observer s) { - ObservableConsumable other; + ObservableSource other; try { other = mapper.apply(value); } catch (Throwable e) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableLift.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableLift.java index ba1d9a7708..9a95752508 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableLift.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableLift.java @@ -27,11 +27,11 @@ */ public final class ObservableLift extends Observable { /** The actual operator. */ - final Operator operator; + final ObservableOperator operator; /** The source publisher. */ - final ObservableConsumable source; + final ObservableSource source; - public ObservableLift(ObservableConsumable source, Operator operator) { + public ObservableLift(ObservableSource source, ObservableOperator operator) { this.source = source; this.operator = operator; } @@ -40,7 +40,7 @@ public ObservableLift(ObservableConsumable source, Operator operator() { + public ObservableOperator operator() { return operator; } @@ -48,7 +48,7 @@ public ObservableLift(ObservableConsumable source, Operator source() { + public ObservableSource source() { return source; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMap.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableMap.java index fc73e1cb76..768876241b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMap.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableMap.java @@ -23,7 +23,7 @@ public final class ObservableMap extends ObservableWithUpstream { final Function function; - public ObservableMap(ObservableConsumable source, Function function) { + public ObservableMap(ObservableSource source, Function function) { super(source); this.function = function; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMapNotification.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableMapNotification.java index 0c4c72069f..4c11419876 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMapNotification.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableMapNotification.java @@ -20,17 +20,17 @@ import io.reactivex.functions.Function; import io.reactivex.internal.disposables.DisposableHelper; -public final class ObservableMapNotification extends ObservableWithUpstream> { +public final class ObservableMapNotification extends ObservableWithUpstream> { - final Function> onNextMapper; - final Function> onErrorMapper; - final Callable> onCompleteSupplier; + final Function> onNextMapper; + final Function> onErrorMapper; + final Callable> onCompleteSupplier; public ObservableMapNotification( - ObservableConsumable source, - Function> onNextMapper, - Function> onErrorMapper, - Callable> onCompleteSupplier) { + ObservableSource source, + Function> onNextMapper, + Function> onErrorMapper, + Callable> onCompleteSupplier) { super(source); this.onNextMapper = onNextMapper; this.onErrorMapper = onErrorMapper; @@ -38,16 +38,16 @@ public ObservableMapNotification( } @Override - public void subscribeActual(Observer> t) { + public void subscribeActual(Observer> t) { source.subscribe(new MapNotificationSubscriber(t, onNextMapper, onErrorMapper, onCompleteSupplier)); } static final class MapNotificationSubscriber implements Observer, Disposable { - final Observer> actual; - final Function> onNextMapper; - final Function> onErrorMapper; - final Callable> onCompleteSupplier; + final Observer> actual; + final Function> onNextMapper; + final Function> onErrorMapper; + final Callable> onCompleteSupplier; Disposable s; @@ -55,10 +55,10 @@ static final class MapNotificationSubscriber volatile boolean done; - public MapNotificationSubscriber(Observer> actual, - Function> onNextMapper, - Function> onErrorMapper, - Callable> onCompleteSupplier) { + public MapNotificationSubscriber(Observer> actual, + Function> onNextMapper, + Function> onErrorMapper, + Callable> onCompleteSupplier) { this.actual = actual; this.onNextMapper = onNextMapper; this.onErrorMapper = onErrorMapper; @@ -87,7 +87,7 @@ public boolean isDisposed() { @Override public void onNext(T t) { - ObservableConsumable p; + ObservableSource p; try { p = onNextMapper.apply(t); @@ -106,7 +106,7 @@ public void onNext(T t) { @Override public void onError(Throwable t) { - ObservableConsumable p; + ObservableSource p; try { p = onErrorMapper.apply(t); @@ -126,7 +126,7 @@ public void onError(Throwable t) { @Override public void onComplete() { - ObservableConsumable p; + ObservableSource p; try { p = onCompleteSupplier.call(); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMaterialize.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableMaterialize.java index e207070687..112c74bbd9 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMaterialize.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableMaterialize.java @@ -20,7 +20,7 @@ public final class ObservableMaterialize extends ObservableWithUpstream>> { - public ObservableMaterialize(ObservableConsumable source) { + public ObservableMaterialize(ObservableSource source) { super(source); } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableObserveOn.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableObserveOn.java index 50b6cb9ffd..4caae2a849 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableObserveOn.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableObserveOn.java @@ -27,7 +27,7 @@ public final class ObservableObserveOn extends ObservableWithUpstream { final Scheduler scheduler; final boolean delayError; final int bufferSize; - public ObservableObserveOn(ObservableConsumable source, Scheduler scheduler, boolean delayError, int bufferSize) { + public ObservableObserveOn(ObservableSource source, Scheduler scheduler, boolean delayError, int bufferSize) { super(source); this.scheduler = scheduler; this.delayError = delayError; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java index 2144e643a3..4db8707a3d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java @@ -20,11 +20,11 @@ import io.reactivex.plugins.RxJavaPlugins; public final class ObservableOnErrorNext extends ObservableWithUpstream { - final Function> nextSupplier; + final Function> nextSupplier; final boolean allowFatal; - public ObservableOnErrorNext(ObservableConsumable source, - Function> nextSupplier, boolean allowFatal) { + public ObservableOnErrorNext(ObservableSource source, + Function> nextSupplier, boolean allowFatal) { super(source); this.nextSupplier = nextSupplier; this.allowFatal = allowFatal; @@ -39,7 +39,7 @@ public void subscribeActual(Observer t) { static final class OnErrorNextSubscriber implements Observer { final Observer actual; - final Function> nextSupplier; + final Function> nextSupplier; final boolean allowFatal; final SerialDisposable arbiter; @@ -47,7 +47,7 @@ static final class OnErrorNextSubscriber implements Observer { boolean done; - public OnErrorNextSubscriber(Observer actual, Function> nextSupplier, boolean allowFatal) { + public OnErrorNextSubscriber(Observer actual, Function> nextSupplier, boolean allowFatal) { this.actual = actual; this.nextSupplier = nextSupplier; this.allowFatal = allowFatal; @@ -84,7 +84,7 @@ public void onError(Throwable t) { return; } - ObservableConsumable p; + ObservableSource p; try { p = nextSupplier.apply(t); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java index e0765a8030..c7a49a1463 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java @@ -21,7 +21,7 @@ public final class ObservableOnErrorReturn extends ObservableWithUpstream { final Function valueSupplier; - public ObservableOnErrorReturn(ObservableConsumable source, Function valueSupplier) { + public ObservableOnErrorReturn(ObservableSource source, Function valueSupplier) { super(source); this.valueSupplier = valueSupplier; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservablePublish.java b/src/main/java/io/reactivex/internal/operators/observable/ObservablePublish.java index c42beaa83c..a5c7cdb9a3 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservablePublish.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservablePublish.java @@ -31,14 +31,14 @@ */ public final class ObservablePublish extends ConnectableObservable { /** The source observable. */ - final ObservableConsumable source; + final ObservableSource source; /** Holds the current subscriber that is, will be or just was subscribed to the source observable. */ final AtomicReference> current; /** The size of the prefetch buffer. */ final int bufferSize; - final ObservableConsumable onSubscribe; + final ObservableSource onSubscribe; /** * Creates a OperatorPublish instance to publish values of the given source observable. @@ -47,10 +47,10 @@ public final class ObservablePublish extends ConnectableObservable { * @param bufferSize the size of the prefetch buffer * @return the connectable observable */ - public static ConnectableObservable create(ObservableConsumable source, final int bufferSize) { + public static ConnectableObservable create(ObservableSource source, final int bufferSize) { // the current connection to source needs to be shared between the operator and its onSubscribe call final AtomicReference> curr = new AtomicReference>(); - ObservableConsumable onSubscribe = new ObservableConsumable() { + ObservableSource onSubscribe = new ObservableSource() { @Override public void subscribe(Observer child) { // concurrent connection/disconnection may change the state, @@ -117,8 +117,8 @@ public void subscribe(Observer child) { return new ObservablePublish(onSubscribe, source, curr, bufferSize); } - public static Observable create(final ObservableConsumable source, - final Function, ? extends ObservableConsumable> selector, final int bufferSize) { + public static Observable create(final ObservableSource source, + final Function, ? extends ObservableSource> selector, final int bufferSize) { return new Observable() { @Override protected void subscribeActual(Observer o) { @@ -126,7 +126,7 @@ protected void subscribeActual(Observer o) { final ObserverResourceWrapper srw = new ObserverResourceWrapper(o); - ObservableConsumable target; + ObservableSource target; try { target = selector.apply(op); @@ -148,8 +148,8 @@ public void accept(Disposable r) { }; } - private ObservablePublish(ObservableConsumable onSubscribe, ObservableConsumable source, - final AtomicReference> current, int bufferSize) { + private ObservablePublish(ObservableSource onSubscribe, ObservableSource source, + final AtomicReference> current, int bufferSize) { this.onSubscribe = onSubscribe; this.source = source; this.current = current; @@ -661,4 +661,4 @@ public void dispose() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRedo.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableRedo.java index 0b78f1fb18..a51f8279fc 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRedo.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableRedo.java @@ -23,11 +23,11 @@ import io.reactivex.subjects.BehaviorSubject; public final class ObservableRedo extends Observable { - final ObservableConsumable source; - final Function>>, ? extends ObservableConsumable> manager; + final ObservableSource source; + final Function>>, ? extends ObservableSource> manager; - public ObservableRedo(ObservableConsumable source, - Function>>, ? extends ObservableConsumable> manager) { + public ObservableRedo(ObservableSource source, + Function>>, ? extends ObservableSource> manager) { this.source = source; this.manager = manager; } @@ -42,7 +42,7 @@ public void subscribeActual(Observer s) { s.onSubscribe(parent.arbiter); - ObservableConsumable action; + ObservableSource action; try { action = manager.apply(subject); @@ -68,12 +68,12 @@ static final class RedoSubscriber extends AtomicBoolean implements Observer actual; final BehaviorSubject>> subject; - final ObservableConsumable source; + final ObservableSource source; final SerialDisposable arbiter; final AtomicInteger wip = new AtomicInteger(); - public RedoSubscriber(Observer actual, BehaviorSubject>> subject, ObservableConsumable source) { + public RedoSubscriber(Observer actual, BehaviorSubject>> subject, ObservableSource source) { this.actual = actual; this.subject = subject; this.source = source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableReplay.java index f22dc99126..4bfbad83d0 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableReplay.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableReplay.java @@ -36,7 +36,7 @@ public final class ObservableReplay extends ConnectableObservable { /** A factory that creates the appropriate buffer for the ReplaySubscriber. */ final Callable> bufferFactory; - final ObservableConsumable onSubscribe; + final ObservableSource onSubscribe; @SuppressWarnings("rawtypes") static final Callable DEFAULT_UNBOUNDED_FACTORY = new Callable() { @@ -57,12 +57,12 @@ public Object call() { */ public static Observable multicastSelector( final Callable> connectableFactory, - final Function, ? extends ObservableConsumable> selector) { + final Function, ? extends ObservableSource> selector) { return new Observable() { @Override protected void subscribeActual(Observer child) { ConnectableObservable co; - ObservableConsumable observable; + ObservableSource observable; try { co = connectableFactory.call(); observable = selector.apply(co); @@ -183,7 +183,7 @@ static ConnectableObservable create(Observable source, final Callable> bufferFactory) { // the current connection to source needs to be shared between the operator and its onSubscribe call final AtomicReference> curr = new AtomicReference>(); - ObservableConsumable onSubscribe = new ObservableConsumable() { + ObservableSource onSubscribe = new ObservableSource() { @Override public void subscribe(Observer child) { // concurrent connection/disconnection may change the state, @@ -236,9 +236,9 @@ public void subscribe(Observer child) { return new ObservableReplay(onSubscribe, source, curr, bufferFactory); } - private ObservableReplay(ObservableConsumable onSubscribe, Observable source, - final AtomicReference> current, - final Callable> bufferFactory) { + private ObservableReplay(ObservableSource onSubscribe, Observable source, + final AtomicReference> current, + final Callable> bufferFactory) { this.onSubscribe = onSubscribe; this.source = source; this.current = current; @@ -994,4 +994,4 @@ void truncateFinal() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleTimed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleTimed.java index fcc3bff040..49c51ca7fb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleTimed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleTimed.java @@ -26,7 +26,7 @@ public final class ObservableSampleTimed extends ObservableWithUpstream final TimeUnit unit; final Scheduler scheduler; - public ObservableSampleTimed(ObservableConsumable source, long period, TimeUnit unit, Scheduler scheduler) { + public ObservableSampleTimed(ObservableSource source, long period, TimeUnit unit, Scheduler scheduler) { super(source); this.period = period; this.unit = unit; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java index 399dcaebd3..df33212841 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java @@ -21,9 +21,9 @@ import io.reactivex.observers.SerializedObserver; public final class ObservableSampleWithObservable extends ObservableWithUpstream { - final ObservableConsumable other; + final ObservableSource other; - public ObservableSampleWithObservable(ObservableConsumable source, ObservableConsumable other) { + public ObservableSampleWithObservable(ObservableSource source, ObservableSource other) { super(source); this.other = other; } @@ -40,13 +40,13 @@ static final class SamplePublisherSubscriber extends AtomicReference private static final long serialVersionUID = -3517602651313910099L; final Observer actual; - final ObservableConsumable sampler; + final ObservableSource sampler; final AtomicReference other = new AtomicReference(); Disposable s; - public SamplePublisherSubscriber(Observer actual, ObservableConsumable other) { + public SamplePublisherSubscriber(Observer actual, ObservableSource other) { this.actual = actual; this.sampler = other; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java index bf0b5b762c..d29c0eb032 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java @@ -20,7 +20,7 @@ public final class ObservableScan extends ObservableWithUpstream { final BiFunction accumulator; - public ObservableScan(ObservableConsumable source, BiFunction accumulator) { + public ObservableScan(ObservableSource source, BiFunction accumulator) { super(source); this.accumulator = accumulator; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableScanSeed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableScanSeed.java index c5619dee5b..c6e0c3a627 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableScanSeed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableScanSeed.java @@ -24,7 +24,7 @@ public final class ObservableScanSeed extends ObservableWithUpstream final BiFunction accumulator; final Callable seedSupplier; - public ObservableScanSeed(ObservableConsumable source, Callable seedSupplier, BiFunction accumulator) { + public ObservableScanSeed(ObservableSource source, Callable seedSupplier, BiFunction accumulator) { super(source); this.accumulator = accumulator; this.seedSupplier = seedSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqual.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqual.java index 5e2f8a4c1e..c314796b0b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqual.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqual.java @@ -22,13 +22,13 @@ import io.reactivex.internal.queue.SpscLinkedArrayQueue; public final class ObservableSequenceEqual extends Observable { - final ObservableConsumable first; - final ObservableConsumable second; + final ObservableSource first; + final ObservableSource second; final BiPredicate comparer; final int bufferSize; - public ObservableSequenceEqual(ObservableConsumable first, ObservableConsumable second, - BiPredicate comparer, int bufferSize) { + public ObservableSequenceEqual(ObservableSource first, ObservableSource second, + BiPredicate comparer, int bufferSize) { this.first = first; this.second = second; this.comparer = comparer; @@ -47,8 +47,8 @@ static final class EqualCoordinator extends AtomicInteger implements Disposab final Observer actual; final BiPredicate comparer; final ArrayCompositeDisposable resources; - final ObservableConsumable first; - final ObservableConsumable second; + final ObservableSource first; + final ObservableSource second; final EqualSubscriber[] subscribers; volatile boolean cancelled; @@ -58,8 +58,8 @@ static final class EqualCoordinator extends AtomicInteger implements Disposab T v2; public EqualCoordinator(Observer actual, int bufferSize, - ObservableConsumable first, ObservableConsumable second, - BiPredicate comparer) { + ObservableSource first, ObservableSource second, + BiPredicate comparer) { this.actual = actual; this.first = first; this.second = second; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSingle.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSingle.java index 053029d2a2..396211dda1 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSingle.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSingle.java @@ -23,7 +23,7 @@ public final class ObservableSingle extends ObservableWithUpstream { final T defaultValue; - public ObservableSingle(ObservableConsumable source, T defaultValue) { + public ObservableSingle(ObservableSource source, T defaultValue) { super(source); this.defaultValue = defaultValue; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkip.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkip.java index 501a87b412..d75b7a58f3 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkip.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkip.java @@ -18,7 +18,7 @@ public final class ObservableSkip extends ObservableWithUpstream { final long n; - public ObservableSkip(ObservableConsumable source, long n) { + public ObservableSkip(ObservableSource source, long n) { super(source); this.n = n; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLast.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLast.java index d1db1cd26a..ad5ad6acb2 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLast.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLast.java @@ -22,7 +22,7 @@ public final class ObservableSkipLast extends ObservableWithUpstream { final int skip; - public ObservableSkipLast(ObservableConsumable source, int skip) { + public ObservableSkipLast(ObservableSource source, int skip) { super(source); this.skip = skip; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimed.java index 8b78e1a127..c67fb7bb03 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimed.java @@ -28,7 +28,7 @@ public final class ObservableSkipLastTimed extends ObservableWithUpstream source, + public ObservableSkipLastTimed(ObservableSource source, long time, TimeUnit unit, Scheduler scheduler, int bufferSize, boolean delayError) { super(source); this.time = time; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipUntil.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipUntil.java index c3d571a509..9bfc7f6a77 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipUntil.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipUntil.java @@ -21,8 +21,8 @@ import io.reactivex.observers.SerializedObserver; public final class ObservableSkipUntil extends ObservableWithUpstream { - final ObservableConsumable other; - public ObservableSkipUntil(ObservableConsumable source, ObservableConsumable other) { + final ObservableSource other; + public ObservableSkipUntil(ObservableSource source, ObservableSource other) { super(source); this.other = other; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipWhile.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipWhile.java index 2310aa1d0e..22bd77ead8 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipWhile.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipWhile.java @@ -20,7 +20,7 @@ public final class ObservableSkipWhile extends ObservableWithUpstream { final Predicate predicate; - public ObservableSkipWhile(ObservableConsumable source, Predicate predicate) { + public ObservableSkipWhile(ObservableSource source, Predicate predicate) { super(source); this.predicate = predicate; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmpty.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmpty.java index ca576a53c8..b3bd2badd6 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmpty.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmpty.java @@ -17,8 +17,8 @@ import io.reactivex.disposables.*; public final class ObservableSwitchIfEmpty extends ObservableWithUpstream { - final ObservableConsumable other; - public ObservableSwitchIfEmpty(ObservableConsumable source, ObservableConsumable other) { + final ObservableSource other; + public ObservableSwitchIfEmpty(ObservableSource source, ObservableSource other) { super(source); this.other = other; } @@ -32,12 +32,12 @@ public void subscribeActual(Observer t) { static final class SwitchIfEmptySubscriber implements Observer { final Observer actual; - final ObservableConsumable other; + final ObservableSource other; final SerialDisposable arbiter; boolean empty; - public SwitchIfEmptySubscriber(Observer actual, ObservableConsumable other) { + public SwitchIfEmptySubscriber(Observer actual, ObservableSource other) { this.actual = actual; this.other = other; this.empty = true; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchMap.java index 6d05b13494..970b54e4dc 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchMap.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchMap.java @@ -25,11 +25,11 @@ import io.reactivex.plugins.RxJavaPlugins; public final class ObservableSwitchMap extends ObservableWithUpstream { - final Function> mapper; + final Function> mapper; final int bufferSize; - public ObservableSwitchMap(ObservableConsumable source, - Function> mapper, int bufferSize) { + public ObservableSwitchMap(ObservableSource source, + Function> mapper, int bufferSize) { super(source); this.mapper = mapper; this.bufferSize = bufferSize; @@ -44,7 +44,7 @@ static final class SwitchMapSubscriber extends AtomicInteger implements Ob /** */ private static final long serialVersionUID = -3491074160481096299L; final Observer actual; - final Function> mapper; + final Function> mapper; final int bufferSize; @@ -65,7 +65,7 @@ static final class SwitchMapSubscriber extends AtomicInteger implements Ob volatile long unique; - public SwitchMapSubscriber(Observer actual, Function> mapper, int bufferSize) { + public SwitchMapSubscriber(Observer actual, Function> mapper, int bufferSize) { this.actual = actual; this.mapper = mapper; this.bufferSize = bufferSize; @@ -89,7 +89,7 @@ public void onNext(T t) { inner.cancel(); } - ObservableConsumable p; + ObservableSource p; try { p = mapper.apply(t); } catch (Throwable e) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTake.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTake.java index d4eb69cb25..48a3f80f8d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTake.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTake.java @@ -19,7 +19,7 @@ public final class ObservableTake extends ObservableWithUpstream { final long limit; - public ObservableTake(ObservableConsumable source, long limit) { + public ObservableTake(ObservableSource source, long limit) { super(source); this.limit = limit; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLast.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLast.java index 5f065375d4..535011e98b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLast.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLast.java @@ -22,7 +22,7 @@ public final class ObservableTakeLast extends ObservableWithUpstream { final int count; - public ObservableTakeLast(ObservableConsumable source, int count) { + public ObservableTakeLast(ObservableSource source, int count) { super(source); this.count = count; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastOne.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastOne.java index 6c01f2e33b..2aa847f51a 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastOne.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastOne.java @@ -18,7 +18,7 @@ public final class ObservableTakeLastOne extends ObservableWithUpstream { - public ObservableTakeLastOne(ObservableConsumable source) { + public ObservableTakeLastOne(ObservableSource source) { super(source); } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimed.java index 493409efa8..751c56c5b1 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimed.java @@ -29,7 +29,7 @@ public final class ObservableTakeLastTimed extends ObservableWithUpstream source, + public ObservableTakeLastTimed(ObservableSource source, long count, long time, TimeUnit unit, Scheduler scheduler, int bufferSize, boolean delayError) { super(source); this.count = count; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntil.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntil.java index 5514d4ce1f..c2644e9d71 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntil.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntil.java @@ -21,8 +21,8 @@ import io.reactivex.observers.SerializedObserver; public final class ObservableTakeUntil extends ObservableWithUpstream { - final ObservableConsumable other; - public ObservableTakeUntil(ObservableConsumable source, ObservableConsumable other) { + final ObservableSource other; + public ObservableTakeUntil(ObservableSource source, ObservableSource other) { super(source); this.other = other; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicate.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicate.java index 44da853635..405524050c 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicate.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicate.java @@ -20,7 +20,7 @@ public final class ObservableTakeUntilPredicate extends ObservableWithUpstream { final Predicate predicate; - public ObservableTakeUntilPredicate(ObservableConsumable source, Predicate predicate) { + public ObservableTakeUntilPredicate(ObservableSource source, Predicate predicate) { super(source); this.predicate = predicate; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeWhile.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeWhile.java index 6c68915ad5..55a30d6171 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeWhile.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeWhile.java @@ -20,7 +20,7 @@ public final class ObservableTakeWhile extends ObservableWithUpstream { final Predicate predicate; - public ObservableTakeWhile(ObservableConsumable source, Predicate predicate) { + public ObservableTakeWhile(ObservableSource source, Predicate predicate) { super(source); this.predicate = predicate; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTimed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTimed.java index f0f100f331..2ab9896787 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTimed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTimed.java @@ -28,7 +28,7 @@ public final class ObservableThrottleFirstTimed extends ObservableWithUpstrea final TimeUnit unit; final Scheduler scheduler; - public ObservableThrottleFirstTimed(ObservableConsumable source, + public ObservableThrottleFirstTimed(ObservableSource source, long timeout, TimeUnit unit, Scheduler scheduler) { super(source); this.timeout = timeout; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeInterval.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeInterval.java index da6560c23c..f30c99891e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeInterval.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeInterval.java @@ -24,7 +24,7 @@ public final class ObservableTimeInterval extends ObservableWithUpstream source, TimeUnit unit, Scheduler scheduler) { + public ObservableTimeInterval(ObservableSource source, TimeUnit unit, Scheduler scheduler) { super(source); this.scheduler = scheduler; this.unit = unit; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeout.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeout.java index 87b27bf284..d553c984ce 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeout.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeout.java @@ -25,15 +25,15 @@ import io.reactivex.plugins.RxJavaPlugins; public final class ObservableTimeout extends ObservableWithUpstream { - final Callable> firstTimeoutSelector; - final Function> timeoutSelector; - final ObservableConsumable other; + final Callable> firstTimeoutSelector; + final Function> timeoutSelector; + final ObservableSource other; public ObservableTimeout( - ObservableConsumable source, - Callable> firstTimeoutSelector, - Function> timeoutSelector, - ObservableConsumable other) { + ObservableSource source, + Callable> firstTimeoutSelector, + Function> timeoutSelector, + ObservableSource other) { super(source); this.firstTimeoutSelector = firstTimeoutSelector; this.timeoutSelector = timeoutSelector; @@ -58,16 +58,16 @@ static final class TimeoutSubscriber /** */ private static final long serialVersionUID = 2672739326310051084L; final Observer actual; - final Callable> firstTimeoutSelector; - final Function> timeoutSelector; + final Callable> firstTimeoutSelector; + final Function> timeoutSelector; Disposable s; volatile long index; public TimeoutSubscriber(Observer actual, - Callable> firstTimeoutSelector, - Function> timeoutSelector) { + Callable> firstTimeoutSelector, + Function> timeoutSelector) { this.actual = actual; this.firstTimeoutSelector = firstTimeoutSelector; this.timeoutSelector = timeoutSelector; @@ -80,7 +80,7 @@ public void onSubscribe(Disposable s) { Observer a = actual; - ObservableConsumable p; + ObservableSource p; if (firstTimeoutSelector != null) { try { @@ -121,7 +121,7 @@ public void onNext(T t) { d.dispose(); } - ObservableConsumable p; + ObservableSource p; try { p = timeoutSelector.apply(t); @@ -225,9 +225,9 @@ static final class TimeoutOtherSubscriber /** */ private static final long serialVersionUID = -1957813281749686898L; final Observer actual; - final Callable> firstTimeoutSelector; - final Function> timeoutSelector; - final ObservableConsumable other; + final Callable> firstTimeoutSelector; + final Function> timeoutSelector; + final ObservableSource other; final NbpFullArbiter arbiter; Disposable s; @@ -237,8 +237,8 @@ static final class TimeoutOtherSubscriber volatile long index; public TimeoutOtherSubscriber(Observer actual, - Callable> firstTimeoutSelector, - Function> timeoutSelector, ObservableConsumable other) { + Callable> firstTimeoutSelector, + Function> timeoutSelector, ObservableSource other) { this.actual = actual; this.firstTimeoutSelector = firstTimeoutSelector; this.timeoutSelector = timeoutSelector; @@ -257,7 +257,7 @@ public void onSubscribe(Disposable s) { Observer a = actual; if (firstTimeoutSelector != null) { - ObservableConsumable p; + ObservableSource p; try { p = firstTimeoutSelector.call(); @@ -302,7 +302,7 @@ public void onNext(T t) { d.dispose(); } - ObservableConsumable p; + ObservableSource p; try { p = timeoutSelector.apply(t); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeoutTimed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeoutTimed.java index 6bfcda3f22..4c31c42f05 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeoutTimed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeoutTimed.java @@ -28,10 +28,10 @@ public final class ObservableTimeoutTimed extends ObservableWithUpstream other; + final ObservableSource other; - public ObservableTimeoutTimed(ObservableConsumable source, - long timeout, TimeUnit unit, Scheduler scheduler, ObservableConsumable other) { + public ObservableTimeoutTimed(ObservableSource source, + long timeout, TimeUnit unit, Scheduler scheduler, ObservableSource other) { super(source); this.timeout = timeout; this.unit = unit; @@ -57,7 +57,7 @@ static final class TimeoutTimedOtherSubscriber implements Observer, Dispos final long timeout; final TimeUnit unit; final Scheduler.Worker worker; - final ObservableConsumable other; + final ObservableSource other; Disposable s; @@ -80,7 +80,7 @@ public boolean isDisposed() { volatile boolean done; public TimeoutTimedOtherSubscriber(Observer actual, long timeout, TimeUnit unit, Worker worker, - ObservableConsumable other) { + ObservableSource other) { this.actual = actual; this.timeout = timeout; this.unit = unit; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableToList.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableToList.java index 5a455f0543..da01707eb6 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableToList.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableToList.java @@ -16,7 +16,7 @@ import java.util.*; import java.util.concurrent.Callable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import io.reactivex.internal.disposables.*; @@ -26,7 +26,7 @@ public final class ObservableToList> final Callable collectionSupplier; - public ObservableToList(ObservableConsumable source, final int defaultCapacityHint) { + public ObservableToList(ObservableSource source, final int defaultCapacityHint) { super(source); this.collectionSupplier = new Callable() { @Override @@ -37,7 +37,7 @@ public U call() throws Exception { }; } - public ObservableToList(ObservableConsumable source, Callable collectionSupplier) { + public ObservableToList(ObservableSource source, Callable collectionSupplier) { super(source); this.collectionSupplier = collectionSupplier; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOn.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOn.java index 195766ca4f..2ce21ec073 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOn.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOn.java @@ -21,7 +21,7 @@ public final class ObservableUnsubscribeOn extends ObservableWithUpstream { final Scheduler scheduler; - public ObservableUnsubscribeOn(ObservableConsumable source, Scheduler scheduler) { + public ObservableUnsubscribeOn(ObservableSource source, Scheduler scheduler) { super(source); this.scheduler = scheduler; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java index 2a8f976a5c..4f77074762 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java @@ -25,12 +25,12 @@ public final class ObservableUsing extends Observable { final Callable resourceSupplier; - final Function> sourceSupplier; + final Function> sourceSupplier; final Consumer disposer; final boolean eager; public ObservableUsing(Callable resourceSupplier, - Function> sourceSupplier, + Function> sourceSupplier, Consumer disposer, boolean eager) { this.resourceSupplier = resourceSupplier; @@ -50,7 +50,7 @@ public void subscribeActual(Observer s) { return; } - ObservableConsumable source; + ObservableSource source; try { source = sourceSupplier.apply(resource); } catch (Throwable e) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindow.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindow.java index bb7e178eb0..e0bc09b350 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindow.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindow.java @@ -26,7 +26,7 @@ public final class ObservableWindow extends ObservableWithUpstream source, long count, long skip, int capacityHint) { + public ObservableWindow(ObservableSource source, long count, long skip, int capacityHint) { super(source); this.count = count; this.skip = skip; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundary.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundary.java index aad4c907e9..5f25239972 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundary.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundary.java @@ -28,10 +28,10 @@ import io.reactivex.subjects.UnicastSubject; public final class ObservableWindowBoundary extends ObservableWithUpstream> { - final ObservableConsumable other; + final ObservableSource other; final int bufferSize; - public ObservableWindowBoundary(ObservableConsumable source, ObservableConsumable other, int bufferSize) { + public ObservableWindowBoundary(ObservableSource source, ObservableSource other, int bufferSize) { super(source); this.other = other; this.bufferSize = bufferSize; @@ -46,7 +46,7 @@ static final class WindowBoundaryMainSubscriber extends QueueDrainObserver> implements Disposable { - final ObservableConsumable other; + final ObservableSource other; final int bufferSize; Disposable s; @@ -59,7 +59,7 @@ static final class WindowBoundaryMainSubscriber final AtomicLong windows = new AtomicLong(); - public WindowBoundaryMainSubscriber(Observer> actual, ObservableConsumable other, + public WindowBoundaryMainSubscriber(Observer> actual, ObservableSource other, int bufferSize) { super(actual, new MpscLinkedQueue()); this.other = other; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySelector.java index 5030f90d5c..e83e598a45 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySelector.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySelector.java @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.*; import io.reactivex.Observable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.*; import io.reactivex.exceptions.Exceptions; @@ -32,13 +32,13 @@ import io.reactivex.subjects.UnicastSubject; public final class ObservableWindowBoundarySelector extends ObservableWithUpstream> { - final ObservableConsumable open; - final Function> close; + final ObservableSource open; + final Function> close; final int bufferSize; public ObservableWindowBoundarySelector( - ObservableConsumable source, - ObservableConsumable open, Function> close, + ObservableSource source, + ObservableSource open, Function> close, int bufferSize) { super(source); this.open = open; @@ -56,8 +56,8 @@ public void subscribeActual(Observer> t) { static final class WindowBoundaryMainSubscriber extends QueueDrainObserver> implements Disposable { - final ObservableConsumable open; - final Function> close; + final ObservableSource open; + final Function> close; final int bufferSize; final CompositeDisposable resources; @@ -70,7 +70,7 @@ static final class WindowBoundaryMainSubscriber final AtomicLong windows = new AtomicLong(); public WindowBoundaryMainSubscriber(Observer> actual, - ObservableConsumable open, Function> close, int bufferSize) { + ObservableSource open, Function> close, int bufferSize) { super(actual, new MpscLinkedQueue()); this.open = open; this.close = close; @@ -263,7 +263,7 @@ void drainLoop() { ws.add(w); a.onNext(w); - ObservableConsumable p; + ObservableSource p; try { p = close.apply(wo.open); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySupplier.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySupplier.java index 9ea53e1ee9..79e0eecb81 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySupplier.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySupplier.java @@ -28,12 +28,12 @@ import io.reactivex.subjects.UnicastSubject; public final class ObservableWindowBoundarySupplier extends ObservableWithUpstream> { - final Callable> other; + final Callable> other; final int bufferSize; public ObservableWindowBoundarySupplier( - ObservableConsumable source, - Callable> other, int bufferSize) { + ObservableSource source, + Callable> other, int bufferSize) { super(source); this.other = other; this.bufferSize = bufferSize; @@ -48,7 +48,7 @@ static final class WindowBoundaryMainSubscriber extends QueueDrainObserver> implements Disposable { - final Callable> other; + final Callable> other; final int bufferSize; Disposable s; @@ -61,7 +61,7 @@ static final class WindowBoundaryMainSubscriber final AtomicLong windows = new AtomicLong(); - public WindowBoundaryMainSubscriber(Observer> actual, Callable> other, + public WindowBoundaryMainSubscriber(Observer> actual, Callable> other, int bufferSize) { super(actual, new MpscLinkedQueue()); this.other = other; @@ -81,7 +81,7 @@ public void onSubscribe(Disposable s) { return; } - ObservableConsumable p; + ObservableSource p; try { p = other.call(); @@ -227,7 +227,7 @@ void drainLoop() { continue; } - ObservableConsumable p; + ObservableSource p; try { p = other.call(); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowTimed.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowTimed.java index 3dbf8cadd5..e5ab99705a 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowTimed.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowTimed.java @@ -42,7 +42,7 @@ public final class ObservableWindowTimed extends ObservableWithUpstream source, + ObservableSource source, long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, long maxSize, int bufferSize, boolean restartTimerOnMaxSize) { super(source); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFrom.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFrom.java index 97bfbd0034..365f93fd31 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFrom.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFrom.java @@ -24,9 +24,9 @@ public final class ObservableWithLatestFrom extends ObservableWithUpstream { final BiFunction combiner; - final ObservableConsumable other; - public ObservableWithLatestFrom(ObservableConsumable source, - BiFunction combiner, ObservableConsumable other) { + final ObservableSource other; + public ObservableWithLatestFrom(ObservableSource source, + BiFunction combiner, ObservableSource other) { super(source); this.combiner = combiner; this.other = other; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWithUpstream.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableWithUpstream.java index d9022c8f23..fd1e0d7295 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWithUpstream.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableWithUpstream.java @@ -24,13 +24,13 @@ public abstract class ObservableWithUpstream extends Observable { /** The source consumable Observable. */ - protected final ObservableConsumable source; + protected final ObservableSource source; /** * Constructs the ObservableSource with the given consumable. * @param source the consumable Observable */ - public ObservableWithUpstream(ObservableConsumable source) { + public ObservableWithUpstream(ObservableSource source) { this.source = source; } @@ -39,7 +39,7 @@ public ObservableWithUpstream(ObservableConsumable source) { *

Allows discovering the chain of observables. * @return the source ObservableConsumable */ - public final ObservableConsumable source() { + public final ObservableSource source() { return source; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWrapper.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableWrapper.java index aa86f2224e..0a958a2fbb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWrapper.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableWrapper.java @@ -16,9 +16,9 @@ import io.reactivex.*; public final class ObservableWrapper extends Observable { - final ObservableConsumable onSubscribe; + final ObservableSource onSubscribe; - public ObservableWrapper(ObservableConsumable onSubscribe) { + public ObservableWrapper(ObservableSource onSubscribe) { this.onSubscribe = onSubscribe; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableZip.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableZip.java index 120adf3b16..176ad57336 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableZip.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableZip.java @@ -24,14 +24,14 @@ public final class ObservableZip extends Observable { - final ObservableConsumable[] sources; - final Iterable> sourcesIterable; + final ObservableSource[] sources; + final Iterable> sourcesIterable; final Function zipper; final int bufferSize; final boolean delayError; - public ObservableZip(ObservableConsumable[] sources, - Iterable> sourcesIterable, + public ObservableZip(ObservableSource[] sources, + Iterable> sourcesIterable, Function zipper, int bufferSize, boolean delayError) { @@ -45,11 +45,11 @@ public ObservableZip(ObservableConsumable[] sources, @Override @SuppressWarnings("unchecked") public void subscribeActual(Observer s) { - ObservableConsumable[] sources = this.sources; + ObservableSource[] sources = this.sources; int count = 0; if (sources == null) { sources = new Observable[8]; - for (ObservableConsumable p : sourcesIterable) { + for (ObservableSource p : sourcesIterable) { if (count == sources.length) { Observable[] b = new Observable[count + (count >> 2)]; System.arraycopy(sources, 0, b, 0, count); @@ -92,7 +92,7 @@ public ZipCoordinator(Observer actual, this.delayError = delayError; } - public void subscribe(ObservableConsumable[] sources, int bufferSize) { + public void subscribe(ObservableSource[] sources, int bufferSize) { ZipSubscriber[] s = subscribers; int len = s.length; for (int i = 0; i < len; i++) { @@ -300,4 +300,4 @@ public boolean isDisposed() { return s.get() == DisposableHelper.DISPOSED; } } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithObservable.java b/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithObservable.java index 435fe08b36..c513142459 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithObservable.java +++ b/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithObservable.java @@ -25,9 +25,9 @@ public final class SingleDelayWithObservable extends Single { final SingleSource source; - final ObservableConsumable other; + final ObservableSource other; - public SingleDelayWithObservable(SingleSource source, ObservableConsumable other) { + public SingleDelayWithObservable(SingleSource source, ObservableSource other) { this.source = source; this.other = other; } diff --git a/src/main/java/io/reactivex/subjects/AsyncSubject.java b/src/main/java/io/reactivex/subjects/AsyncSubject.java index 38984a5e94..12406ea2c6 100644 --- a/src/main/java/io/reactivex/subjects/AsyncSubject.java +++ b/src/main/java/io/reactivex/subjects/AsyncSubject.java @@ -142,7 +142,7 @@ public boolean hasValue() { return o != null && !NotificationLite.isComplete(o) && !NotificationLite.isError(o); } - static final class State extends AtomicReference implements ObservableConsumable, Observer { + static final class State extends AtomicReference implements ObservableSource, Observer { /** */ private static final long serialVersionUID = 4876574210612691772L; @@ -307,4 +307,4 @@ public void onComplete() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/subjects/BehaviorSubject.java index 7beab4e737..e0b03397ae 100644 --- a/src/main/java/io/reactivex/subjects/BehaviorSubject.java +++ b/src/main/java/io/reactivex/subjects/BehaviorSubject.java @@ -146,7 +146,7 @@ public boolean hasValue() { return o != null && !NotificationLite.isComplete(o) && !NotificationLite.isError(o); } - static final class State extends AtomicReference implements ObservableConsumable, Observer { + static final class State extends AtomicReference implements ObservableSource, Observer { /** */ private static final long serialVersionUID = -4311717003288339429L; diff --git a/src/main/java/io/reactivex/subjects/PublishSubject.java b/src/main/java/io/reactivex/subjects/PublishSubject.java index 0a5dc04549..96874b8f67 100644 --- a/src/main/java/io/reactivex/subjects/PublishSubject.java +++ b/src/main/java/io/reactivex/subjects/PublishSubject.java @@ -101,7 +101,7 @@ public boolean hasValue() { return false; } - static final class State extends AtomicReference implements ObservableConsumable, Observer { + static final class State extends AtomicReference implements ObservableSource, Observer { /** */ private static final long serialVersionUID = 4876574210612691772L; @@ -263,4 +263,4 @@ public void onComplete() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/io/reactivex/subjects/ReplaySubject.java b/src/main/java/io/reactivex/subjects/ReplaySubject.java index e85572f9e4..a6ab0f48b6 100644 --- a/src/main/java/io/reactivex/subjects/ReplaySubject.java +++ b/src/main/java/io/reactivex/subjects/ReplaySubject.java @@ -170,7 +170,7 @@ public boolean hasValue() { return state.buffer.size(); } - static final class State extends AtomicReference implements ObservableConsumable, Observer { + static final class State extends AtomicReference implements ObservableSource, Observer { /** */ private static final long serialVersionUID = -4673197222000219014L; diff --git a/src/main/java/io/reactivex/subjects/UnicastSubject.java b/src/main/java/io/reactivex/subjects/UnicastSubject.java index 820dfc4587..c5d29bab6e 100644 --- a/src/main/java/io/reactivex/subjects/UnicastSubject.java +++ b/src/main/java/io/reactivex/subjects/UnicastSubject.java @@ -100,7 +100,7 @@ static abstract class StatePad0 extends AtomicInteger { } /** The state of the UnicastSubject. */ - static final class State extends StatePad0 implements ObservableConsumable, Disposable, Observer { + static final class State extends StatePad0 implements ObservableSource, Disposable, Observer { /** */ private static final long serialVersionUID = 5058617037583835632L; @@ -367,4 +367,4 @@ public T[] getValues(T[] array) { } return array; } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/exceptions/ExceptionsTest.java b/src/test/java/io/reactivex/exceptions/ExceptionsTest.java index f962256444..5872dc2aa8 100644 --- a/src/test/java/io/reactivex/exceptions/ExceptionsTest.java +++ b/src/test/java/io/reactivex/exceptions/ExceptionsTest.java @@ -315,10 +315,10 @@ public void onNext(Integer integer) { @Ignore("v2 components should not throw") @Test(expected = OnErrorFailedException.class) public void testOnErrorExceptionIsThrownFromSubscribe() { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer s1) { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer s2) { throw new IllegalArgumentException("original exception"); @@ -332,10 +332,10 @@ public void subscribe(Observer s2) { @Ignore("v2 components should not throw") @Test(expected = OnErrorFailedException.class) public void testOnErrorExceptionIsThrownFromUnsafeSubscribe() { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer s1) { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer s2) { throw new IllegalArgumentException("original exception"); diff --git a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableNextTest.java b/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableNextTest.java index 8ae310ce6c..5c8fcbc29e 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableNextTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableNextTest.java @@ -23,7 +23,7 @@ import org.junit.*; import io.reactivex.Observable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.exceptions.TestException; import io.reactivex.internal.disposables.EmptyDisposable; @@ -235,7 +235,7 @@ public void testNoBufferingOrBlockingOfSequence() throws Throwable { final CountDownLatch timeHasPassed = new CountDownLatch(COUNT); final AtomicBoolean running = new AtomicBoolean(true); final AtomicInteger count = new AtomicInteger(0); - final Observable obs = Observable.create(new ObservableConsumable() { + final Observable obs = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer o) { @@ -318,4 +318,4 @@ public void testSynchronousNext() { assertEquals(2, BehaviorProcessor.createDefault(2).toBlocking().iterator().next().intValue()); assertEquals(3, BehaviorProcessor.createDefault(3).toBlocking().next().iterator().next().intValue()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToIteratorTest.java b/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToIteratorTest.java index a6ff2b2e35..1b27b1b0cc 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToIteratorTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToIteratorTest.java @@ -46,7 +46,7 @@ public void testToIterator() { @Test(expected = TestException.class) public void testToIteratorWithException() { - Observable obs = Observable.create(new ObservableConsumable() { + Observable obs = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { @@ -68,7 +68,7 @@ public void subscribe(Observer NbpObserver) { @Ignore("subscribe() should not throw") @Test(expected = TestException.class) public void testExceptionThrownFromOnSubscribe() { - Iterable strings = Observable.create(new ObservableConsumable() { + Iterable strings = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { throw new TestException("intentional"); @@ -79,4 +79,4 @@ public void subscribe(Observer NbpSubscriber) { System.out.println(string); } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableAmbTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableAmbTest.java index ab3064a3a0..d63bf44378 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableAmbTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableAmbTest.java @@ -43,7 +43,7 @@ public void setUp() { private Observable createObservable(final String[] values, final long interval, final Throwable e) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpSubscriber) { @@ -220,4 +220,4 @@ public void testAmbCancelsOthers() { assertFalse("Source 2 still has subscribers!", source3.hasSubscribers()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java index f227aa5848..b4c4824c99 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java @@ -60,7 +60,7 @@ public void testComplete() { @Test public void testSkipAndCountOverlappingBuffers() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -116,7 +116,7 @@ public void testSkipAndCountBuffersWithGaps() { @Test public void testTimedAndCount() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -148,7 +148,7 @@ public void subscribe(Observer NbpObserver) { @Test public void testTimed() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -182,7 +182,7 @@ public void subscribe(Observer NbpObserver) { @Test public void testObservableBasedOpenerAndCloser() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -195,7 +195,7 @@ public void subscribe(Observer NbpObserver) { } }); - Observable openings = Observable.create(new ObservableConsumable() { + Observable openings = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -208,7 +208,7 @@ public void subscribe(Observer NbpObserver) { Function> closer = new Function>() { @Override public Observable apply(Object opening) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -233,7 +233,7 @@ public void subscribe(Observer NbpObserver) { @Test public void testObservableBasedCloser() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -249,7 +249,7 @@ public void subscribe(Observer NbpObserver) { Callable> closer = new Callable>() { @Override public Observable call() { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -790,4 +790,4 @@ public void onComplete() { assertFalse(s.isDisposed()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableCacheTest.java index 244b2613e0..33d86f039b 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableCacheTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableCacheTest.java @@ -23,7 +23,7 @@ import org.junit.*; import io.reactivex.Observable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.exceptions.TestException; import io.reactivex.functions.Consumer; @@ -58,7 +58,7 @@ public void testColdReplayNoBackpressure() { @Test public void testCache() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpObserver) { @@ -192,7 +192,7 @@ public void testAsyncComeAndGo() { @Test public void testNoMissingBackpressureException() { final int m = 4 * 1000 * 1000; - Observable firehose = Observable.create(new ObservableConsumable() { + Observable firehose = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t) { t.onSubscribe(EmptyDisposable.INSTANCE); @@ -263,4 +263,4 @@ public void onNext(Integer t) { ts.assertNotComplete(); ts.assertError(TestException.class); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatTest.java index 8e744ab064..3db1bd37e3 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatTest.java @@ -80,7 +80,7 @@ public void testConcatObservableOfObservables() { final Observable odds = Observable.fromArray(o); final Observable even = Observable.fromArray(e); - Observable> observableOfObservables = Observable.create(new ObservableConsumable>() { + Observable> observableOfObservables = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { @@ -156,7 +156,7 @@ public void testNestedAsyncConcat() throws InterruptedException { final CountDownLatch parentHasFinished = new CountDownLatch(1); - Observable> observableOfObservables = Observable.create(new ObservableConsumable>() { + Observable> observableOfObservables = Observable.create(new ObservableSource>() { @Override public void subscribe(final Observer> NbpObserver) { @@ -343,7 +343,7 @@ public void testConcatNonBlockingObservables() { Observer NbpObserver = TestHelper.mockObserver(); - Observable> observableOfObservables = Observable.create(new ObservableConsumable>() { + Observable> observableOfObservables = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { @@ -469,7 +469,7 @@ public void testConcatUnsubscribeConcurrent() { verify(NbpObserver, never()).onError(any(Throwable.class)); } - private static class TestObservable implements ObservableConsumable { + private static class TestObservable implements ObservableSource { private final Disposable s = new Disposable() { @Override @@ -658,7 +658,7 @@ public void testConcatOuterBackpressure() { // https://github.com/ReactiveX/RxJava/issues/1818 @Test public void testConcatWithNonCompliantSourceDoubleOnComplete() { - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { @@ -758,4 +758,4 @@ public Observable apply(Integer t) { } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDebounceTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableDebounceTest.java index 8c6d85970e..8fb29ba6dd 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDebounceTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableDebounceTest.java @@ -44,7 +44,7 @@ public void before() { @Test public void testDebounceWithCompleted() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -70,7 +70,7 @@ public void subscribe(Observer NbpObserver) { @Test public void testDebounceNeverEmits() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -100,7 +100,7 @@ public void subscribe(Observer NbpObserver) { @Test public void testDebounceWithError() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -290,4 +290,4 @@ public void debounceWithTimeBackpressure() throws InterruptedException { NbpSubscriber.assertTerminated(); NbpSubscriber.assertNoErrors(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnSubscribeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnSubscribeTest.java index 1c39d3d469..9f0a9bc61e 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnSubscribeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnSubscribeTest.java @@ -67,7 +67,7 @@ public void testDoOnUnSubscribeWorksWithRefCount() throws Exception { final AtomicInteger countBefore = new AtomicInteger(); final AtomicInteger countAfter = new AtomicInteger(); final AtomicReference> sref = new AtomicReference>(); - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { @@ -104,4 +104,4 @@ public void accept(Disposable s) { assertEquals(6, countAfter.get()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableFromIterableTest.java index 8664f18da9..af014c22f8 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromIterableTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableFromIterableTest.java @@ -233,9 +233,9 @@ public void fusionWithConcatMap() { TestObserver to = new TestObserver(); Observable.fromIterable(Arrays.asList(1, 2, 3, 4)).concatMap( - new Function>() { + new Function>() { @Override - public ObservableConsumable apply(Integer v) { + public ObservableSource apply(Integer v) { return Observable.range(v, 2); } }).subscribe(to); @@ -244,4 +244,4 @@ public ObservableConsumable apply(Integer v) { to.assertNoErrors(); to.assertComplete(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableGroupByTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableGroupByTest.java index e62cbd214e..354e902319 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableGroupByTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableGroupByTest.java @@ -183,7 +183,7 @@ public void testGroupedEventStream() throws Throwable { final int count = 100; final int groupCount = 2; - Observable es = Observable.create(new ObservableConsumable() { + Observable es = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpObserver) { @@ -595,7 +595,7 @@ public void accept(String s) { public void testFirstGroupsCompleteAndParentSlowToThenEmitFinalGroupsAndThenComplete() throws InterruptedException { final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete final ArrayList results = new ArrayList(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer sub) { @@ -674,7 +674,7 @@ public void testFirstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenSu System.err.println("----------------------------------------------------------------------------------------------"); final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete final ArrayList results = new ArrayList(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer sub) { @@ -766,7 +766,7 @@ public void accept(String s) { public void testFirstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenObservesOnAndDelaysAndThenCompletes() throws InterruptedException { final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete final ArrayList results = new ArrayList(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer sub) { @@ -843,7 +843,7 @@ public void accept(String s) { @Test public void testGroupsWithNestedSubscribeOn() throws InterruptedException { final ArrayList results = new ArrayList(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer sub) { @@ -900,7 +900,7 @@ public void accept(String s) { @Test public void testGroupsWithNestedObserveOn() throws InterruptedException { final ArrayList results = new ArrayList(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer sub) { @@ -961,7 +961,7 @@ Observable ASYNC_INFINITE_OBSERVABLE_OF_EVENT(final int numGroups, final }; Observable SYNC_INFINITE_OBSERVABLE_OF_EVENT(final int numGroups, final AtomicInteger subscribeCounter, final AtomicInteger sentEventCounter) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(final Observer op) { @@ -1375,7 +1375,7 @@ public void accept(String s) { public void testGroupByUnsubscribe() { final Disposable s = mock(Disposable.class); Observable o = Observable.create( - new ObservableConsumable() { + new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { NbpSubscriber.onSubscribe(s); @@ -1424,7 +1424,7 @@ public void onNext(GroupedObservable o) { } }); Observable.create( - new ObservableConsumable() { + new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { NbpSubscriber.onSubscribe(EmptyDisposable.INSTANCE); @@ -1444,4 +1444,4 @@ public Integer apply(Integer i) { assertEquals(Arrays.asList(e), inner1.errors()); assertEquals(Arrays.asList(e), inner2.errors()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMaterializeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableMaterializeTest.java index c07822150e..d40d16295f 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMaterializeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableMaterializeTest.java @@ -132,7 +132,7 @@ public void onNext(Try> value) { } - private static class TestAsyncErrorObservable implements ObservableConsumable { + private static class TestAsyncErrorObservable implements ObservableSource { String[] valuesToReturn; @@ -171,4 +171,4 @@ public void run() { t.start(); } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java index 560719b759..1b34df585b 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java @@ -215,7 +215,7 @@ public void testMergeObservableOfObservables() { final Observable o1 = Observable.create(new TestSynchronousObservable()); final Observable o2 = Observable.create(new TestSynchronousObservable()); - Observable> observableOfObservables = Observable.create(new ObservableConsumable>() { + Observable> observableOfObservables = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { @@ -313,7 +313,7 @@ public void onNext(String s) { } } - private static class TestSynchronousObservable implements ObservableConsumable { + private static class TestSynchronousObservable implements ObservableSource { @Override public void subscribe(Observer NbpObserver) { @@ -323,7 +323,7 @@ public void subscribe(Observer NbpObserver) { } } - private static class TestASynchronousObservable implements ObservableConsumable { + private static class TestASynchronousObservable implements ObservableSource { Thread t; @Override @@ -342,7 +342,7 @@ public void run() { } } - private static class TestErrorObservable implements ObservableConsumable { + private static class TestErrorObservable implements ObservableSource { String[] valuesToReturn; @@ -371,7 +371,7 @@ public void subscribe(Observer NbpObserver) { } } - private static class TestAsyncErrorObservable implements ObservableConsumable { + private static class TestAsyncErrorObservable implements ObservableSource { String[] valuesToReturn; @@ -433,7 +433,7 @@ public void onNext(String args) { @Test @Ignore("Subscribers should not throw") public void testMergeSourceWhichDoesntPropagateExceptionBack() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t1) { t1.onSubscribe(EmptyDisposable.INSTANCE); @@ -505,7 +505,7 @@ public void testErrorInParentObservableDelayed() throws Exception { for (int i = 0; i < 50; i++) { final TestASynchronous1sDelayedObservable o1 = new TestASynchronous1sDelayedObservable(); final TestASynchronous1sDelayedObservable o2 = new TestASynchronous1sDelayedObservable(); - Observable> parentObservable = Observable.create(new ObservableConsumable>() { + Observable> parentObservable = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> op) { op.onSubscribe(EmptyDisposable.INSTANCE); @@ -530,7 +530,7 @@ public void subscribe(Observer> op) { } } - private static class TestASynchronous1sDelayedObservable implements ObservableConsumable { + private static class TestASynchronous1sDelayedObservable implements ObservableSource { Thread t; @Override @@ -553,4 +553,4 @@ public void run() { t.start(); } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeMaxConcurrentTest.java index c885486653..7982eb058f 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeMaxConcurrentTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeMaxConcurrentTest.java @@ -85,7 +85,7 @@ public void testMaxConcurrent() { } } - private static class SubscriptionCheckObservable implements ObservableConsumable { + private static class SubscriptionCheckObservable implements ObservableSource { private final AtomicInteger subscriptionCount; private final int maxConcurrent; @@ -268,4 +268,4 @@ public void testTake() throws Exception { ts.assertNoErrors(); ts.assertValueCount(5); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeTest.java index 489f0bc92a..76840b0aca 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeTest.java @@ -73,7 +73,7 @@ public void testMergeObservableOfObservables() { final Observable o1 = Observable.create(new TestSynchronousObservable()); final Observable o2 = Observable.create(new TestSynchronousObservable()); - Observable> observableOfObservables = Observable.create(new ObservableConsumable>() { + Observable> observableOfObservables = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { @@ -128,7 +128,7 @@ public void testUnSubscribeObservableOfObservables() throws InterruptedException final AtomicBoolean unsubscribed = new AtomicBoolean(); final CountDownLatch latch = new CountDownLatch(1); - Observable> source = Observable.create(new ObservableConsumable>() { + Observable> source = Observable.create(new ObservableSource>() { @Override public void subscribe(final Observer> NbpObserver) { @@ -340,7 +340,7 @@ public void testError2() { @Ignore("Subscribe should not throw") public void testThrownErrorHandling() { TestObserver ts = new TestObserver(); - Observable o1 = Observable.create(new ObservableConsumable() { + Observable o1 = Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { @@ -355,7 +355,7 @@ public void subscribe(Observer s) { System.out.println("Error: " + ts.errors()); } - private static class TestSynchronousObservable implements ObservableConsumable { + private static class TestSynchronousObservable implements ObservableSource { @Override public void subscribe(Observer NbpObserver) { @@ -365,7 +365,7 @@ public void subscribe(Observer NbpObserver) { } } - private static class TestASynchronousObservable implements ObservableConsumable { + private static class TestASynchronousObservable implements ObservableSource { Thread t; final CountDownLatch onNextBeingSent = new CountDownLatch(1); @@ -392,7 +392,7 @@ public void run() { } } - private static class TestErrorObservable implements ObservableConsumable { + private static class TestErrorObservable implements ObservableSource { String[] valuesToReturn; @@ -494,7 +494,7 @@ public void testEarlyUnsubscribe() { } private Observable createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(final Scheduler scheduler, final AtomicBoolean unsubscribed) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(final Observer child) { @@ -556,7 +556,7 @@ public void testConcurrency() { @Test public void testConcurrencyWithSleeping() { - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer s) { @@ -606,7 +606,7 @@ public void run() { @Test public void testConcurrencyWithBrokenOnCompleteContract() { - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer s) { @@ -835,7 +835,7 @@ public void mergeWithNullValues() { public void mergeWithTerminalEventAfterUnsubscribe() { System.out.println("mergeWithTerminalEventAfterUnsubscribe"); TestObserver ts = new TestObserver(); - Observable bad = Observable.create(new ObservableConsumable() { + Observable bad = Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { @@ -1018,7 +1018,7 @@ public void mergeManyAsyncSingle() { @Override public Observable apply(final Integer i) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { @@ -1117,4 +1117,4 @@ public void onNext(Integer t) { runMerge(toHiddenScalar, ts); } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaFunctionTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaFunctionTest.java index 71883eee77..75ccf2021b 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaFunctionTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaFunctionTest.java @@ -24,7 +24,7 @@ import org.reactivestreams.Subscription; import io.reactivex.*; -import io.reactivex.Observable.Operator; +import io.reactivex.ObservableOperator; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Function; import io.reactivex.internal.disposables.EmptyDisposable; @@ -36,7 +36,7 @@ public class ObservableOnErrorResumeNextViaFunctionTest { @Test public void testResumeNextWithSynchronousExecution() { final AtomicReference receivedException = new AtomicReference(); - Observable w = Observable.create(new ObservableConsumable() { + Observable w = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { @@ -152,7 +152,7 @@ public Observable apply(Throwable t1) { @Ignore("Failed operator may leave the child NbpSubscriber in an inconsistent state which prevents further error delivery.") public void testOnErrorResumeReceivesErrorFromPreviousNonProtectedOperator() { TestObserver ts = new TestObserver(); - Observable.just(1).lift(new Operator() { + Observable.just(1).lift(new ObservableOperator() { @Override public Observer apply(Observer t1) { @@ -185,7 +185,7 @@ public Observable apply(Throwable t1) { @Ignore("A crashing operator may leave the downstream in an inconsistent state and not suitable for event delivery") public void testOnErrorResumeReceivesErrorFromPreviousNonProtectedOperatorOnNext() { TestObserver ts = new TestObserver(); - Observable.just(1).lift(new Operator() { + Observable.just(1).lift(new ObservableOperator() { @Override public Observer apply(final Observer t1) { @@ -274,7 +274,7 @@ public Observable apply(Throwable t1) { verify(NbpObserver, times(1)).onNext("threeResume"); } - private static class TestObservable implements ObservableConsumable { + private static class TestObservable implements ObservableSource { final String[] values; Thread t = null; @@ -345,4 +345,4 @@ public Integer apply(Integer t1) { ts.awaitTerminalEvent(); ts.assertNoErrors(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaObservableTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaObservableTest.java index a2d2994a37..101dfd690a 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaObservableTest.java @@ -100,7 +100,7 @@ public String apply(String s) { @Test @Ignore("Publishers should not throw") public void testResumeNextWithFailureOnSubscribe() { - Observable testObservable = Observable.create(new ObservableConsumable() { + Observable testObservable = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t1) { @@ -122,7 +122,7 @@ public void subscribe(Observer t1) { @Test @Ignore("Publishers should not throw") public void testResumeNextWithFailureOnSubscribeAsync() { - Observable testObservable = Observable.create(new ObservableConsumable() { + Observable testObservable = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t1) { @@ -145,7 +145,7 @@ public void subscribe(Observer t1) { verify(NbpObserver, times(1)).onNext("resume"); } - private static class TestObservable implements ObservableConsumable { + private static class TestObservable implements ObservableSource { final Disposable s; final String[] values; @@ -214,4 +214,4 @@ public Integer apply(Integer t1) { ts.awaitTerminalEvent(); ts.assertNoErrors(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturnTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturnTest.java index 6499611bbb..86f2f3dd15 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturnTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturnTest.java @@ -176,7 +176,7 @@ public Integer apply(Integer t1) { ts.assertNoErrors(); } - private static class TestObservable implements ObservableConsumable { + private static class TestObservable implements ObservableSource { final String[] values; Thread t = null; @@ -214,4 +214,4 @@ public void run() { -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnExceptionResumeNextViaObservableTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableOnExceptionResumeNextViaObservableTest.java index 43bb1af198..3034f577e5 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnExceptionResumeNextViaObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableOnExceptionResumeNextViaObservableTest.java @@ -214,7 +214,7 @@ public Integer apply(Integer t1) { } - private static class TestObservable implements ObservableConsumable { + private static class TestObservable implements ObservableSource { final String[] values; Thread t = null; @@ -259,4 +259,4 @@ else if ("THROWABLE".equals(s)) System.out.println("done starting TestObservable thread"); } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservablePublishTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservablePublishTest.java index edb2d6da7f..aaf2dc51da 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservablePublishTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservablePublishTest.java @@ -36,7 +36,7 @@ public class ObservablePublishTest { @Test public void testPublish() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - ConnectableObservable o = Observable.create(new ObservableConsumable() { + ConnectableObservable o = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpObserver) { @@ -344,7 +344,7 @@ static boolean checkPublishDisposed(Disposable d) { @Test public void testConnectIsIdempotent() { final AtomicInteger calls = new AtomicInteger(); - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t) { t.onSubscribe(EmptyDisposable.INSTANCE); @@ -393,4 +393,4 @@ public void testObserveOn() { } } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountTest.java index c5899567f7..a4ad25a9e7 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountTest.java @@ -290,7 +290,7 @@ public void accept(Disposable s) { } private Observable synchronousInterval() { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { final AtomicBoolean cancel = new AtomicBoolean(); @@ -318,7 +318,7 @@ public void run() { public void onlyFirstShouldSubscribeAndLastUnsubscribe() { final AtomicInteger subscriptionCount = new AtomicInteger(); final AtomicInteger unsubscriptionCount = new AtomicInteger(); - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { subscriptionCount.incrementAndGet(); @@ -585,4 +585,4 @@ public void onError(Throwable t) { public void onComplete() { } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRepeatTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableRepeatTest.java index 770b0265b6..6989f64ca8 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRepeatTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableRepeatTest.java @@ -38,7 +38,7 @@ public class ObservableRepeatTest { public void testRepetition() { int NUM = 10; final AtomicInteger count = new AtomicInteger(); - int value = Observable.create(new ObservableConsumable() { + int value = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer o) { @@ -67,7 +67,7 @@ public void testNoStackOverFlow() { public void testRepeatTakeWithSubscribeOn() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable oi = Observable.create(new ObservableConsumable() { + Observable oi = Observable.create(new ObservableSource() { @Override public void subscribe(Observer sub) { @@ -194,4 +194,4 @@ public Observable apply(Integer x) { assertEquals(Arrays.asList(1, 2, 1, 2, 1, 2, 1, 2, 1, 2), concatBase); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableReplayTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableReplayTest.java index 3c3e980fc7..eb100567c6 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableReplayTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableReplayTest.java @@ -798,7 +798,7 @@ public void testColdReplayNoBackpressure() { @Test public void testCache() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpObserver) { @@ -934,7 +934,7 @@ public void testAsyncComeAndGo() { @Test public void testNoMissingBackpressureException() { final int m = 4 * 1000 * 1000; - Observable firehose = Observable.create(new ObservableConsumable() { + Observable firehose = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t) { t.onSubscribe(EmptyDisposable.INSTANCE); @@ -1005,4 +1005,4 @@ public void onNext(Integer t) { ts.assertNotComplete(); ts.assertError(TestException.class); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java index f05e5b2626..f1336500e1 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java @@ -42,7 +42,7 @@ public class ObservableRetryTest { public void iterativeBackoff() { Observer consumer = TestHelper.mockObserver(); - Observable producer = Observable.create(new ObservableConsumable() { + Observable producer = Observable.create(new ObservableSource() { private AtomicInteger count = new AtomicInteger(4); long last = System.currentTimeMillis(); @@ -242,7 +242,7 @@ public Observable apply(Observable t1) { @Test public void testSingleSubscriptionOnFirst() throws Exception { final AtomicInteger inc = new AtomicInteger(0); - ObservableConsumable onSubscribe = new ObservableConsumable() { + ObservableSource onSubscribe = new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { NbpSubscriber.onSubscribe(EmptyDisposable.INSTANCE); @@ -384,7 +384,7 @@ public void testRetrySubscribesAgainAfterError() throws Exception { inOrder.verifyNoMoreInteractions(); } - public static class FuncWithErrors implements ObservableConsumable { + public static class FuncWithErrors implements ObservableSource { private final int numFailures; private final AtomicInteger count = new AtomicInteger(0); @@ -426,7 +426,7 @@ public void accept(Integer n) { @Test public void testRetryAllowsSubscriptionAfterAllSubscriptionsUnsubscribed() throws InterruptedException { final AtomicInteger subsCount = new AtomicInteger(0); - ObservableConsumable onSubscribe = new ObservableConsumable() { + ObservableSource onSubscribe = new ObservableSource() { @Override public void subscribe(Observer s) { subsCount.incrementAndGet(); @@ -455,7 +455,7 @@ public void testSourceObservableCallsUnsubscribe() throws InterruptedException { final TestObserver ts = new TestObserver(); - ObservableConsumable onSubscribe = new ObservableConsumable() { + ObservableSource onSubscribe = new ObservableSource() { @Override public void subscribe(Observer s) { BooleanSubscription bs = new BooleanSubscription(); @@ -486,7 +486,7 @@ public void testSourceObservableRetry1() throws InterruptedException { final TestObserver ts = new TestObserver(); - ObservableConsumable onSubscribe = new ObservableConsumable() { + ObservableSource onSubscribe = new ObservableSource() { @Override public void subscribe(Observer s) { s.onSubscribe(EmptyDisposable.INSTANCE); @@ -505,7 +505,7 @@ public void testSourceObservableRetry0() throws InterruptedException { final TestObserver ts = new TestObserver(); - ObservableConsumable onSubscribe = new ObservableConsumable() { + ObservableSource onSubscribe = new ObservableSource() { @Override public void subscribe(Observer s) { s.onSubscribe(EmptyDisposable.INSTANCE); @@ -518,7 +518,7 @@ public void subscribe(Observer s) { assertEquals(1, subsCount.get()); } - static final class SlowObservable implements ObservableConsumable { + static final class SlowObservable implements ObservableSource { final AtomicInteger efforts = new AtomicInteger(0); final AtomicInteger active = new AtomicInteger(0), maxActive = new AtomicInteger(0); @@ -828,7 +828,7 @@ public void testIssue1900SourceNotSupportingBackpressure() { final int NUM_MSG = 1034; final AtomicInteger count = new AtomicInteger(); - Observable origin = Observable.create(new ObservableConsumable() { + Observable origin = Observable.create(new ObservableSource() { @Override public void subscribe(Observer o) { @@ -867,4 +867,4 @@ public Observable apply(GroupedObservable t1) { inOrder.verifyNoMoreInteractions(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryWithPredicateTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryWithPredicateTest.java index 2ea01a5f89..fdd36e25ea 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryWithPredicateTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryWithPredicateTest.java @@ -71,7 +71,7 @@ public void testWithNothingToRetry() { } @Test public void testRetryTwice() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { int count; @Override public void subscribe(Observer t1) { @@ -107,7 +107,7 @@ public void subscribe(Observer t1) { } @Test public void testRetryTwiceAndGiveUp() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t1) { t1.onSubscribe(EmptyDisposable.INSTANCE); @@ -135,7 +135,7 @@ public void subscribe(Observer t1) { } @Test public void testRetryOnSpecificException() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { int count; @Override public void subscribe(Observer t1) { @@ -172,7 +172,7 @@ public void subscribe(Observer t1) { public void testRetryOnSpecificExceptionAndNotOther() { final IOException ioe = new IOException(); final TestException te = new TestException(); - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { int count; @Override public void subscribe(Observer t1) { @@ -359,4 +359,4 @@ public void accept(Long t) { }}); assertEquals(Arrays.asList(1L,1L,2L,3L), list); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSampleTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableSampleTest.java index d2198ae591..4a5eb8f52c 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSampleTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableSampleTest.java @@ -44,7 +44,7 @@ public void before() { @Test public void testSample() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer observer1) { observer1.onSubscribe(EmptyDisposable.INSTANCE); @@ -266,7 +266,7 @@ public void sampleWithSamplerThrows() { public void testSampleUnsubscribe() { final Disposable s = mock(Disposable.class); Observable o = Observable.create( - new ObservableConsumable() { + new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { NbpSubscriber.onSubscribe(s); @@ -276,4 +276,4 @@ public void subscribe(Observer NbpSubscriber) { o.throttleLast(1, TimeUnit.MILLISECONDS).subscribe().dispose(); verify(s).dispose(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSerializeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableSerializeTest.java index a97a3bb9ad..7cc8dcfe35 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSerializeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableSerializeTest.java @@ -207,7 +207,7 @@ private static enum TestConcurrencyobserverEvent { /** * This spawns a single thread for the subscribe execution */ - private static class TestSingleThreadedObservable implements ObservableConsumable { + private static class TestSingleThreadedObservable implements ObservableSource { final String[] values; private Thread t = null; @@ -256,7 +256,7 @@ public void waitToFinish() { /** * This spawns a thread for the subscription, then a separate thread for each onNext call. */ - private static class TestMultiThreadedObservable implements ObservableConsumable { + private static class TestMultiThreadedObservable implements ObservableSource { final String[] values; Thread t = null; AtomicInteger threadsRunning = new AtomicInteger(); @@ -399,4 +399,4 @@ public void onNext(String args) { } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSubscribeOnTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableSubscribeOnTest.java index 69ed69d8de..fb508f08af 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSubscribeOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableSubscribeOnTest.java @@ -38,7 +38,7 @@ public void testIssue813() throws InterruptedException { TestObserver NbpObserver = new TestObserver(); Observable - .create(new ObservableConsumable() { + .create(new ObservableSource() { @Override public void subscribe( final Observer NbpSubscriber) { @@ -75,7 +75,7 @@ public void subscribe( @Ignore("ObservableConsumable.subscribe can't throw") public void testThrownErrorHandling() { TestObserver ts = new TestObserver(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { @@ -90,7 +90,7 @@ public void subscribe(Observer s) { @Test public void testOnError() { TestObserver ts = new TestObserver(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { @@ -161,7 +161,7 @@ public Disposable schedule(final Runnable action, final long delayTime, final Ti public void testUnsubscribeInfiniteStream() throws InterruptedException { TestObserver ts = new TestObserver(); final AtomicInteger count = new AtomicInteger(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer sub) { @@ -201,4 +201,4 @@ public void cancelBeforeActualSubscribe() { .assertNotTerminated(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmptyTest.java index bad2e0a08e..5fb8fcc7bc 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmptyTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmptyTest.java @@ -57,7 +57,7 @@ public void testSwitchTriggerUnsubscribe() throws Exception { final Disposable d = Disposables.empty(); - Observable withProducer = Observable.create(new ObservableConsumable() { + Observable withProducer = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpSubscriber) { NbpSubscriber.onSubscribe(d); @@ -67,7 +67,7 @@ public void subscribe(final Observer NbpSubscriber) { Observable.empty() .switchIfEmpty(withProducer) - .lift(new Observable.Operator() { + .lift(new ObservableOperator() { @Override public Observer apply(final Observer child) { return new DefaultObserver() { @@ -100,7 +100,7 @@ public void onNext(Long aLong) { public void testSwitchShouldTriggerUnsubscribe() { final Disposable d = Disposables.empty(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpSubscriber) { NbpSubscriber.onSubscribe(d); @@ -109,4 +109,4 @@ public void subscribe(final Observer NbpSubscriber) { }).switchIfEmpty(Observable.never()).subscribe(); assertTrue(d.isDisposed()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchTest.java index 1ac21343a4..32d70fb120 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchTest.java @@ -46,11 +46,11 @@ public void before() { @Test public void testSwitchWhenOuterCompleteBeforeInner() { - Observable> source = Observable.create(new ObservableConsumable>() { + Observable> source = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); - publishNext(NbpObserver, 50, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 50, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -75,11 +75,11 @@ public void subscribe(Observer NbpObserver) { @Test public void testSwitchWhenInnerCompleteBeforeOuter() { - Observable> source = Observable.create(new ObservableConsumable>() { + Observable> source = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); - publishNext(NbpObserver, 10, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 10, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -89,7 +89,7 @@ public void subscribe(Observer NbpObserver) { } })); - publishNext(NbpObserver, 100, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 100, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -121,11 +121,11 @@ public void subscribe(Observer NbpObserver) { @Test public void testSwitchWithComplete() { - Observable> source = Observable.create(new ObservableConsumable>() { + Observable> source = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); - publishNext(NbpObserver, 50, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 50, Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -134,7 +134,7 @@ public void subscribe(final Observer NbpObserver) { } })); - publishNext(NbpObserver, 200, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 200, Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -180,11 +180,11 @@ public void subscribe(final Observer NbpObserver) { @Test public void testSwitchWithError() { - Observable> source = Observable.create(new ObservableConsumable>() { + Observable> source = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); - publishNext(NbpObserver, 50, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 50, Observable.create(new ObservableSource() { @Override public void subscribe(final Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -193,7 +193,7 @@ public void subscribe(final Observer NbpObserver) { } })); - publishNext(NbpObserver, 200, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 200, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -239,11 +239,11 @@ public void subscribe(Observer NbpObserver) { @Test public void testSwitchWithSubsequenceComplete() { - Observable> source = Observable.create(new ObservableConsumable>() { + Observable> source = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); - publishNext(NbpObserver, 50, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 50, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -252,7 +252,7 @@ public void subscribe(Observer NbpObserver) { } })); - publishNext(NbpObserver, 130, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 130, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -260,7 +260,7 @@ public void subscribe(Observer NbpObserver) { } })); - publishNext(NbpObserver, 150, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 150, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -293,11 +293,11 @@ public void subscribe(Observer NbpObserver) { @Test public void testSwitchWithSubsequenceError() { - Observable> source = Observable.create(new ObservableConsumable>() { + Observable> source = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); - publishNext(NbpObserver, 50, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 50, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -306,7 +306,7 @@ public void subscribe(Observer NbpObserver) { } })); - publishNext(NbpObserver, 130, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 130, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -314,7 +314,7 @@ public void subscribe(Observer NbpObserver) { } })); - publishNext(NbpObserver, 150, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 150, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -376,11 +376,11 @@ public void run() { @Test public void testSwitchIssue737() { // https://github.com/ReactiveX/RxJava/issues/737 - Observable> source = Observable.create(new ObservableConsumable>() { + Observable> source = Observable.create(new ObservableSource>() { @Override public void subscribe(Observer> NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); - publishNext(NbpObserver, 0, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 0, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -391,7 +391,7 @@ public void subscribe(Observer NbpObserver) { publishCompleted(NbpObserver, 40); } })); - publishNext(NbpObserver, 25, Observable.create(new ObservableConsumable() { + publishNext(NbpObserver, 25, Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -424,7 +424,7 @@ public void subscribe(Observer NbpObserver) { public void testUnsubscribe() { final AtomicBoolean isUnsubscribed = new AtomicBoolean(); Observable.switchOnNext( - Observable.create(new ObservableConsumable>() { + Observable.create(new ObservableSource>() { @Override public void subscribe(final Observer> NbpSubscriber) { Disposable bs = Disposables.empty(); @@ -478,4 +478,4 @@ public void onNext(String t) { Assert.assertEquals(250, ts.valueCount()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTest.java index deff96ac54..431aa5dc26 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTest.java @@ -109,7 +109,7 @@ public Integer apply(Integer t1) { @Test public void testTakeDoesntLeakErrors() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -135,7 +135,7 @@ public void subscribe(Observer NbpObserver) { public void testTakeZeroDoesntLeakError() { final AtomicBoolean subscribed = new AtomicBoolean(false); final Disposable bs = Disposables.empty(); - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { subscribed.set(true); @@ -203,7 +203,7 @@ public void accept(Long l) { @Test(timeout = 2000) public void testMultiTake() { final AtomicInteger count = new AtomicInteger(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { @@ -229,7 +229,7 @@ public void accept(Integer t1) { assertEquals(1, count.get()); } - private static class TestObservableFunc implements ObservableConsumable { + private static class TestObservableFunc implements ObservableSource { final String[] values; Thread t = null; @@ -265,7 +265,7 @@ public void run() { } } - private static Observable INFINITE_OBSERVABLE = Observable.create(new ObservableConsumable() { + private static Observable INFINITE_OBSERVABLE = Observable.create(new ObservableSource() { @Override public void subscribe(Observer op) { @@ -358,4 +358,4 @@ public void accept(Integer v) { ts.assertNoErrors(); ts.assertComplete(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilTest.java index 57e7c9c232..e25f4a904a 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilTest.java @@ -151,7 +151,7 @@ public void testTakeUntilOtherCompleted() { } - private static class TestObservable implements ObservableConsumable { + private static class TestObservable implements ObservableSource { Observer NbpObserver; Disposable s; @@ -252,4 +252,4 @@ public void testDownstreamUnsubscribes() { assertFalse("Until still has observers", until.hasSubscribers()); assertFalse("NbpTestSubscriber is unsubscribed", ts.isCancelled()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeWhileTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeWhileTest.java index 03c45df40f..fe0eec1bc4 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeWhileTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeWhileTest.java @@ -100,7 +100,7 @@ public boolean test(String input) { @Test public void testTakeWhileDoesntLeakErrors() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -176,7 +176,7 @@ public boolean test(String s) { verify(s, times(1)).dispose(); } - private static class TestObservable implements ObservableConsumable { + private static class TestObservable implements ObservableSource { final Disposable s; final String[] values; @@ -249,4 +249,4 @@ public boolean test(String t1) { // assertTrue(ts.getOnErrorEvents().get(0).getCause().getMessage().contains("abc")); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTest.java index 26d0c4b3f3..7f4d876a79 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTest.java @@ -42,7 +42,7 @@ public void before() { @Test public void testThrottlingWithCompleted() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -70,7 +70,7 @@ public void subscribe(Observer NbpObserver) { @Test public void testThrottlingWithError() { - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -149,4 +149,4 @@ public void testThrottle() { inOrder.verify(NbpObserver).onComplete(); inOrder.verifyNoMoreInteractions(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutTests.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutTests.java index 51494ad4eb..a88bda0b45 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutTests.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutTests.java @@ -238,7 +238,7 @@ public void shouldTimeoutIfSynchronizedObservableEmitFirstOnNextNotWithinTimeout @Override public void run() { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { @@ -273,7 +273,7 @@ public void shouldUnsubscribeFromUnderlyingSubscriptionOnTimeout() throws Interr // From https://github.com/ReactiveX/RxJava/pull/951 final Disposable s = mock(Disposable.class); - Observable never = Observable.create(new ObservableConsumable() { + Observable never = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { NbpSubscriber.onSubscribe(s); @@ -302,7 +302,7 @@ public void shouldUnsubscribeFromUnderlyingSubscriptionOnImmediatelyComplete() { // From https://github.com/ReactiveX/RxJava/pull/951 final Disposable s = mock(Disposable.class); - Observable immediatelyComplete = Observable.create(new ObservableConsumable() { + Observable immediatelyComplete = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { NbpSubscriber.onSubscribe(s); @@ -333,7 +333,7 @@ public void shouldUnsubscribeFromUnderlyingSubscriptionOnImmediatelyErrored() th // From https://github.com/ReactiveX/RxJava/pull/951 final Disposable s = mock(Disposable.class); - Observable immediatelyError = Observable.create(new ObservableConsumable() { + Observable immediatelyError = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { NbpSubscriber.onSubscribe(s); @@ -357,4 +357,4 @@ public void subscribe(Observer NbpSubscriber) { verify(s, times(1)).dispose(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutWithSelectorTest.java index 481993593f..3535235344 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutWithSelectorTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutWithSelectorTest.java @@ -325,7 +325,7 @@ public void testTimeoutSelectorWithTimeoutAndOnNextRaceCondition() throws Interr public Observable apply(Integer t1) { if (t1 == 1) { // Force "unsubscribe" run on another thread - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpSubscriber) { NbpSubscriber.onSubscribe(EmptyDisposable.INSTANCE); @@ -417,4 +417,4 @@ public void run() { inOrder.verify(o).onComplete(); inOrder.verifyNoMoreInteractions(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOnTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOnTest.java index 658b8fb040..555767822e 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOnTest.java @@ -33,7 +33,7 @@ public void testUnsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnSameThread() thro try { final ThreadSubscription subscription = new ThreadSubscription(); final AtomicReference subscribeThread = new AtomicReference(); - Observable w = Observable.create(new ObservableConsumable() { + Observable w = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t1) { @@ -77,7 +77,7 @@ public void testUnsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnDifferentThreads( try { final ThreadSubscription subscription = new ThreadSubscription(); final AtomicReference subscribeThread = new AtomicReference(); - Observable w = Observable.create(new ObservableConsumable() { + Observable w = Observable.create(new ObservableSource() { @Override public void subscribe(Observer t1) { @@ -181,4 +181,4 @@ public Thread getThread() { } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableUsingTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableUsingTest.java index 95d18c835e..160fc4e382 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableUsingTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableUsingTest.java @@ -253,7 +253,7 @@ public Disposable call() { Function> observableFactory = new Function>() { @Override public Observable apply(Disposable subscription) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer t1) { throw new TestException(); @@ -433,4 +433,4 @@ public void run() { }; } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java index 6aeb12d5d3..deee73f68a 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import io.reactivex.Observable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.*; import io.reactivex.functions.*; @@ -198,7 +198,7 @@ private List list(String... args) { public static Observable hotStream() { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { Disposable d = Disposables.empty(); @@ -241,4 +241,4 @@ public Observable apply(Observable w) { ts.assertComplete(); ts.assertValueCount(22); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java index cf5bf01492..715cf711b1 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java @@ -45,7 +45,7 @@ public void testObservableBasedOpenerAndCloser() { final List list = new ArrayList(); final List> lists = new ArrayList>(); - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -58,7 +58,7 @@ public void subscribe(Observer NbpObserver) { } }); - Observable openings = Observable.create(new ObservableConsumable() { + Observable openings = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -71,7 +71,7 @@ public void subscribe(Observer NbpObserver) { Function> closer = new Function>() { @Override public Observable apply(Object opening) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -96,7 +96,7 @@ public void testObservableBasedCloser() { final List list = new ArrayList(); final List> lists = new ArrayList>(); - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -113,7 +113,7 @@ public void subscribe(Observer NbpObserver) { int calls; @Override public Observable call() { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -257,4 +257,4 @@ public Observable apply(Integer t) { // FIXME subject has subscribers because of the open window assertTrue(close.hasSubscribers()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java index 4605dc01be..626be34095 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java @@ -46,7 +46,7 @@ public void testTimedAndCount() { final List list = new ArrayList(); final List> lists = new ArrayList>(); - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -80,7 +80,7 @@ public void testTimed() { final List list = new ArrayList(); final List> lists = new ArrayList>(); - Observable source = Observable.create(new ObservableConsumable() { + Observable source = Observable.create(new ObservableSource() { @Override public void subscribe(Observer NbpObserver) { NbpObserver.onSubscribe(EmptyDisposable.INSTANCE); @@ -219,4 +219,4 @@ public void accept(Integer pv) { Assert.assertTrue(ts.valueCount() != 0); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableZipTest.java index 5c72a8bfaf..84ff807517 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableZipTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableZipTest.java @@ -616,7 +616,7 @@ private static String getStringValue(Object o) { } } - private static class TestObservable implements ObservableConsumable { + private static class TestObservable implements ObservableSource { Observer NbpObserver; @@ -1051,7 +1051,7 @@ public boolean hasNext() { Observable OBSERVABLE_OF_5_INTEGERS = OBSERVABLE_OF_5_INTEGERS(new AtomicInteger()); Observable OBSERVABLE_OF_5_INTEGERS(final AtomicInteger numEmitted) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(final Observer o) { @@ -1072,7 +1072,7 @@ public void subscribe(final Observer o) { } Observable ASYNC_OBSERVABLE_OF_INFINITE_INTEGERS(final CountDownLatch latch) { - return Observable.create(new ObservableConsumable() { + return Observable.create(new ObservableSource() { @Override public void subscribe(final Observer o) { @@ -1147,4 +1147,4 @@ public Integer apply(Integer t1, Integer t2) { Assert.assertEquals(11, value); } } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/observable/ObservableConcatTests.java b/src/test/java/io/reactivex/observable/ObservableConcatTests.java index ca8ad5c77c..0842d27826 100644 --- a/src/test/java/io/reactivex/observable/ObservableConcatTests.java +++ b/src/test/java/io/reactivex/observable/ObservableConcatTests.java @@ -19,7 +19,7 @@ import org.junit.Test; import io.reactivex.Observable; -import io.reactivex.ObservableConsumable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.observable.ObservableCovarianceTest.*; @@ -145,7 +145,7 @@ public void testConcatCovariance4() { Media media = new Media(); HorrorMovie horrorMovie2 = new HorrorMovie(); - Observable o1 = Observable.create(new ObservableConsumable() { + Observable o1 = Observable.create(new ObservableSource() { @Override public void subscribe(Observer o) { o.onNext(horrorMovie1); @@ -165,4 +165,4 @@ public void subscribe(Observer o) { assertEquals(horrorMovie2, values.get(3)); assertEquals(4, values.size()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java b/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java index 9fae1906dc..560476e0e5 100644 --- a/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java +++ b/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import io.reactivex.Observable; -import io.reactivex.Observable.Transformer; +import io.reactivex.ObservableTransformer; import io.reactivex.functions.*; import io.reactivex.observables.GroupedObservable; import io.reactivex.observers.TestObserver; @@ -207,7 +207,7 @@ public Observable apply(List> listOfLists) { } }; - static Transformer, Movie> deltaTransformer = new Transformer, Movie>() { + static ObservableTransformer, Movie> deltaTransformer = new ObservableTransformer, Movie>() { @Override public Observable apply(Observable> movieList) { return movieList diff --git a/src/test/java/io/reactivex/observable/ObservableNullTests.java b/src/test/java/io/reactivex/observable/ObservableNullTests.java index e95716e2f3..ecdaf6272c 100644 --- a/src/test/java/io/reactivex/observable/ObservableNullTests.java +++ b/src/test/java/io/reactivex/observable/ObservableNullTests.java @@ -21,7 +21,7 @@ import io.reactivex.*; import io.reactivex.Observable; -import io.reactivex.Observable.Operator; +import io.reactivex.ObservableOperator; import io.reactivex.Observer; import io.reactivex.Optional; import io.reactivex.disposables.Disposable; @@ -1618,7 +1618,7 @@ public void liftNull() { @Test(expected = NullPointerException.class) public void liftReturnsNull() { - just1.lift(new Operator() { + just1.lift(new ObservableOperator() { @Override public Observer apply(Observer s) { return null; @@ -2787,4 +2787,4 @@ public Object apply(Integer a, Integer b) { }).toBlocking().run(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/observable/ObservableSubscriberTest.java b/src/test/java/io/reactivex/observable/ObservableSubscriberTest.java index 59936aeec7..111bc9ccfd 100644 --- a/src/test/java/io/reactivex/observable/ObservableSubscriberTest.java +++ b/src/test/java/io/reactivex/observable/ObservableSubscriberTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import io.reactivex.*; -import io.reactivex.Observable.Operator; +import io.reactivex.ObservableOperator; import io.reactivex.observers.DefaultObserver; public class ObservableSubscriberTest { @@ -85,7 +85,7 @@ public void onNext(Integer t) { @Test public void testOnStartCalledOnceViaLift() { final AtomicInteger c = new AtomicInteger(); - Observable.just(1, 2, 3, 4).lift(new Operator() { + Observable.just(1, 2, 3, 4).lift(new ObservableOperator() { @Override public Observer apply(final Observer child) { @@ -118,4 +118,4 @@ public void onNext(Integer t) { assertEquals(1, c.get()); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/observable/ObservableTests.java b/src/test/java/io/reactivex/observable/ObservableTests.java index f63d950775..86c7791cab 100644 --- a/src/test/java/io/reactivex/observable/ObservableTests.java +++ b/src/test/java/io/reactivex/observable/ObservableTests.java @@ -275,7 +275,7 @@ public void testOnSubscribeFails() { Observer observer = TestHelper.mockObserver(); final RuntimeException re = new RuntimeException("bad impl"); - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(Observer s) { throw re; } }); @@ -442,7 +442,7 @@ public void onNext(String v) { @Test public void testPublishLast() throws InterruptedException { final AtomicInteger count = new AtomicInteger(); - ConnectableObservable connectable = Observable.create(new ObservableConsumable() { + ConnectableObservable connectable = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer observer) { observer.onSubscribe(EmptyDisposable.INSTANCE); @@ -480,7 +480,7 @@ public void accept(String value) { @Test public void testReplay() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - ConnectableObservable o = Observable.create(new ObservableConsumable() { + ConnectableObservable o = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer observer) { observer.onSubscribe(EmptyDisposable.INSTANCE); @@ -533,7 +533,7 @@ public void accept(String v) { @Test public void testCache() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer observer) { observer.onSubscribe(EmptyDisposable.INSTANCE); @@ -578,7 +578,7 @@ public void accept(String v) { @Test public void testCacheWithCapacity() throws InterruptedException { final AtomicInteger counter = new AtomicInteger(); - Observable o = Observable.create(new ObservableConsumable() { + Observable o = Observable.create(new ObservableSource() { @Override public void subscribe(final Observer observer) { observer.onSubscribe(EmptyDisposable.INSTANCE); @@ -657,7 +657,7 @@ public void testErrorThrownWithoutErrorHandlerSynchronous() { public void testErrorThrownWithoutErrorHandlerAsynchronous() throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); final AtomicReference exception = new AtomicReference(); - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(final Observer observer) { new Thread(new Runnable() { @@ -1089,4 +1089,4 @@ public Object apply(Observable onSubscribe) { } }); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java index 379fbc63e5..9a8d3dccba 100644 --- a/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java +++ b/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java @@ -38,7 +38,7 @@ public void testReplaySubjectConcurrentSubscribersDoingReplayDontBlockEachOther( @Override public void run() { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer o) { @@ -148,7 +148,7 @@ public void testReplaySubjectConcurrentSubscriptions() throws InterruptedExcepti @Override public void run() { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer o) { @@ -554,4 +554,4 @@ public void run() { t.join(); } -} \ No newline at end of file +} diff --git a/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java index 63673239fe..deb74e7c2d 100644 --- a/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java +++ b/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java @@ -38,7 +38,7 @@ public void testNbpReplaySubjectConcurrentSubscribersDoingReplayDontBlockEachOth @Override public void run() { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer o) { @@ -148,7 +148,7 @@ public void testNbpReplaySubjectConcurrentSubscriptions() throws InterruptedExce @Override public void run() { - Observable.create(new ObservableConsumable() { + Observable.create(new ObservableSource() { @Override public void subscribe(Observer o) { @@ -444,4 +444,4 @@ public void run() { t.join(); } -} \ No newline at end of file +}