Match updated RxJava API (rx.util.function -> rx.functions etc.)

Author: pron

rxjava-contrib/rxjava-quasar/src/main/java/rx/quasar/BlockingObservable.java

@@ -34,10 +34,10 @@
 import rx.Observer;
 import rx.Subscriber;
 import rx.Subscription;
+import rx.exceptions.Exceptions;
+import rx.functions.Action1;
+import rx.functions.Func1;
 import rx.observers.SafeSubscriber;
-import rx.util.Exceptions;
-import rx.util.functions.Action1;
-import rx.util.functions.Func1;
 
 /**
  * An extension of {@link Observable} that provides blocking operators, compatible with both threads and fibers.

rxjava-contrib/rxjava-quasar/src/main/java/rx/quasar/NewFiberScheduler.java

@@ -26,7 +26,7 @@
 import rx.Subscription;
 import rx.subscriptions.CompositeSubscription;
 import rx.subscriptions.Subscriptions;
-import rx.util.functions.Action1;
+import rx.functions.Action1;
 
 /**
  * Schedules work on a new fiber.
@@ -58,7 +58,7 @@ public Subscription schedule(Action1<Scheduler.Inner> action) {
         innerScheduler.schedule(action);
         return innerScheduler.innerSubscription;
     }
-
+    
     @Override
     public Subscription schedule(Action1<Scheduler.Inner> action, long delayTime, TimeUnit unit) {
         EventLoopScheduler innerScheduler = new EventLoopScheduler();

rxjava-contrib/rxjava-quasar/src/main/java/rx/quasar/RxSuspendableClassifier.java

@@ -25,12 +25,13 @@
 public class RxSuspendableClassifier implements SuspendableClassifier {
     private static final Set<String> CORE_PACKAGES = new HashSet<String>(Arrays.asList(new String[]{
         "rx", "rx.joins", "rx.observables", "rx.observers", "rx.operators", "rx.plugins", "rx.schedulers",
-        "rx.subjects", "rx.subscriptions", "rx.util", "rx.util.functions"
+        "rx.subjects", "rx.subscriptions", "rx.functions", "rx.util", "rx.util.functions"
     }));
 
     private static final Set<String> EXCEPTIONS = new HashSet<String>(Arrays.asList(new String[]{
         "rx/observers/SynchronizedObserver",
-        "rx/schedulers/AbstractSchedulerTests$ConcurrentObserverValidator",}));
+        "rx/schedulers/AbstractSchedulerTests$ConcurrentObserverValidator",
+    }));
 
     private static final Set<String> OBSERVER_METHODS = new HashSet<String>(Arrays.asList(new String[]{
         "onNext(Ljava/lang/Object;)V", "onCompleted()V", "onError(Ljava/lang/Throwable;)V"
@@ -47,6 +48,12 @@ public MethodDatabase.SuspendableType isSuspendable(MethodDatabase db, String cl
             else if (isUtilFunction(db, className, superClassName, interfaces, methodName, methodDesc))
                 s = MethodDatabase.SuspendableType.SUSPENDABLE;
         }
+        if (s == null 
+                && methodName.equals("call")
+                && (className.startsWith("rx/functions/Func") || className.startsWith("rx/functions/Action")
+                || className.startsWith("rx/util/functions/Func") || className.startsWith("rx/util/functions/Action"))) {
+            s = MethodDatabase.SuspendableType.SUSPENDABLE_SUPER;
+        }
         // System.out.println("-- " + className + "." + methodName + ": " + s);
         return s;
     }
@@ -62,9 +69,12 @@ private static boolean isObserverImplementation(MethodDatabase db, String classN
     }
 
     private static boolean isUtilFunction(MethodDatabase db, String className, String superClassName, String[] interfaces, String methodName, String methodDesc) {
-        return (className.startsWith("rx/util/functions/Functions") || className.startsWith("rx/util/functions/Actions"))
+        return (className.startsWith("rx/functions/Functions") || className.startsWith("rx/functions/Actions")
+                || className.startsWith("rx/util/functions/Functions") || className.startsWith("rx/util/functions/Actions"))
                 && methodName.equals(FUNCTION_METHOD)
-                && (SimpleSuspendableClassifier.extendsOrImplements("rx/util/functions/Function", db, className, superClassName, interfaces)
+                && (SimpleSuspendableClassifier.extendsOrImplements("rx/functions/Function", db, className, superClassName, interfaces)
+                || SimpleSuspendableClassifier.extendsOrImplements("rx/functions/Action", db, className, superClassName, interfaces)
+                || SimpleSuspendableClassifier.extendsOrImplements("rx/util/functions/Function", db, className, superClassName, interfaces)
                 || SimpleSuspendableClassifier.extendsOrImplements("rx/util/functions/Action", db, className, superClassName, interfaces));
     }
 

rxjava-contrib/rxjava-quasar/src/main/resources/META-INF/suspendable-supers

@@ -1,25 +1,3 @@
 rx.Observer.onNext
 rx.Observer.onError
-rx.Observer.onCompleted
-rx.util.functions.Action0.call
-rx.util.functions.Action1.call
-rx.util.functions.Action2.call
-rx.util.functions.Action3.call
-rx.util.functions.Action4.call
-rx.util.functions.Action5.call
-rx.util.functions.Action6.call
-rx.util.functions.Action7.call
-rx.util.functions.Action8.call
-rx.util.functions.Action9.call
-rx.util.functions.ActionN.call
-rx.util.functions.Func0.call
-rx.util.functions.Func1.call
-rx.util.functions.Func2.call
-rx.util.functions.Func3.call
-rx.util.functions.Func4.call
-rx.util.functions.Func5.call
-rx.util.functions.Func6.call
-rx.util.functions.Func7.call
-rx.util.functions.Func8.call
-rx.util.functions.Func9.call
-rx.util.functions.FuncN.call
+rx.Observer.onCompleted