Skip to content

Commit b64a94d

Browse files
Merge pull request ReactiveX#762 from Netflix/docs
adding javadoc marble diagram for the mergeMap(next,completed,error) variety
2 parents 45341ee + 4504a9e commit b64a94d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

rxjava-core/src/main/java/rx/Observable.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5216,7 +5216,7 @@ public final <R> Observable<List<T>> maxBy(Func1<T, R> selector, Comparator<? su
52165216
* @return an Observable that emits the result of applying the
52175217
* transformation function to each item emitted by the source
52185218
* Observable and merging the results of the Observables obtained
5219-
* from this transformation.
5219+
* from this transformation
52205220
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#mapmany-or-flatmap-and-mapmanydelayerror">RxJava Wiki: flatMap()</a>
52215221
* @see #flatMap(Func1)
52225222
*/
@@ -5227,6 +5227,8 @@ public final <R> Observable<R> mergeMap(Func1<? super T, ? extends Observable<?
52275227
/**
52285228
* Create an Observable that projects the notification of an observable sequence to an
52295229
* observable sequence and merges the results into one.
5230+
* <p>
5231+
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/mergeMap.nce.png">
52305232
*
52315233
* @param <R>
52325234
* the result type
@@ -5236,8 +5238,8 @@ public final <R> Observable<R> mergeMap(Func1<? super T, ? extends Observable<?
52365238
* function returning a collection to merge for an onError event
52375239
* @param onCompleted
52385240
* function returning a collection to merge for an onCompleted event
5239-
* @return an Observable that projects the notification of an observable sequence to an observable
5240-
* sequence and merges the results into one.
5241+
* @return an Observable that projects the notification of an observable sequence to an
5242+
* observable sequence and merges the results into one
52415243
*/
52425244
public final <R> Observable<R> mergeMap(
52435245
Func1<? super T, ? extends Observable<? extends R>> onNext,

0 commit comments

Comments
 (0)