Skip to content

Commit d2d7f69

Browse files
authored
2.x: more Maybe operators, minor cleanups 9/07-1 (#4493)
1 parent 1f0a116 commit d2d7f69

File tree

17 files changed

+3840
-1137
lines changed

17 files changed

+3840
-1137
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ public static <T> Flowable<T> concatEager(Publisher<? extends Publisher<? extend
14011401
* in order, each one after the previous one completes.
14021402
* <dl>
14031403
* <dt><b>Backpressure:</b></dt>
1404-
* <dd>Backpressure is honored towards the downstream and both the outer and inner Publishers are
1404+
* <dd>Backpressure is honored towards the downstream and the inner Publishers are
14051405
* expected to support backpressure. Violating this assumption, the operator will
14061406
* signal {@code MissingBackpressureException}.</dd>
14071407
* <dt><b>Scheduler:</b></dt>
@@ -1680,7 +1680,7 @@ public static <T> Flowable<T> fromCallable(Callable<? extends T> supplier) {
16801680
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
16811681
* method.
16821682
* <p>
1683-
* <em>Important note:</em> This Publisher is blocking; you cannot unsubscribe from it.
1683+
* <em>Important note:</em> This Publisher is blocking on the thread it gets subscribed on; you cannot unsubscribe from it.
16841684
* <p>
16851685
* Unlike 1.x, cancelling the Flowable won't cancel the future. If necessary, one can use composition to achieve the
16861686
* cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
@@ -1712,13 +1712,13 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future) {
17121712
* <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
17131713
* <p>
17141714
* You can convert any object that supports the {@link Future} interface into a Publisher that emits the
1715-
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
1715+
* return value of the {@link Future#get} method of that object, by passing the object into the {@code fromFuture}
17161716
* method.
17171717
* <p>
17181718
* Unlike 1.x, cancelling the Flowable won't cancel the future. If necessary, one can use composition to achieve the
17191719
* cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
17201720
* <p>
1721-
* <em>Important note:</em> This Publisher is blocking; you cannot unsubscribe from it.
1721+
* <em>Important note:</em> This Publisher is blocking on the thread it gets subscribed on; you cannot unsubscribe from it.
17221722
* <dl>
17231723
* <dt><b>Backpressure:</b></dt>
17241724
* <dd>The operator honors backpressure from downstream.</dd>
@@ -3156,7 +3156,7 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends Publisher<? ex
31563156
}
31573157

31583158
/**
3159-
* Flattens an Iterable of Publishers into one Publisher, in a way that allows an Subscriber to receive all
3159+
* Flattens an array of Publishers into one Flowable, in a way that allows an Subscriber to receive all
31603160
* successfully emitted items from each of the source Publishers without being interrupted by an error
31613161
* notification from one of them.
31623162
* <p>
@@ -3426,7 +3426,7 @@ public static <T> Flowable<Boolean> sequenceEqual(Publisher<? extends T> source1
34263426
* a function used to compare items emitted by each Publisher
34273427
* @param <T>
34283428
* the type of items emitted by each Publisher
3429-
* @return a Flowable that emits a Boolean value that indicates whether the two Publisher two sequences
3429+
* @return a Flowable that emits a Boolean value that indicates whether the two Publisher sequences
34303430
* are the same according to the specified function
34313431
* @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
34323432
*/
@@ -3461,7 +3461,7 @@ public static <T> Flowable<Boolean> sequenceEqual(Publisher<? extends T> source1
34613461
* the number of items to prefetch from the first and second source Publisher
34623462
* @param <T>
34633463
* the type of items emitted by each Publisher
3464-
* @return a Flowable that emits a Boolean value that indicates whether the two Publisher two sequences
3464+
* @return a Flowable that emits a Boolean value that indicates whether the two Publisher sequences
34653465
* are the same according to the specified function
34663466
* @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
34673467
*/

0 commit comments

Comments
 (0)