2.x: Rename ObservableSource to ObservableWithUpstream

src/main/java/io/reactivex/internal/operators/observable/ObservableCollect.java

@@ -19,7 +19,7 @@
 import io.reactivex.functions.BiConsumer;
 import io.reactivex.internal.disposables.*;
 
-public final class ObservableCollect<T, U> extends ObservableSource<T, U> {
+public final class ObservableCollect<T, U> extends ObservableWithUpstream<T, U> {
     final Callable<? extends U> initialSupplier;
     final BiConsumer<? super U, ? super T> collector;
 
@@ -103,4 +103,4 @@ public void onComplete() {
             actual.onComplete();
         }
     }
-}
+}

src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMap.java

@@ -25,7 +25,7 @@
 import io.reactivex.observers.SerializedObserver;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableConcatMap<T, U> extends ObservableSource<T, U> {
+public final class ObservableConcatMap<T, U> extends ObservableWithUpstream<T, U> {
     final Function<? super T, ? extends ObservableConsumable<? extends U>> mapper;
     final int bufferSize;
     public ObservableConcatMap(ObservableConsumable<T> source, Function<? super T, ? extends ObservableConsumable<? extends U>> mapper, int bufferSize) {
@@ -245,4 +245,4 @@ public void onComplete() {
             parent.innerComplete();
         }
     }
-}
+}

src/main/java/io/reactivex/internal/operators/observable/ObservableCount.java

@@ -17,7 +17,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableCount<T> extends ObservableSource<T, Long> {
+public final class ObservableCount<T> extends ObservableWithUpstream<T, Long> {
     public ObservableCount(ObservableConsumable<T> source) {
         super(source);
     }

src/main/java/io/reactivex/internal/operators/observable/ObservableDebounce.java

@@ -23,7 +23,7 @@
 import io.reactivex.observers.SerializedObserver;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableDebounce<T, U> extends ObservableSource<T, T> {
+public final class ObservableDebounce<T, U> extends ObservableWithUpstream<T, T> {
     final Function<? super T, ? extends ObservableConsumable<U>> debounceSelector;
 
     public ObservableDebounce(ObservableConsumable<T> source, Function<? super T, ? extends ObservableConsumable<U>> debounceSelector) {

src/main/java/io/reactivex/internal/operators/observable/ObservableDebounceTimed.java

@@ -23,7 +23,7 @@
 import io.reactivex.observers.SerializedObserver;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableDebounceTimed<T> extends ObservableSource<T, T> {
+public final class ObservableDebounceTimed<T> extends ObservableWithUpstream<T, T> {
     final long timeout;
     final TimeUnit unit;
     final Scheduler scheduler;

src/main/java/io/reactivex/internal/operators/observable/ObservableDelay.java

@@ -21,7 +21,7 @@
 import io.reactivex.internal.disposables.DisposableHelper;
 import io.reactivex.observers.SerializedObserver;
 
-public final class ObservableDelay<T> extends ObservableSource<T, T> {
+public final class ObservableDelay<T> extends ObservableWithUpstream<T, T> {
     final long delay;
     final TimeUnit unit;
     final Scheduler scheduler;

src/main/java/io/reactivex/internal/operators/observable/ObservableDematerialize.java

@@ -18,7 +18,7 @@
 import io.reactivex.internal.disposables.DisposableHelper;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableDematerialize<T> extends ObservableSource<Try<Optional<T>>, T> {
+public final class ObservableDematerialize<T> extends ObservableWithUpstream<Try<Optional<T>>, T> {
 
     public ObservableDematerialize(ObservableConsumable<Try<Optional<T>>> source) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java

@@ -23,7 +23,7 @@
 import io.reactivex.internal.disposables.*;
 import io.reactivex.internal.functions.*;
 
-public final class ObservableDistinct<T, K> extends ObservableSource<T, T> {
+public final class ObservableDistinct<T, K> extends ObservableWithUpstream<T, T> {
     final Function<? super T, K> keySelector;
     final Callable<? extends Predicate<? super K>> predicateSupplier;
 

src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnEach.java

@@ -20,7 +20,7 @@
 import io.reactivex.internal.disposables.DisposableHelper;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableDoOnEach<T> extends ObservableSource<T, T> {
+public final class ObservableDoOnEach<T> extends ObservableWithUpstream<T, T> {
     final Consumer<? super T> onNext;
     final Consumer<? super Throwable> onError;
     final Runnable onComplete;

src/main/java/io/reactivex/internal/operators/observable/ObservableElementAt.java

@@ -17,7 +17,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableElementAt<T> extends ObservableSource<T, T> {
+public final class ObservableElementAt<T> extends ObservableWithUpstream<T, T> {
     final long index;
     final T defaultValue;
     public ObservableElementAt(ObservableConsumable<T> source, long index, T defaultValue) {

src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java

@@ -18,7 +18,7 @@
 import io.reactivex.functions.Predicate;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableFilter<T> extends ObservableSource<T, T> {
+public final class ObservableFilter<T> extends ObservableWithUpstream<T, T> {
     final Predicate<? super T> predicate;
     public ObservableFilter(ObservableConsumable<T> source, Predicate<? super T> predicate) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMap.java

@@ -25,7 +25,7 @@
 import io.reactivex.internal.fuseable.*;
 import io.reactivex.internal.queue.*;
 
-public final class ObservableFlatMap<T, U> extends ObservableSource<T, U> {
+public final class ObservableFlatMap<T, U> extends ObservableWithUpstream<T, U> {
     final Function<? super T, ? extends ObservableConsumable<? extends U>> mapper;
     final boolean delayErrors;
     final int maxConcurrency;

src/main/java/io/reactivex/internal/operators/observable/ObservableGroupBy.java

@@ -25,7 +25,7 @@
 import io.reactivex.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.observables.GroupedObservable;
 
-public final class ObservableGroupBy<T, K, V> extends ObservableSource<T, GroupedObservable<K, V>>{
+public final class ObservableGroupBy<T, K, V> extends ObservableWithUpstream<T, GroupedObservable<K, V>> {
     final Function<? super T, ? extends K> keySelector;
     final Function<? super T, ? extends V> valueSelector;
     final int bufferSize;
@@ -353,4 +353,4 @@ boolean checkTerminated(boolean d, boolean empty, Observer<? super T> a, boolean
             return false;
         }
     }
-}
+}

src/main/java/io/reactivex/internal/operators/observable/ObservableGroupJoin.java

@@ -34,7 +34,7 @@
 import io.reactivex.plugins.RxJavaPlugins;
 import io.reactivex.subjects.UnicastSubject;
 
-public class ObservableGroupJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends ObservableSource<TLeft, R> {
+public class ObservableGroupJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends ObservableWithUpstream<TLeft, R> {
 
     final ObservableConsumable<? extends TRight> other;
 

src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElements.java

@@ -16,7 +16,7 @@
 import io.reactivex.*;
 import io.reactivex.disposables.Disposable;
 
-public final class ObservableIgnoreElements<T> extends ObservableSource<T, T> {
+public final class ObservableIgnoreElements<T> extends ObservableWithUpstream<T, T> {
 
     public ObservableIgnoreElements(ObservableConsumable<T> source) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableJoin.java

@@ -32,7 +32,7 @@
 import io.reactivex.internal.util.ExceptionHelper;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public class ObservableJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends ObservableSource<TLeft, R> {
+public class ObservableJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends ObservableWithUpstream<TLeft, R> {
 
     final ObservableConsumable<? extends TRight> other;
 

src/main/java/io/reactivex/internal/operators/observable/ObservableMap.java

@@ -20,7 +20,7 @@
 import io.reactivex.internal.disposables.DisposableHelper;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableMap<T, U> extends ObservableSource<T, U> {
+public final class ObservableMap<T, U> extends ObservableWithUpstream<T, U> {
     final Function<? super T, ? extends U> function;
 
     public ObservableMap(ObservableConsumable<T> source, Function<? super T, ? extends U> function) {

src/main/java/io/reactivex/internal/operators/observable/ObservableMapNotification.java

@@ -20,7 +20,7 @@
 import io.reactivex.functions.Function;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableMapNotification<T, R> extends ObservableSource<T, ObservableConsumable<? extends R>>{
+public final class ObservableMapNotification<T, R> extends ObservableWithUpstream<T, ObservableConsumable<? extends R>> {
 
     final Function<? super T, ? extends ObservableConsumable<? extends R>> onNextMapper;
     final Function<? super Throwable, ? extends ObservableConsumable<? extends R>> onErrorMapper;

src/main/java/io/reactivex/internal/operators/observable/ObservableMaterialize.java

@@ -17,7 +17,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableMaterialize<T> extends ObservableSource<T, Try<Optional<T>>> {
+public final class ObservableMaterialize<T> extends ObservableWithUpstream<T, Try<Optional<T>>> {
 
 
     public ObservableMaterialize(ObservableConsumable<T> source) {

src/main/java/io/reactivex/internal/operators/observable/ObservableObserveOn.java

@@ -23,7 +23,7 @@
 import io.reactivex.internal.schedulers.TrampolineScheduler;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableObserveOn<T> extends ObservableSource<T, T> {
+public final class ObservableObserveOn<T> extends ObservableWithUpstream<T, T> {
     final Scheduler scheduler;
     final boolean delayError;
     final int bufferSize;

src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java

@@ -19,7 +19,7 @@
 import io.reactivex.functions.Function;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableOnErrorNext<T> extends ObservableSource<T, T> {
+public final class ObservableOnErrorNext<T> extends ObservableWithUpstream<T, T> {
     final Function<? super Throwable, ? extends ObservableConsumable<? extends T>> nextSupplier;
     final boolean allowFatal;
 
@@ -113,4 +113,4 @@ public void onComplete() {
             actual.onComplete();
         }
     }
-}
+}

src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java

@@ -19,7 +19,7 @@
 import io.reactivex.functions.Function;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableOnErrorReturn<T> extends ObservableSource<T, T> {
+public final class ObservableOnErrorReturn<T> extends ObservableWithUpstream<T, T> {
     final Function<? super Throwable, ? extends T> valueSupplier;
     public ObservableOnErrorReturn(ObservableConsumable<T> source, Function<? super Throwable, ? extends T> valueSupplier) {
         super(source);
@@ -95,4 +95,4 @@ public void onComplete() {
             actual.onComplete();
         }
     }
-}
+}

src/main/java/io/reactivex/internal/operators/observable/ObservableSampleTimed.java

@@ -21,7 +21,7 @@
 import io.reactivex.internal.disposables.DisposableHelper;
 import io.reactivex.observers.SerializedObserver;
 
-public final class ObservableSampleTimed<T> extends ObservableSource<T, T> {
+public final class ObservableSampleTimed<T> extends ObservableWithUpstream<T, T> {
     final long period;
     final TimeUnit unit;
     final Scheduler scheduler;

src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java

@@ -20,7 +20,7 @@
 import io.reactivex.internal.disposables.DisposableHelper;
 import io.reactivex.observers.SerializedObserver;
 
-public final class ObservableSampleWithObservable<T> extends ObservableSource<T, T> {
+public final class ObservableSampleWithObservable<T> extends ObservableWithUpstream<T, T> {
     final ObservableConsumable<?> other;
 
     public ObservableSampleWithObservable(ObservableConsumable<T> source, ObservableConsumable<?> other) {

src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java

@@ -18,7 +18,7 @@
 import io.reactivex.functions.BiFunction;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableScan<T> extends ObservableSource<T, T> {
+public final class ObservableScan<T> extends ObservableWithUpstream<T, T> {
     final BiFunction<T, T, T> accumulator;
     public ObservableScan(ObservableConsumable<T> source, BiFunction<T, T, T> accumulator) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableScanSeed.java

@@ -20,7 +20,7 @@
 import io.reactivex.internal.disposables.*;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableScanSeed<T, R> extends ObservableSource<T, R> {
+public final class ObservableScanSeed<T, R> extends ObservableWithUpstream<T, R> {
     final BiFunction<R, ? super T, R> accumulator;
     final Callable<R> seedSupplier;
 

src/main/java/io/reactivex/internal/operators/observable/ObservableSingle.java

@@ -19,7 +19,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableSingle<T> extends ObservableSource<T, T> {
+public final class ObservableSingle<T> extends ObservableWithUpstream<T, T> {
 
     final T defaultValue;
 

src/main/java/io/reactivex/internal/operators/observable/ObservableSkip.java

@@ -16,7 +16,7 @@
 import io.reactivex.*;
 import io.reactivex.disposables.Disposable;
 
-public final class ObservableSkip<T> extends ObservableSource<T, T> {
+public final class ObservableSkip<T> extends ObservableWithUpstream<T, T> {
     final long n;
     public ObservableSkip(ObservableConsumable<T> source, long n) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLast.java

@@ -19,7 +19,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableSkipLast<T> extends ObservableSource<T, T> {
+public final class ObservableSkipLast<T> extends ObservableWithUpstream<T, T> {
     final int skip;
 
     public ObservableSkipLast(ObservableConsumable<T> source, int skip) {

src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimed.java

@@ -21,7 +21,7 @@
 import io.reactivex.internal.disposables.DisposableHelper;
 import io.reactivex.internal.queue.SpscLinkedArrayQueue;
 
-public final class ObservableSkipLastTimed<T> extends ObservableSource<T, T> {
+public final class ObservableSkipLastTimed<T> extends ObservableWithUpstream<T, T> {
     final long time;
     final TimeUnit unit;
     final Scheduler scheduler;

src/main/java/io/reactivex/internal/operators/observable/ObservableSkipUntil.java

@@ -20,7 +20,7 @@
 import io.reactivex.internal.disposables.*;
 import io.reactivex.observers.SerializedObserver;
 
-public final class ObservableSkipUntil<T, U> extends ObservableSource<T, T> {
+public final class ObservableSkipUntil<T, U> extends ObservableWithUpstream<T, T> {
     final ObservableConsumable<U> other;
     public ObservableSkipUntil(ObservableConsumable<T> source, ObservableConsumable<U> other) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableSkipWhile.java

@@ -18,7 +18,7 @@
 import io.reactivex.functions.Predicate;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableSkipWhile<T> extends ObservableSource<T, T> {
+public final class ObservableSkipWhile<T> extends ObservableWithUpstream<T, T> {
     final Predicate<? super T> predicate;
     public ObservableSkipWhile(ObservableConsumable<T> source, Predicate<? super T> predicate) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmpty.java

@@ -16,7 +16,7 @@
 import io.reactivex.*;
 import io.reactivex.disposables.*;
 
-public final class ObservableSwitchIfEmpty<T> extends ObservableSource<T, T> {
+public final class ObservableSwitchIfEmpty<T> extends ObservableWithUpstream<T, T> {
     final ObservableConsumable<? extends T> other;
     public ObservableSwitchIfEmpty(ObservableConsumable<T> source, ObservableConsumable<? extends T> other) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchMap.java

@@ -24,7 +24,7 @@
 import io.reactivex.internal.queue.SpscArrayQueue;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class ObservableSwitchMap<T, R> extends ObservableSource<T, R> {
+public final class ObservableSwitchMap<T, R> extends ObservableWithUpstream<T, R> {
     final Function<? super T, ? extends ObservableConsumable<? extends R>> mapper;
     final int bufferSize;
 

src/main/java/io/reactivex/internal/operators/observable/ObservableTake.java

@@ -17,7 +17,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableTake<T> extends ObservableSource<T, T> {
+public final class ObservableTake<T> extends ObservableWithUpstream<T, T> {
     final long limit;
     public ObservableTake(ObservableConsumable<T> source, long limit) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLast.java

@@ -19,7 +19,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableTakeLast<T> extends ObservableSource<T, T> {
+public final class ObservableTakeLast<T> extends ObservableWithUpstream<T, T> {
     final int count;
 
     public ObservableTakeLast(ObservableConsumable<T> source, int count) {

src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastOne.java

@@ -16,7 +16,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableTakeLastOne<T> extends ObservableSource<T, T> {
+public final class ObservableTakeLastOne<T> extends ObservableWithUpstream<T, T> {
 
     public ObservableTakeLastOne(ObservableConsumable<T> source) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimed.java

@@ -21,7 +21,7 @@
 import io.reactivex.internal.disposables.DisposableHelper;
 import io.reactivex.internal.queue.SpscLinkedArrayQueue;
 
-public final class ObservableTakeLastTimed<T> extends ObservableSource<T, T> {
+public final class ObservableTakeLastTimed<T> extends ObservableWithUpstream<T, T> {
     final long count;
     final long time;
     final TimeUnit unit;

src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntil.java

@@ -20,7 +20,7 @@
 import io.reactivex.internal.disposables.*;
 import io.reactivex.observers.SerializedObserver;
 
-public final class ObservableTakeUntil<T, U> extends ObservableSource<T, T> {
+public final class ObservableTakeUntil<T, U> extends ObservableWithUpstream<T, T> {
     final ObservableConsumable<? extends U> other;
     public ObservableTakeUntil(ObservableConsumable<T> source, ObservableConsumable<? extends U> other) {
         super(source);

src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicate.java

@@ -18,7 +18,7 @@
 import io.reactivex.functions.Predicate;
 import io.reactivex.internal.disposables.DisposableHelper;
 
-public final class ObservableTakeUntilPredicate<T> extends ObservableSource<T, T> {
+public final class ObservableTakeUntilPredicate<T> extends ObservableWithUpstream<T, T> {
     final Predicate<? super T> predicate;
     public ObservableTakeUntilPredicate(ObservableConsumable<T> source, Predicate<? super T> predicate) {
         super(source);