Skip to content

Commit 96b8d58

Browse files
authored
2.x: update some marbles of Observable (#5351)
1 parent b5c7957 commit 96b8d58

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

src/main/java/io/reactivex/Observable.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
781781
* the source ObservableSources each time an item is received from any of the source ObservableSources, where this
782782
* aggregation is defined by a specified function.
783783
* <p>
784+
* <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
785+
* <p>
784786
* Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
785787
* implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
786788
* {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
@@ -819,6 +821,8 @@ public static <T, R> Observable<R> combineLatestDelayError(ObservableSource<? ex
819821
* aggregation is defined by a specified function and delays any error from the sources until
820822
* all source ObservableSources terminate.
821823
* <p>
824+
* <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
825+
* <p>
822826
* Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
823827
* implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
824828
* {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
@@ -1218,7 +1222,7 @@ public static <T> Observable<T> concatArrayDelayError(ObservableSource<? extends
12181222
* source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them
12191223
* in order, each one after the previous one completes.
12201224
* <p>
1221-
* <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArray.png" alt="">
1225+
* <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArrayEager.png" alt="">
12221226
* <dl>
12231227
* <dt><b>Scheduler:</b></dt>
12241228
* <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1539,7 +1543,7 @@ public static <T> Observable<T> empty() {
15391543
* Returns an Observable that invokes an {@link Observer}'s {@link Observer#onError onError} method when the
15401544
* Observer subscribes to it.
15411545
* <p>
1542-
* <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.png" alt="">
1546+
* <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.supplier.png" alt="">
15431547
* <dl>
15441548
* <dt><b>Scheduler:</b></dt>
15451549
* <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1564,7 +1568,7 @@ public static <T> Observable<T> error(Callable<? extends Throwable> errorSupplie
15641568
* Returns an Observable that invokes an {@link Observer}'s {@link Observer#onError onError} method when the
15651569
* Observer subscribes to it.
15661570
* <p>
1567-
* <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.png" alt="">
1571+
* <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.item.png" alt="">
15681572
* <dl>
15691573
* <dt><b>Scheduler:</b></dt>
15701574
* <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1646,7 +1650,7 @@ public static <T> Observable<T> fromCallable(Callable<? extends T> supplier) {
16461650
/**
16471651
* Converts a {@link Future} into an ObservableSource.
16481652
* <p>
1649-
* <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
1653+
* <img width="640" height="284" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromFuture.noarg.png" alt="">
16501654
* <p>
16511655
* You can convert any object that supports the {@link Future} interface into an ObservableSource that emits the
16521656
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
@@ -1679,7 +1683,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future) {
16791683
/**
16801684
* Converts a {@link Future} into an ObservableSource, with a timeout on the Future.
16811685
* <p>
1682-
* <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
1686+
* <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromFuture.timeout.png" alt="">
16831687
* <p>
16841688
* You can convert any object that supports the {@link Future} interface into an ObservableSource that emits the
16851689
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
@@ -1717,7 +1721,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, long time
17171721
/**
17181722
* Converts a {@link Future} into an ObservableSource, with a timeout on the Future.
17191723
* <p>
1720-
* <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
1724+
* <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromFuture.timeout.scheduler.png" alt="">
17211725
* <p>
17221726
* You can convert any object that supports the {@link Future} interface into an ObservableSource that emits the
17231727
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
@@ -1758,7 +1762,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, long time
17581762
/**
17591763
* Converts a {@link Future}, operating on a specified {@link Scheduler}, into an ObservableSource.
17601764
* <p>
1761-
* <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.s.png" alt="">
1765+
* <img width="640" height="294" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromFuture.scheduler.png" alt="">
17621766
* <p>
17631767
* You can convert any object that supports the {@link Future} interface into an ObservableSource that emits the
17641768
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
@@ -1793,7 +1797,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, Scheduler
17931797
/**
17941798
* Converts an {@link Iterable} sequence into an ObservableSource that emits the items in the sequence.
17951799
* <p>
1796-
* <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.png" alt="">
1800+
* <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromIterable.png" alt="">
17971801
* <dl>
17981802
* <dt><b>Scheduler:</b></dt>
17991803
* <dd>{@code fromIterable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10213,7 +10217,7 @@ public final Single<T> single(T defaultItem) {
1021310217
* if this Observable completes without emitting any items or emits more than one item a
1021410218
* {@link NoSuchElementException} or {@code IllegalArgumentException} will be signalled respectively.
1021510219
* <p>
10216-
* <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/single.2.png" alt="">
10220+
* <img width="640" height="228" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrError.png" alt="">
1021710221
* <dl>
1021810222
* <dt><b>Scheduler:</b></dt>
1021910223
* <dd>{@code singleOrError} does not operate by default on a particular {@link Scheduler}.</dd>

0 commit comments

Comments
 (0)