Skip to content

Commit a03bf90

Browse files
akarnokdakarnokd
authored
2.x: fix repeatWhen and retryWhen signatures (ReactiveX#5136)
1 parent 2a4b18e commit a03bf90

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎src/main/java/io/reactivex/Completable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ public final Completable repeatUntil(BooleanSupplier stop) {
14411441
*/
14421442
@CheckReturnValue
14431443
@SchedulerSupport(SchedulerSupport.NONE)
1444-
public final Completable repeatWhen(Function<? super Flowable<Object>, ? extends Publisher<Object>> handler) {
1444+
public final Completable repeatWhen(Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
14451445
return fromPublisher(toFlowable().repeatWhen(handler));
14461446
}
14471447

@@ -1526,7 +1526,7 @@ public final Completable retry(Predicate<? super Throwable> predicate) {
15261526
*/
15271527
@CheckReturnValue
15281528
@SchedulerSupport(SchedulerSupport.NONE)
1529-
public final Completable retryWhen(Function<? super Flowable<Throwable>, ? extends Publisher<Object>> handler) {
1529+
public final Completable retryWhen(Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
15301530
return fromPublisher(toFlowable().retryWhen(handler));
15311531
}
15321532

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8217,8 +8217,8 @@ public final Single<T> firstOrError() {
82178217
* <dl>
82188218
* <dt><b>Backpressure:</b></dt>
82198219
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8220-
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8221-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8220+
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8221+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
82228222
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
82238223
* <dt><b>Scheduler:</b></dt>
82248224
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8249,8 +8249,8 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
82498249
* <dl>
82508250
* <dt><b>Backpressure:</b></dt>
82518251
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8252-
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8253-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8252+
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8253+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
82548254
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
82558255
* <dt><b>Scheduler:</b></dt>
82568256
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8285,8 +8285,8 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
82858285
* <dl>
82868286
* <dt><b>Backpressure:</b></dt>
82878287
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8288-
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8289-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8288+
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8289+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
82908290
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
82918291
* <dt><b>Scheduler:</b></dt>
82928292
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8321,8 +8321,8 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
83218321
* <dl>
83228322
* <dt><b>Backpressure:</b></dt>
83238323
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8324-
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8325-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8324+
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8325+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
83268326
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
83278327
* <dt><b>Scheduler:</b></dt>
83288328
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8360,8 +8360,8 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
83608360
* <dl>
83618361
* <dt><b>Backpressure:</b></dt>
83628362
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8363-
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8364-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8363+
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8364+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
83658365
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
83668366
* <dt><b>Scheduler:</b></dt>
83678367
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8411,8 +8411,8 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
84118411
* <dl>
84128412
* <dt><b>Backpressure:</b></dt>
84138413
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8414-
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8415-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8414+
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8415+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
84168416
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
84178417
* <dt><b>Scheduler:</b></dt>
84188418
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8454,8 +8454,8 @@ public final <R> Flowable<R> flatMap(
84548454
* <dl>
84558455
* <dt><b>Backpressure:</b></dt>
84568456
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8457-
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8458-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8457+
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8458+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
84598459
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
84608460
* <dt><b>Scheduler:</b></dt>
84618461
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8501,8 +8501,8 @@ public final <R> Flowable<R> flatMap(
85018501
* <dl>
85028502
* <dt><b>Backpressure:</b></dt>
85038503
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8504-
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8505-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8504+
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8505+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
85068506
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
85078507
* <dt><b>Scheduler:</b></dt>
85088508
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8537,8 +8537,8 @@ public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<
85378537
* <dl>
85388538
* <dt><b>Backpressure:</b></dt>
85398539
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8540-
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8541-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8540+
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8541+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
85428542
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
85438543
* <dt><b>Scheduler:</b></dt>
85448544
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8577,8 +8577,8 @@ public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<
85778577
* <dl>
85788578
* <dt><b>Backpressure:</b></dt>
85798579
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8580-
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8581-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8580+
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8581+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
85828582
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
85838583
* <dt><b>Scheduler:</b></dt>
85848584
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8620,8 +8620,8 @@ public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<
86208620
* <dl>
86218621
* <dt><b>Backpressure:</b></dt>
86228622
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8623-
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8624-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8623+
* in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
8624+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
86258625
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
86268626
* <dt><b>Scheduler:</b></dt>
86278627
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8667,8 +8667,8 @@ public final <U, R> Flowable<R> flatMap(final Function<? super T, ? extends Publ
86678667
* <dl>
86688668
* <dt><b>Backpressure:</b></dt>
86698669
* <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
8670-
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8671-
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
8670+
* in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
8671+
* The inner {@code Publisher}s are expected to honor backpressure; if violated,
86728672
* the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
86738673
* <dt><b>Scheduler:</b></dt>
86748674
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>

‎src/main/java/io/reactivex/Single.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2467,7 +2467,7 @@ public final Flowable<T> repeat(long times) {
24672467
@BackpressureSupport(BackpressureKind.FULL)
24682468
@CheckReturnValue
24692469
@SchedulerSupport(SchedulerSupport.NONE)
2470-
public final Flowable<T> repeatWhen(Function<? super Flowable<Object>, ? extends Publisher<Object>> handler) {
2470+
public final Flowable<T> repeatWhen(Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
24712471
return toFlowable().repeatWhen(handler);
24722472
}
24732473

@@ -2577,7 +2577,7 @@ public final Single<T> retry(Predicate<? super Throwable> predicate) {
25772577
*/
25782578
@CheckReturnValue
25792579
@SchedulerSupport(SchedulerSupport.NONE)
2580-
public final Single<T> retryWhen(Function<? super Flowable<Throwable>, ? extends Publisher<Object>> handler) {
2580+
public final Single<T> retryWhen(Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
25812581
return toSingle(toFlowable().retryWhen(handler));
25822582
}
25832583

0 commit comments

Comments
 (0)