diff --git a/src/main/java/io/reactivex/Flowable.java b/src/main/java/io/reactivex/Flowable.java index 9485569a27..4616372e43 100644 --- a/src/main/java/io/reactivex/Flowable.java +++ b/src/main/java/io/reactivex/Flowable.java @@ -8216,9 +8216,10 @@ public final Single firstOrError() { * *
*
Backpressure:
- *
The operator honors backpressure from downstream. The outer {@code Publisher} is consumed - * in unbounded mode (i.e., no backpressure is applied to it). The inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
@@ -8247,9 +8248,10 @@ public final Flowable flatMap(Function *
*
Backpressure:
- *
The operator honors backpressure from downstream. The outer {@code Publisher} is consumed - * in unbounded mode (i.e., no backpressure is applied to it). The inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
@@ -8282,8 +8284,10 @@ public final Flowable flatMap(Function --> *
*
Backpressure:
- *
The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
@@ -8316,8 +8320,10 @@ public final Flowable flatMap(Function --> *
*
Backpressure:
- *
The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
@@ -8353,8 +8359,10 @@ public final Flowable flatMap(Function --> *
*
Backpressure:
- *
The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
@@ -8402,9 +8410,10 @@ public final Flowable flatMap(Function *
*
Backpressure:
- *
The operator honors backpressure from downstream. The outer {@code Publisher} is consumed - * in unbounded mode (i.e., no backpressure is applied to it). The inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
@@ -8444,8 +8453,10 @@ public final Flowable flatMap( * *
*
Backpressure:
- *
The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
@@ -8489,20 +8500,21 @@ public final Flowable flatMap( * *
*
Backpressure:
- *
The operator honors backpressure from downstream. The outer {@code Publisher} is consumed - * in unbounded mode (i.e., no backpressure is applied to it). The inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
* * @param - * the type of items emitted by the collection Publisher + * the type of items emitted by the inner Publishers * @param - * the type of items emitted by the resulting Publisher + * the type of items emitted by the combiner function * @param mapper * a function that returns a Publisher for each item emitted by the source Publisher - * @param resultSelector + * @param combiner * a function that combines one item emitted by each of the source and collection Publishers and * returns an item to be emitted by the resulting Publisher * @return a Flowable that emits the results of applying a function to a pair of values emitted by the @@ -8513,8 +8525,8 @@ public final Flowable flatMap( @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable flatMap(Function> mapper, - BiFunction resultSelector) { - return flatMap(mapper, resultSelector, false, bufferSize(), bufferSize()); + BiFunction combiner) { + return flatMap(mapper, combiner, false, bufferSize(), bufferSize()); } /** @@ -8524,17 +8536,18 @@ public final Flowable flatMap(Function *
*
Backpressure:
- *
The operator honors backpressure from downstream. The outer {@code Publisher} is consumed - * in unbounded mode (i.e., no backpressure is applied to it). The inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
* * @param - * the type of items emitted by the collection Publisher + * the type of items emitted by the inner Publishers * @param - * the type of items emitted by the resulting Publisher + * the type of items emitted by the combiner functions * @param mapper * a function that returns a Publisher for each item emitted by the source Publisher * @param combiner @@ -8563,16 +8576,18 @@ public final Flowable flatMap(Function --> *
*
Backpressure:
- *
The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
* * @param - * the type of items emitted by the collection Publisher + * the type of items emitted by the inner Publishers * @param - * the type of items emitted by the resulting Publisher + * the type of items emitted by the combiner function * @param mapper * a function that returns a Publisher for each item emitted by the source Publisher * @param combiner @@ -8604,16 +8619,18 @@ public final Flowable flatMap(Function --> *
*
Backpressure:
- *
The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
* * @param - * the type of items emitted by the collection Publisher + * the type of items emitted by the inner Publishers * @param - * the type of items emitted by the resulting Publisher + * the type of items emitted by the combiner function * @param mapper * a function that returns a Publisher for each item emitted by the source Publisher * @param combiner @@ -8649,16 +8666,18 @@ public final Flowable flatMap(final Function --> *
*
Backpressure:
- *
The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor - * backpressure; if violated, the operator may signal {@code MissingBackpressureException}.
+ *
The operator honors backpressure from downstream. The upstream Flowable is consumed + * in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items). + * The inner {@code Publisher}s are expected to honor backpressure; if violated, + * the operator may signal {@code MissingBackpressureException}.
*
Scheduler:
*
{@code flatMap} does not operate by default on a particular {@link Scheduler}.
*
* * @param - * the type of items emitted by the collection Publisher + * the type of items emitted by the inner Publishers * @param - * the type of items emitted by the resulting Publisher + * the type of items emitted by the combiner function * @param mapper * a function that returns a Publisher for each item emitted by the source Publisher * @param combiner