Skip to content

Commit 6300b15

Browse files
authored
3.x: Update marbles for concatMap{Single|Maybe}[DelayError] (#7698)
* 3.x: Update marbles for concatMap{Single|Maybe}[DelayError] * Missed one diagram link change.
1 parent c7f4a40 commit 6300b15

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

src/main/java/io/reactivex/rxjava3/core/Flowable.java

+14-10
Original file line numberDiff line numberDiff line change
@@ -8266,7 +8266,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
82668266
* other succeeds or completes, emits their success value if available or terminates immediately if
82678267
* either this {@code Flowable} or the current inner {@code MaybeSource} fail.
82688268
* <p>
8269-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8269+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybe.v3.png" alt="">
82708270
* <dl>
82718271
* <dt><b>Backpressure:</b></dt>
82728272
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8299,7 +8299,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
82998299
* other succeeds or completes, emits their success value if available or terminates immediately if
83008300
* either this {@code Flowable} or the current inner {@code MaybeSource} fail.
83018301
* <p>
8302-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8302+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybe.v3.png" alt="">
83038303
* <dl>
83048304
* <dt><b>Backpressure:</b></dt>
83058305
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8339,7 +8339,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
83398339
* other terminates, emits their success value if available and delaying all errors
83408340
* till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
83418341
* <p>
8342-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8342+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
83438343
* <dl>
83448344
* <dt><b>Backpressure:</b></dt>
83458345
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8372,7 +8372,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
83728372
* other terminates, emits their success value if available and optionally delaying all errors
83738373
* till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
83748374
* <p>
8375-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8375+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
83768376
* <dl>
83778377
* <dt><b>Backpressure:</b></dt>
83788378
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8411,7 +8411,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
84118411
* other terminates, emits their success value if available and optionally delaying all errors
84128412
* till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
84138413
* <p>
8414-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8414+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
84158415
* <dl>
84168416
* <dt><b>Backpressure:</b></dt>
84178417
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8456,7 +8456,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
84568456
* other succeeds, emits their success values or terminates immediately if
84578457
* either this {@code Flowable} or the current inner {@code SingleSource} fail.
84588458
* <p>
8459-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8459+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingle.v3.png" alt="">
84608460
* <dl>
84618461
* <dt><b>Backpressure:</b></dt>
84628462
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8489,7 +8489,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
84898489
* other succeeds, emits their success values or terminates immediately if
84908490
* either this {@code Flowable} or the current inner {@code SingleSource} fail.
84918491
* <p>
8492-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8492+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingle.v3.png" alt="">
84938493
* <dl>
84948494
* <dt><b>Backpressure:</b></dt>
84958495
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8529,7 +8529,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
85298529
* other succeeds or fails, emits their success values and delays all errors
85308530
* till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
85318531
* <p>
8532-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8532+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
85338533
* <dl>
85348534
* <dt><b>Backpressure:</b></dt>
85358535
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8562,7 +8562,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
85628562
* other succeeds or fails, emits their success values and optionally delays all errors
85638563
* till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
85648564
* <p>
8565-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8565+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
85668566
* <dl>
85678567
* <dt><b>Backpressure:</b></dt>
85688568
* <dd>The operator expects the upstream to support backpressure and honors
@@ -8601,7 +8601,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
86018601
* other succeeds or fails, emits their success values and optionally delays errors
86028602
* till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
86038603
* <p>
8604-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
8604+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
86058605
* <dl>
86068606
* <dt><b>Backpressure:</b></dt>
86078607
* <dd>The operator expects the upstream to support backpressure and honors
@@ -10957,6 +10957,8 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
1095710957
/**
1095810958
* Maps each element of the upstream {@code Flowable} into {@link MaybeSource}s, subscribes to all of them
1095910959
* and merges their {@code onSuccess} values, in no particular order, into a single {@code Flowable} sequence.
10960+
* <p>
10961+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.v3.png" alt="">
1096010962
* <dl>
1096110963
* <dt><b>Backpressure:</b></dt>
1096210964
* <dd>The operator consumes the upstream in an unbounded manner.</dd>
@@ -10980,6 +10982,8 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
1098010982
* Maps each element of the upstream {@code Flowable} into {@link MaybeSource}s, subscribes to at most
1098110983
* {@code maxConcurrency} {@code MaybeSource}s at a time and merges their {@code onSuccess} values,
1098210984
* in no particular order, into a single {@code Flowable} sequence, optionally delaying all errors.
10985+
* <p>
10986+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.v3.png" alt="">
1098310987
* <dl>
1098410988
* <dt><b>Backpressure:</b></dt>
1098510989
* <dd>If {@code maxConcurrency == }{@link Integer#MAX_VALUE} the operator consumes the upstream in an unbounded manner.

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -7329,7 +7329,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
73297329
* other succeeds or completes, emits their success value if available or terminates immediately if
73307330
* either the current {@code Observable} or the current inner {@code MaybeSource} fail.
73317331
* <p>
7332-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7332+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybe.v3.png" alt="">
73337333
* <dl>
73347334
* <dt><b>Scheduler:</b></dt>
73357335
* <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7357,7 +7357,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
73577357
* other succeeds or completes, emits their success value if available or terminates immediately if
73587358
* either the current {@code Observable} or the current inner {@code MaybeSource} fail.
73597359
* <p>
7360-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7360+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybe.v3.png" alt="">
73617361
* <dl>
73627362
* <dt><b>Scheduler:</b></dt>
73637363
* <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7390,7 +7390,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
73907390
* other terminates, emits their success value if available and delaying all errors
73917391
* till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
73927392
* <p>
7393-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7393+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
73947394
* <dl>
73957395
* <dt><b>Scheduler:</b></dt>
73967396
* <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7418,7 +7418,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
74187418
* other terminates, emits their success value if available and optionally delaying all errors
74197419
* till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
74207420
* <p>
7421-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7421+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
74227422
* <dl>
74237423
* <dt><b>Scheduler:</b></dt>
74247424
* <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7452,7 +7452,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
74527452
* other terminates, emits their success value if available and optionally delaying all errors
74537453
* till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
74547454
* <p>
7455-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7455+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
74567456
* <dl>
74577457
* <dt><b>Scheduler:</b></dt>
74587458
* <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7490,7 +7490,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
74907490
* other succeeds, emits their success values or terminates immediately if
74917491
* either the current {@code Observable} or the current inner {@code SingleSource} fail.
74927492
* <p>
7493-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7493+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingle.v3.png" alt="">
74947494
* <dl>
74957495
* <dt><b>Scheduler:</b></dt>
74967496
* <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7518,7 +7518,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
75187518
* other succeeds, emits their success values or terminates immediately if
75197519
* either the current {@code Observable} or the current inner {@code SingleSource} fail.
75207520
* <p>
7521-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7521+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingle.v3.png" alt="">
75227522
* <dl>
75237523
* <dt><b>Scheduler:</b></dt>
75247524
* <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7551,7 +7551,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
75517551
* other succeeds or fails, emits their success values and delays all errors
75527552
* till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
75537553
* <p>
7554-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7554+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
75557555
* <dl>
75567556
* <dt><b>Scheduler:</b></dt>
75577557
* <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7579,7 +7579,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
75797579
* other succeeds or fails, emits their success values and optionally delays all errors
75807580
* till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
75817581
* <p>
7582-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7582+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
75837583
* <dl>
75847584
* <dt><b>Scheduler:</b></dt>
75857585
* <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7613,7 +7613,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
76137613
* other succeeds or fails, emits their success values and optionally delays errors
76147614
* till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
76157615
* <p>
7616-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
7616+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
76177617
* <dl>
76187618
* <dt><b>Scheduler:</b></dt>
76197619
* <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>

0 commit comments

Comments
 (0)