Change OnSubscribeFunc.call to OnSubscribeFunc.onSubscribe

Avoid name collions for `call` method with Func* interfaces to simplify interop with Clojure etc.

Author: benjchristensen

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyOnSubscribeFuncWrapper.java

@@ -34,7 +34,7 @@ public GroovyOnSubscribeFuncWrapper(Closure<Subscription> closure) {
     }
 
     @Override
-    public Subscription call(Observer<? super T> observer) {
+    public Subscription onSubscribe(Observer<? super T> observer) {
         return closure.call(observer);
     }
 

language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/ObservableTests.groovy

@@ -299,7 +299,7 @@ def class ObservableTests {
 
     def class AsyncObservable implements OnSubscribeFunc {
 
-        public Subscription call(final Observer<Integer> observer) {
+        public Subscription onSubscribe(final Observer<Integer> observer) {
             new Thread(new Runnable() {
                 public void run() {
                     try {

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/RxImplicits.scala

@@ -103,7 +103,7 @@ object RxImplicits {
 
     implicit def onSubscribeFunc[A](f: (Observer[_ >: A]) => Subscription): OnSubscribeFunc[A] =
         new OnSubscribeFunc[A] {
-            override def call(a: Observer[_ >: A]) = f(a)
+            override def onSubscribe(a: Observer[_ >: A]) = f(a)
         }
 
     /**

rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/AbstractButtonSource.java

@@ -42,7 +42,7 @@ public enum AbstractButtonSource { ; // no instances
     public static Observable<ActionEvent> fromActionOf(final AbstractButton button) {
         return Observable.create(new OnSubscribeFunc<ActionEvent>() {
             @Override
-            public Subscription call(final Observer<? super ActionEvent> observer) {
+            public Subscription onSubscribe(final Observer<? super ActionEvent> observer) {
                 final ActionListener listener = new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent e) {

rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/ComponentEventSource.java

@@ -39,7 +39,7 @@ public enum ComponentEventSource { ; // no instances
     public static Observable<ComponentEvent> fromComponentEventsOf(final Component component) {
         return Observable.create(new OnSubscribeFunc<ComponentEvent>() {
             @Override
-            public Subscription call(final Observer<? super ComponentEvent> observer) {
+            public Subscription onSubscribe(final Observer<? super ComponentEvent> observer) {
                 final ComponentListener listener = new ComponentListener() {
                     @Override
                     public void componentHidden(ComponentEvent event) {

rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/KeyEventSource.java

@@ -48,7 +48,7 @@ public enum KeyEventSource { ; // no instances
     public static Observable<KeyEvent> fromKeyEventsOf(final Component component) {
         return Observable.create(new OnSubscribeFunc<KeyEvent>() {
             @Override
-            public Subscription call(final Observer<? super KeyEvent> observer) {
+            public Subscription onSubscribe(final Observer<? super KeyEvent> observer) {
                 final KeyListener listener = new KeyListener() {
                     @Override
                     public void keyPressed(KeyEvent event) {

rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/MouseEventSource.java

@@ -36,7 +36,7 @@ public enum MouseEventSource { ; // no instances
     public static Observable<MouseEvent> fromMouseEventsOf(final Component component) {
         return Observable.create(new OnSubscribeFunc<MouseEvent>() {
             @Override
-            public Subscription call(final Observer<? super MouseEvent> observer) {
+            public Subscription onSubscribe(final Observer<? super MouseEvent> observer) {
                 final MouseListener listener = new MouseListener() {
                     @Override
                     public void mouseClicked(MouseEvent event) {
@@ -81,7 +81,7 @@ public void call() {
     public static Observable<MouseEvent> fromMouseMotionEventsOf(final Component component) {
         return Observable.create(new OnSubscribeFunc<MouseEvent>() {
             @Override
-            public Subscription call(final Observer<? super MouseEvent> observer) {
+            public Subscription onSubscribe(final Observer<? super MouseEvent> observer) {
                 final MouseMotionListener listener = new MouseMotionListener() {
                     @Override
                     public void mouseDragged(MouseEvent event) {

rxjava-core/src/main/java/rx/Observable.java

@@ -120,9 +120,9 @@ public class Observable<T> {
      * 
      * @param <T>
      */
-    public static interface OnSubscribeFunc<T> extends Function<T> {
+    public static interface OnSubscribeFunc<T> extends Function {
 
-        public Subscription call(Observer<? super T> t1);
+        public Subscription onSubscribe(Observer<? super T> t1);
 
     }
 
@@ -133,7 +133,7 @@ public static interface OnSubscribeFunc<T> extends Function<T> {
      * specifically have a need for inheritance.
      * 
      * @param onSubscribe
-     *            {@link Func1} to be executed when {@link #subscribe(Observer)} is called.
+     *            {@link OnSubscribeFunc} to be executed when {@link #subscribe(Observer)} is called.
      */
     protected Observable(OnSubscribeFunc<T> onSubscribe) {
         this.onSubscribe = onSubscribe;
@@ -187,7 +187,7 @@ public Subscription subscribe(Observer<? super T> observer) {
              * See https://github.com/Netflix/RxJava/issues/216 for discussion on "Guideline 6.4: Protect calls to user code from within an operator"
              */
             if (isInternalImplementation(observer)) {
-                Subscription s = onSubscribeFunction.call(observer);
+                Subscription s = onSubscribeFunction.onSubscribe(observer);
                 if (s == null) {
                     // this generally shouldn't be the case on a 'trusted' onSubscribe but in case it happens
                     // we want to gracefully handle it the same as AtomicObservableSubscription does
@@ -197,7 +197,7 @@ public Subscription subscribe(Observer<? super T> observer) {
                 }
             } else {
                 SafeObservableSubscription subscription = new SafeObservableSubscription();
-                subscription.wrap(onSubscribeFunction.call(new SafeObserver<T>(subscription, observer)));
+                subscription.wrap(onSubscribeFunction.onSubscribe(new SafeObserver<T>(subscription, observer)));
                 return hook.onSubscribeReturn(this, subscription);
             }
         } catch (OnErrorNotImplementedException e) {
@@ -416,7 +416,7 @@ public NeverObservable() {
             super(new OnSubscribeFunc<T>() {
 
                 @Override
-                public Subscription call(Observer<? super T> t1) {
+                public Subscription onSubscribe(Observer<? super T> t1) {
                     return Subscriptions.empty();
                 }
 
@@ -443,7 +443,7 @@ public ThrowObservable(final Throwable exception) {
                  * @return a reference to the subscription
                  */
                 @Override
-                public Subscription call(Observer<? super T> observer) {
+                public Subscription onSubscribe(Observer<? super T> observer) {
                     observer.onError(exception);
                     return Subscriptions.empty();
                 }

rxjava-core/src/main/java/rx/observables/BlockingObservable.java

@@ -79,7 +79,7 @@ public static <T> BlockingObservable<T> from(final Observable<? extends T> o) {
         return new BlockingObservable<T>(new OnSubscribeFunc<T>() {
 
             @Override
-            public Subscription call(Observer<? super T> observer) {
+            public Subscription onSubscribe(Observer<? super T> observer) {
                 return o.subscribe(observer);
             }
         });
@@ -787,7 +787,7 @@ public void testToIterableWithException() {
             BlockingObservable<String> obs = BlockingObservable.from(create(new OnSubscribeFunc<String>() {
 
                 @Override
-                public Subscription call(Observer<? super String> observer) {
+                public Subscription onSubscribe(Observer<? super String> observer) {
                     observer.onNext("one");
                     observer.onError(new TestException());
                     return Subscriptions.empty();
@@ -810,7 +810,7 @@ public void testForEachWithError() {
                 BlockingObservable.from(Observable.create(new OnSubscribeFunc<String>() {
 
                     @Override
-                    public Subscription call(final Observer<? super String> observer) {
+                    public Subscription onSubscribe(final Observer<? super String> observer) {
                         final BooleanSubscription subscription = new BooleanSubscription();
                         new Thread(new Runnable() {
 

rxjava-core/src/main/java/rx/operators/OperationAll.java

@@ -53,7 +53,7 @@ private AllObservable(Observable<? extends T> sequence, Func1<? super T, Boolean
 
 
         @Override
-        public Subscription call(final Observer<? super Boolean> observer) {
+        public Subscription onSubscribe(final Observer<? super Boolean> observer) {
             return subscription.wrap(sequence.subscribe(new AllObserver(observer)));
 
         }