2.x: Decouple stream operators from Function interface.

src/main/java/io/reactivex/CompletableOperator.java

@@ -13,12 +13,14 @@
 
 package io.reactivex;
 
-import io.reactivex.functions.Function;
-
 /**
- * Convenience interface and callback used by the lift operator that given a child CompletableSubscriber,
- * return a parent CompletableSubscriber that does any kind of lifecycle-related transformations.
+ * Interface to map/wrap a downstream observer to an upstream observer.
  */
-public interface CompletableOperator extends Function<CompletableObserver, CompletableObserver> {
-
+public interface CompletableOperator {
+    /**
+     * Applies a function to the child CompletableObserver and returns a new parent CompletableObserver.
+     * @param observer the child CompletableObservable instance
+     * @return the parent CompletableObserver instance
+     */
+    CompletableObserver apply(CompletableObserver observer) throws Exception;
 }

src/main/java/io/reactivex/FlowableOperator.java

@@ -15,14 +15,17 @@
 
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.functions.Function;
-
 /**
  * Interface to map/wrap a downstream subscriber to an upstream subscriber.
  *
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
  */
-public interface FlowableOperator<Downstream, Upstream> extends Function<Subscriber<? super Downstream>, Subscriber<? super Upstream>> {
-
+public interface FlowableOperator<Downstream, Upstream> {
+    /**
+     * Applies a function to the child Subscriber and returns a new parent Subscriber.
+     * @param observer the child Subscriber instance
+     * @return the parent Subscriber instance
+     */
+    Subscriber<? super Upstream> apply(Subscriber<? super Downstream> observer) throws Exception;
 }

src/main/java/io/reactivex/MaybeOperator.java

@@ -13,14 +13,17 @@
 
 package io.reactivex;
 
-import io.reactivex.functions.Function;
-
 /**
- * Interface to map/wrap a downstream subscriber to an upstream MaybeObserver.
+ * Interface to map/wrap a downstream observer to an upstream observer.
  *
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
  */
-public interface MaybeOperator<Downstream, Upstream> extends Function<MaybeObserver<? super Downstream>, MaybeObserver<? super Upstream>> {
-
+public interface MaybeOperator<Downstream, Upstream> {
+    /**
+     * Applies a function to the child MaybeObserver and returns a new parent MaybeObserver.
+     * @param observer the child MaybeObserver instance
+     * @return the parent MaybeObserver instance
+     */
+    MaybeObserver<? super Upstream> apply(MaybeObserver<? super Downstream> observer) throws Exception;
 }

src/main/java/io/reactivex/ObservableOperator.java

@@ -13,14 +13,17 @@
 
 package io.reactivex;
 
-import io.reactivex.functions.Function;
-
 /**
- * Interface to map/wrap a downstream subscriber to an upstream Observer.
+ * Interface to map/wrap a downstream observer to an upstream observer.
  *
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
  */
-public interface ObservableOperator<Downstream, Upstream> extends Function<Observer<? super Downstream>, Observer<? super Upstream>> {
-
+public interface ObservableOperator<Downstream, Upstream> {
+    /**
+     * Applies a function to the child Observer and returns a new parent Observer.
+     * @param observer the child Observer instance
+     * @return the parent Observer instance
+     */
+    Observer<? super Upstream> apply(Observer<? super Downstream> observer) throws Exception;
 }

src/main/java/io/reactivex/SingleOperator.java

@@ -13,14 +13,17 @@
 
 package io.reactivex;
 
-import io.reactivex.functions.Function;
-
 /**
- * Interface to map/wrap a downstream subscriber to an upstream SingleObserver.
+ * Interface to map/wrap a downstream observer to an upstream observer.
  *
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
  */
-public interface SingleOperator<Downstream, Upstream> extends Function<SingleObserver<? super Downstream>, SingleObserver<? super Upstream>> {
-
+public interface SingleOperator<Downstream, Upstream> {
+    /**
+     * Applies a function to the child SingleObserver and returns a new parent SingleObserver.
+     * @param observer the child SingleObserver instance
+     * @return the parent SingleObserver instance
+     */
+    SingleObserver<? super Upstream> apply(SingleObserver<? super Downstream> observer) throws Exception;
 }