@@ -1617,30 +1617,6 @@ public static <R> Observable<R> fromAction(Action0 action, R result) {
1617
1617
return fromAction (action , result , Schedulers .computation ());
1618
1618
}
1619
1619
1620
- /**
1621
- * Return an Observable that calls the given function and emits its
1622
- * result when an Observer subscribes.
1623
- * <p>
1624
- * <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/fromFunc0.png">
1625
- * <p>
1626
- * The function is called on the default thread pool for computation.
1627
- *
1628
- * @param <R> the return type
1629
- * @param function the function to call on each subscription
1630
- * @return an Observable that calls the given function and emits its
1631
- * result when an Observer subscribes
1632
- * @see #start(rx.functions.Func0)
1633
- * @see #fromCallable(java.util.concurrent.Callable)
1634
- * @see <a href="https://github.com/Netflix/RxJava/wiki/Async-Operators#fromfunc0">RxJava Wiki: fromFunc0()</a>
1635
- *
1636
- * @deprecated Unnecessary now that Func0 extends Callable. Just call
1637
- * {@link #fromCallable(Callable)} instead.
1638
- */
1639
- @ Deprecated
1640
- public static <R > Observable <R > fromFunc0 (Func0 <? extends R > function ) {
1641
- return fromCallable (function );
1642
- }
1643
-
1644
1620
/**
1645
1621
* Return an Observable that calls the given Callable and emits its
1646
1622
* result or Exception when an Observer subscribes.
@@ -1654,7 +1630,6 @@ public static <R> Observable<R> fromFunc0(Func0<? extends R> function) {
1654
1630
* @return an Observable that calls the given Callable and emits its
1655
1631
* result or Exception when an Observer subscribes
1656
1632
* @see #start(rx.functions.Func0)
1657
- * @see #fromFunc0(rx.functions.Func0)
1658
1633
* @see <a href="https://github.com/Netflix/RxJava/wiki/Async-Operators#fromcallable">RxJava Wiki: fromCallable()</a>
1659
1634
*/
1660
1635
public static <R > Observable <R > fromCallable (Callable <? extends R > callable ) {
@@ -1699,30 +1674,6 @@ public static <R> Observable<R> fromAction(Action0 action, R result, Scheduler s
1699
1674
return Observable .create (OperatorFromFunctionals .fromAction (action , result )).subscribeOn (scheduler );
1700
1675
}
1701
1676
1702
- /**
1703
- * Return an Observable that calls the given function and emits its
1704
- * result when an Observer subscribes.
1705
- * <p>
1706
- * <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/fromFunc0.s.png">
1707
- *
1708
- * @param <R> the return type
1709
- * @param function the function to call on each subscription
1710
- * @param scheduler the scheduler where the function is called and the
1711
- * result is emitted
1712
- * @return an Observable that calls the given function and emits its
1713
- * result when an Observer subscribes
1714
- * @see #start(rx.functions.Func0)
1715
- * @see #fromCallable(java.util.concurrent.Callable)
1716
- * @see <a href="https://github.com/Netflix/RxJava/wiki/Async-Operators#fromfunc0">RxJava Wiki: fromFunc0()</a>
1717
- *
1718
- * @deprecated Unnecessary now that Func0 extends Callable. Just call
1719
- * {@link #fromCallable(Callable, Scheduler)} instead.
1720
- */
1721
- @ Deprecated
1722
- public static <R > Observable <R > fromFunc0 (Func0 <? extends R > function , Scheduler scheduler ) {
1723
- return fromCallable (function , scheduler );
1724
- }
1725
-
1726
1677
/**
1727
1678
* Return an Observable that calls the given Callable and emits its
1728
1679
* result or Exception when an Observer subscribes.
@@ -1736,7 +1687,6 @@ public static <R> Observable<R> fromFunc0(Func0<? extends R> function, Scheduler
1736
1687
* @return an Observable that calls the given Callable and emits its
1737
1688
* result or Exception when an Observer subscribes
1738
1689
* @see #start(rx.functions.Func0)
1739
- * @see #fromFunc0(rx.functions.Func0)
1740
1690
* @see <a href="https://github.com/Netflix/RxJava/wiki/Async-Operators#fromcallable">RxJava Wiki: fromCallable()</a>
1741
1691
*/
1742
1692
public static <R > Observable <R > fromCallable (Callable <? extends R > callable , Scheduler scheduler ) {
0 commit comments