Make Functions.from typesafe

Author: benjchristensen

rxjava-core/src/main/java/rx/subscriptions/Subscriptions.java

@@ -20,6 +20,7 @@
 import rx.Subscription;
 import rx.util.functions.Action0;
 import rx.util.functions.FuncN;
+import rx.util.functions.Function;
 import rx.util.functions.Functions;
 
 /**
@@ -83,23 +84,6 @@ public static CompositeSubscription create(Subscription... subscriptions) {
         return new CompositeSubscription(subscriptions);
     }
 
-    /**
-     * A {@link Subscription} implemented via an anonymous function (such as closures from other languages).
-     *
-     * @return {@link Subscription}
-     */
-    public static Subscription create(final Object unsubscribe) {
-        final FuncN<?> f = Functions.from(unsubscribe);
-        return new Subscription() {
-
-            @Override
-            public void unsubscribe() {
-                f.call();
-            }
-
-        };
-    }
-
     /**
      * A {@link Subscription} that does nothing when its unsubscribe method is called.
      */

rxjava-core/src/main/java/rx/util/functions/Action.java

@@ -5,6 +5,6 @@
  * <p>
  * Marker interface to allow instanceof checks.
  */
-public interface Action {
+public interface Action extends Function {
 
 }

rxjava-core/src/main/java/rx/util/functions/Functions.java

@@ -15,9 +15,6 @@
  */
 package rx.util.functions;
 
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-
 public class Functions {
 
     /**
@@ -26,17 +23,11 @@ public class Functions {
      * @param function
      */
     @SuppressWarnings({ "rawtypes" })
-    public static FuncN from(final Object function) {
+    public static FuncN from(final Function function) {
         if (function == null) {
             throw new RuntimeException("function is null. Can't send arguments to null function.");
         }
-
-        /* check for typed Rx Function implementation first */
-        if (function instanceof Function) {
-            return fromFunction((Function) function);
-        }
-        // no support found
-        throw new RuntimeException("Unsupported closure type: " + function.getClass().getSimpleName());
+        return fromFunction(function);
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })