From d7bd221e9977238fcb33b3a2fc602cf6198ebb93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Karnok?= Date: Sat, 25 Feb 2017 11:23:49 +0100 Subject: [PATCH] 2.x: fix repeatWhen and retryWhen signatures --- src/main/java/io/reactivex/Completable.java | 4 +- src/main/java/io/reactivex/Flowable.java | 48 ++++++++++----------- src/main/java/io/reactivex/Single.java | 4 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/io/reactivex/Completable.java b/src/main/java/io/reactivex/Completable.java index 941f40ee48..0453b45462 100644 --- a/src/main/java/io/reactivex/Completable.java +++ b/src/main/java/io/reactivex/Completable.java @@ -1441,7 +1441,7 @@ public final Completable repeatUntil(BooleanSupplier stop) { */ @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) - public final Completable repeatWhen(Function, ? extends Publisher> handler) { + public final Completable repeatWhen(Function, ? extends Publisher> handler) { return fromPublisher(toFlowable().repeatWhen(handler)); } @@ -1526,7 +1526,7 @@ public final Completable retry(Predicate predicate) { */ @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) - public final Completable retryWhen(Function, ? extends Publisher> handler) { + public final Completable retryWhen(Function, ? extends Publisher> handler) { return fromPublisher(toFlowable().retryWhen(handler)); } diff --git a/src/main/java/io/reactivex/Flowable.java b/src/main/java/io/reactivex/Flowable.java index 4616372e43..743c0ef419 100644 --- a/src/main/java/io/reactivex/Flowable.java +++ b/src/main/java/io/reactivex/Flowable.java @@ -8217,8 +8217,8 @@ public final Single firstOrError() { *
*
Backpressure:
*
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, + * 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}.
@@ -8249,8 +8249,8 @@ public final Flowable flatMap(Function *
Backpressure:
*
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, + * 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}.
@@ -8285,8 +8285,8 @@ public final Flowable flatMap(Function *
Backpressure:
*
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, + * 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}.
@@ -8321,8 +8321,8 @@ public final Flowable flatMap(Function *
Backpressure:
*
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, + * 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}.
@@ -8360,8 +8360,8 @@ public final Flowable flatMap(Function *
Backpressure:
*
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, + * 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}.
@@ -8411,8 +8411,8 @@ public final Flowable flatMap(Function *
Backpressure:
*
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, + * 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}.
@@ -8454,8 +8454,8 @@ public final Flowable flatMap( *
*
Backpressure:
*
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, + * 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}.
@@ -8501,8 +8501,8 @@ public final Flowable flatMap( *
*
Backpressure:
*
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, + * 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}.
@@ -8537,8 +8537,8 @@ public final Flowable flatMap(Function *
Backpressure:
*
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, + * 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}.
@@ -8577,8 +8577,8 @@ public final Flowable flatMap(Function *
Backpressure:
*
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, + * 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}.
@@ -8620,8 +8620,8 @@ public final Flowable flatMap(Function *
Backpressure:
*
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, + * 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}.
@@ -8667,8 +8667,8 @@ public final Flowable flatMap(final Function *
Backpressure:
*
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, + * 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}.
diff --git a/src/main/java/io/reactivex/Single.java b/src/main/java/io/reactivex/Single.java index 6bc59911d8..bb42de50f0 100644 --- a/src/main/java/io/reactivex/Single.java +++ b/src/main/java/io/reactivex/Single.java @@ -2467,7 +2467,7 @@ public final Flowable repeat(long times) { @BackpressureSupport(BackpressureKind.FULL) @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) - public final Flowable repeatWhen(Function, ? extends Publisher> handler) { + public final Flowable repeatWhen(Function, ? extends Publisher> handler) { return toFlowable().repeatWhen(handler); } @@ -2577,7 +2577,7 @@ public final Single retry(Predicate predicate) { */ @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) - public final Single retryWhen(Function, ? extends Publisher> handler) { + public final Single retryWhen(Function, ? extends Publisher> handler) { return toSingle(toFlowable().retryWhen(handler)); }