diff --git a/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java b/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java index 80ba5f3ea3..ce6962837a 100644 --- a/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java +++ b/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java @@ -1617,30 +1617,6 @@ public static Observable fromAction(Action0 action, R result) { return fromAction(action, result, Schedulers.computation()); } - /** - * Return an Observable that calls the given function and emits its - * result when an Observer subscribes. - *

- * - *

- * The function is called on the default thread pool for computation. - * - * @param the return type - * @param function the function to call on each subscription - * @return an Observable that calls the given function and emits its - * result when an Observer subscribes - * @see #start(rx.functions.Func0) - * @see #fromCallable(java.util.concurrent.Callable) - * @see RxJava Wiki: fromFunc0() - * - * @deprecated Unnecessary now that Func0 extends Callable. Just call - * {@link #fromCallable(Callable)} instead. - */ - @Deprecated - public static Observable fromFunc0(Func0 function) { - return fromCallable(function); - } - /** * Return an Observable that calls the given Callable and emits its * result or Exception when an Observer subscribes. @@ -1654,7 +1630,6 @@ public static Observable fromFunc0(Func0 function) { * @return an Observable that calls the given Callable and emits its * result or Exception when an Observer subscribes * @see #start(rx.functions.Func0) - * @see #fromFunc0(rx.functions.Func0) * @see RxJava Wiki: fromCallable() */ public static Observable fromCallable(Callable callable) { @@ -1699,30 +1674,6 @@ public static Observable fromAction(Action0 action, R result, Scheduler s return Observable.create(OperatorFromFunctionals.fromAction(action, result)).subscribeOn(scheduler); } - /** - * Return an Observable that calls the given function and emits its - * result when an Observer subscribes. - *

- * - * - * @param the return type - * @param function the function to call on each subscription - * @param scheduler the scheduler where the function is called and the - * result is emitted - * @return an Observable that calls the given function and emits its - * result when an Observer subscribes - * @see #start(rx.functions.Func0) - * @see #fromCallable(java.util.concurrent.Callable) - * @see RxJava Wiki: fromFunc0() - * - * @deprecated Unnecessary now that Func0 extends Callable. Just call - * {@link #fromCallable(Callable, Scheduler)} instead. - */ - @Deprecated - public static Observable fromFunc0(Func0 function, Scheduler scheduler) { - return fromCallable(function, scheduler); - } - /** * Return an Observable that calls the given Callable and emits its * result or Exception when an Observer subscribes. @@ -1736,7 +1687,6 @@ public static Observable fromFunc0(Func0 function, Scheduler * @return an Observable that calls the given Callable and emits its * result or Exception when an Observer subscribes * @see #start(rx.functions.Func0) - * @see #fromFunc0(rx.functions.Func0) * @see RxJava Wiki: fromCallable() */ public static Observable fromCallable(Callable callable, Scheduler scheduler) {