Rename FlowableSource to FlowableWithUpstream to match ObservableWithUpstream. (ReactiveX#4314)

JakeWharton · akarnokd · commit f7d780956024 · 2016-08-08T16:30:03.000+02:00
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBuffer.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableBuffer.java
@@ -26,7 +26,7 @@
 import io.reactivex.internal.util.*;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class FlowableBuffer<T, C extends Collection<? super T>> extends FlowableSource<T, C> {
+public final class FlowableBuffer<T, C extends Collection<? super T>> extends FlowableWithUpstream<T, C> {
     final int size;
 
     final int skip;
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMap.java
@@ -26,7 +26,7 @@
 import io.reactivex.internal.util.ExceptionHelper;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class FlowableConcatMap<T, R> extends FlowableSource<T, R> {
+public final class FlowableConcatMap<T, R> extends FlowableWithUpstream<T, R> {
 
     final Function<? super T, ? extends Publisher<? extends R>> mapper;
     
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEager.java
@@ -28,7 +28,7 @@
 import io.reactivex.internal.util.*;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public class FlowableConcatMapEager<T, R> extends FlowableSource<T, R> {
+public class FlowableConcatMapEager<T, R> extends FlowableWithUpstream<T, R> {
 
     final Function<? super T, ? extends Publisher<? extends R>> mapper;
     
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDetach.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableDetach.java
@@ -18,7 +18,7 @@
 import io.reactivex.internal.subscribers.flowable.EmptyComponent;
 import io.reactivex.internal.subscriptions.SubscriptionHelper;
 
-public final class FlowableDetach<T> extends FlowableSource<T, T> {
+public final class FlowableDetach<T> extends FlowableWithUpstream<T, T> {
 
     public FlowableDetach(Publisher<T> source) {
         super(source);
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDistinctUntilChanged.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableDistinctUntilChanged.java
@@ -19,7 +19,7 @@
 import io.reactivex.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.internal.subscribers.flowable.*;
 
-public final class FlowableDistinctUntilChanged<T> extends FlowableSource<T, T> {
+public final class FlowableDistinctUntilChanged<T> extends FlowableWithUpstream<T, T> {
 
     final BiPredicate<? super T, ? super T> comparer;
 
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoOnLifecycle.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoOnLifecycle.java
@@ -19,7 +19,7 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
-public final class FlowableDoOnLifecycle<T> extends FlowableSource<T, T> {
+public final class FlowableDoOnLifecycle<T> extends FlowableWithUpstream<T, T> {
     private final Consumer<? super Subscription> onSubscribe;
     private final LongConsumer onRequest;
     private final Runnable onCancel;
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFilter.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableFilter.java
@@ -19,7 +19,7 @@
 import io.reactivex.internal.fuseable.*;
 import io.reactivex.internal.subscribers.flowable.*;
 
-public final class FlowableFilter<T> extends FlowableSource<T, T> {
+public final class FlowableFilter<T> extends FlowableWithUpstream<T, T> {
     final Predicate<? super T> predicate;
     public FlowableFilter(Publisher<T> source, Predicate<? super T> predicate) {
         super(source);
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterable.java
@@ -28,7 +28,7 @@
 import io.reactivex.internal.util.*;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public final class FlowableFlattenIterable<T, R> extends FlowableSource<T, R> {
+public final class FlowableFlattenIterable<T, R> extends FlowableWithUpstream<T, R> {
 
     final Function<? super T, ? extends Iterable<? extends R>> mapper;
 
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupJoin.java
@@ -33,7 +33,7 @@
 import io.reactivex.plugins.RxJavaPlugins;
 import io.reactivex.processors.UnicastProcessor;
 
-public class FlowableGroupJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends FlowableSource<TLeft, R> {
+public class FlowableGroupJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends FlowableWithUpstream<TLeft, R> {
 
     final Publisher<? extends TRight> other;
     
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableHide.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableHide.java
@@ -23,7 +23,7 @@
  * 
  * @since 2.0
  */
-public class FlowableHide<T> extends FlowableSource<T, T> {
+public class FlowableHide<T> extends FlowableWithUpstream<T, T> {
     
     public FlowableHide(Publisher<T> source) {
         super(source);
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableJoin.java
@@ -29,7 +29,7 @@
 import io.reactivex.internal.util.*;
 import io.reactivex.plugins.RxJavaPlugins;
 
-public class FlowableJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends FlowableSource<TLeft, R> {
+public class FlowableJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends FlowableWithUpstream<TLeft, R> {
 
     final Publisher<? extends TRight> other;
     
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableObserveOn.java
@@ -26,7 +26,7 @@
 import io.reactivex.internal.subscriptions.*;
 import io.reactivex.internal.util.BackpressureHelper;
 
-public final class FlowableObserveOn<T> extends FlowableSource<T, T> {
+public final class FlowableObserveOn<T> extends FlowableWithUpstream<T, T> {
 final Scheduler scheduler;
     
     final boolean delayError;
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSerialized.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableSerialized.java
@@ -16,7 +16,7 @@
 import io.reactivex.subscribers.SerializedSubscriber;
 import org.reactivestreams.Subscriber;
 
-public final class FlowableSerialized<T> extends FlowableSource<T, T> {
+public final class FlowableSerialized<T> extends FlowableWithUpstream<T, T> {
     public FlowableSerialized(Flowable<T> source) {
         super(source);
     }
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindow.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindow.java
@@ -25,7 +25,7 @@
 import io.reactivex.plugins.RxJavaPlugins;
 import io.reactivex.processors.UnicastProcessor;
 
-public final class FlowableWindow<T> extends FlowableSource<T, Flowable<T>> {
+public final class FlowableWindow<T> extends FlowableWithUpstream<T, Flowable<T>> {
     final long size;
     
     final long skip;
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWithUpstream.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableWithUpstream.java
@@ -25,7 +25,7 @@
  * @param <T> the upstream value type
  * @param <R> the output value type
  */
-public abstract class FlowableSource<T, R> extends Flowable<R> {
+public abstract class FlowableWithUpstream<T, R> extends Flowable<R> {
     
     /**
      * The upstream source Publisher.
@@ -37,7 +37,7 @@ public abstract class FlowableSource<T, R> extends Flowable<R> {
      * source Publisher.
      * @param source the source (upstream) Publisher instance, not null (verified)
      */
-    public FlowableSource(Publisher<T> source) {
+    public FlowableWithUpstream(Publisher<T> source) {
         this.source = Objects.requireNonNull(source, "source is null");
     }
     

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*`
`24`	`24`	`* @since 2.0`
`25`	`25`	`*/`
`26`		`-public class FlowableHide<T> extends FlowableSource<T, T> {`
	`26`	`+public class FlowableHide<T> extends FlowableWithUpstream<T, T> {`
`27`	`27`
`28`	`28`	`public FlowableHide(Publisher<T> source) {`
`29`	`29`	`super(source);`