2.x: Rename ObservableSource to ObservableWithUpstream (ReactiveX#4301)

Author: vanniktech

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) {