Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve documentation of Flux.merge #1020

Merged
merged 1 commit into from
Jan 9, 2018
Merged

Improve documentation of Flux.merge #1020

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions reactor-core/src/main/java/reactor/core/publisher/Flux.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ public static <I> Flux<I> merge(Iterable<? extends Publisher<? extends I>> sourc

/**
* Merge data from {@link Publisher} sequences contained in an array / vararg
* into an interleaved merged sequence. Unlike {@link #concat(Publisher) concat}, inner
* into an interleaved merged sequence. Unlike {@link #concat(Publisher) concat},
* sources are subscribed to eagerly.
* <p>
* <img class="marble" src="https://raw.githubusercontent.com/reactor/reactor-core/v3.1.1.RELEASE/src/docs/marble/merge.png" alt="">
Expand All @@ -1188,7 +1188,7 @@ public static <I> Flux<I> merge(Publisher<? extends I>... sources) {

/**
* Merge data from {@link Publisher} sequences contained in an array / vararg
* into an interleaved merged sequence. Unlike {@link #concat(Publisher) concat}, inner
* into an interleaved merged sequence. Unlike {@link #concat(Publisher) concat},
* sources are subscribed to eagerly.
* <p>
* <img class="marble" src="https://raw.githubusercontent.com/reactor/reactor-core/v3.1.1.RELEASE/src/docs/marble/merge.png" alt="">
Expand All @@ -1211,7 +1211,7 @@ public static <I> Flux<I> merge(int prefetch, Publisher<? extends I>... sources)

/**
* Merge data from {@link Publisher} sequences contained in an array / vararg
* into an interleaved merged sequence. Unlike {@link #concat(Publisher) concat}, inner
* into an interleaved merged sequence. Unlike {@link #concat(Publisher) concat},
* sources are subscribed to eagerly.
* This variant will delay any error until after the rest of the merge backlog has been processed.
* <p>
Expand Down Expand Up @@ -1294,7 +1294,7 @@ public static <T> Flux<T> mergeSequentialDelayError(Publisher<? extends Publishe

/**
* Merge data from {@link Publisher} sequences provided in an array/vararg
* into an ordered merged sequence. Unlike concat, the inner publishers are subscribed to
* into an ordered merged sequence. Unlike concat, sources are subscribed to
* eagerly. Unlike merge, their emitted values are merged into the final sequence in subscription order.
* <p>
* <img class="marble" src="https://raw.githubusercontent.com/reactor/reactor-core/v3.1.1.RELEASE/src/docs/marble/mergesequential.png" alt="">
Expand All @@ -1311,7 +1311,7 @@ public static <I> Flux<I> mergeSequential(Publisher<? extends I>... sources) {

/**
* Merge data from {@link Publisher} sequences provided in an array/vararg
* into an ordered merged sequence. Unlike concat, the inner publishers are subscribed to
* into an ordered merged sequence. Unlike concat, sources are subscribed to
* eagerly. Unlike merge, their emitted values are merged into the final sequence in subscription order.
* <p>
* <img class="marble" src="https://raw.githubusercontent.com/reactor/reactor-core/v3.1.1.RELEASE/src/docs/marble/mergesequential.png" alt="">
Expand All @@ -1329,7 +1329,7 @@ public static <I> Flux<I> mergeSequential(int prefetch, Publisher<? extends I>..

/**
* Merge data from {@link Publisher} sequences provided in an array/vararg
* into an ordered merged sequence. Unlike concat, the inner publishers are subscribed to
* into an ordered merged sequence. Unlike concat, sources are subscribed to
* eagerly. Unlike merge, their emitted values are merged into the final sequence in subscription order.
* This variant will delay any error until after the rest of the mergeSequential backlog
* has been processed.
Expand All @@ -1349,7 +1349,7 @@ public static <I> Flux<I> mergeSequentialDelayError(int prefetch, Publisher<? ex

/**
* Merge data from {@link Publisher} sequences provided in an {@link Iterable}
* into an ordered merged sequence. Unlike concat, the inner publishers are subscribed to
* into an ordered merged sequence. Unlike concat, sources are subscribed to
* eagerly. Unlike merge, their emitted values are merged into the final sequence in subscription order.
* <p>
* <img class="marble" src="https://raw.githubusercontent.com/reactor/reactor-core/v3.1.1.RELEASE/src/docs/marble/mergesequential.png" alt="">
Expand All @@ -1366,7 +1366,7 @@ public static <I> Flux<I> mergeSequential(Iterable<? extends Publisher<? extends

/**
* Merge data from {@link Publisher} sequences provided in an {@link Iterable}
* into an ordered merged sequence. Unlike concat, the inner publishers are subscribed to
* into an ordered merged sequence. Unlike concat, sources are subscribed to
* eagerly (but at most {@code maxConcurrency} sources at a time). Unlike merge, their
* emitted values are merged into the final sequence in subscription order.
* <p>
Expand All @@ -1386,7 +1386,7 @@ public static <I> Flux<I> mergeSequential(Iterable<? extends Publisher<? extends

/**
* Merge data from {@link Publisher} sequences provided in an {@link Iterable}
* into an ordered merged sequence. Unlike concat, the inner publishers are subscribed to
* into an ordered merged sequence. Unlike concat, sources are subscribed to
* eagerly (but at most {@code maxConcurrency} sources at a time). Unlike merge, their
* emitted values are merged into the final sequence in subscription order.
* This variant will delay any error until after the rest of the mergeSequential backlog
Expand Down