From 8015fd76c429bf77f747a4d923eae0fed9454c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Karnok?= <akarnokd@gmail.com>
Date: Mon, 17 Oct 2016 23:21:44 +0200
Subject: [PATCH] 2.x: remove variance from the input source of retryWhen

---
 src/main/java/io/reactivex/Completable.java                 | 2 +-
 src/main/java/io/reactivex/Flowable.java                    | 2 +-
 src/main/java/io/reactivex/Maybe.java                       | 2 +-
 src/main/java/io/reactivex/Observable.java                  | 2 +-
 src/main/java/io/reactivex/Single.java                      | 2 +-
 .../operators/observable/ObservableInternalHelper.java      | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/reactivex/Completable.java b/src/main/java/io/reactivex/Completable.java
index 032fa1608f..77b8717c54 100644
--- a/src/main/java/io/reactivex/Completable.java
+++ b/src/main/java/io/reactivex/Completable.java
@@ -1415,7 +1415,7 @@ public final Completable retry(Predicate<? super Throwable> predicate) {
      * @throws NullPointerException if handler is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable retryWhen(Function<? super Flowable<? extends Throwable>, ? extends Publisher<Object>> handler) {
+    public final Completable retryWhen(Function<? super Flowable<Throwable>, ? extends Publisher<Object>> 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 c5f6a269ba..8a833b6f63 100644
--- a/src/main/java/io/reactivex/Flowable.java
+++ b/src/main/java/io/reactivex/Flowable.java
@@ -11105,7 +11105,7 @@ public final Flowable<T> retryUntil(final BooleanSupplier stop) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> retryWhen(
-            final Function<? super Flowable<? extends Throwable>, ? extends Publisher<?>> handler) {
+            final Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
         ObjectHelper.requireNonNull(handler, "handler is null");
 
         return RxJavaPlugins.onAssembly(new FlowableRetryWhen<T>(this, handler));
diff --git a/src/main/java/io/reactivex/Maybe.java b/src/main/java/io/reactivex/Maybe.java
index a7e71be142..8ef2cf5a71 100644
--- a/src/main/java/io/reactivex/Maybe.java
+++ b/src/main/java/io/reactivex/Maybe.java
@@ -3390,7 +3390,7 @@ public final Maybe<T> retryUntil(final BooleanSupplier stop) {
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> retryWhen(
-            final Function<? super Flowable<? extends Throwable>, ? extends Publisher<?>> handler) {
+            final Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
         return toFlowable().retryWhen(handler).singleElement();
     }
 
diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java
index 161530ffa5..9c39713bb6 100644
--- a/src/main/java/io/reactivex/Observable.java
+++ b/src/main/java/io/reactivex/Observable.java
@@ -9196,7 +9196,7 @@ public final Observable<T> retryUntil(final BooleanSupplier stop) {
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> retryWhen(
-            final Function<? super Observable<? extends Throwable>, ? extends ObservableSource<?>> handler) {
+            final Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler) {
         ObjectHelper.requireNonNull(handler, "handler is null");
         return RxJavaPlugins.onAssembly(new ObservableRedo<T>(this, ObservableInternalHelper.retryWhenHandler(handler)));
     }
diff --git a/src/main/java/io/reactivex/Single.java b/src/main/java/io/reactivex/Single.java
index e367a4baf7..71dcc4260e 100644
--- a/src/main/java/io/reactivex/Single.java
+++ b/src/main/java/io/reactivex/Single.java
@@ -2396,7 +2396,7 @@ public final Single<T> retry(Predicate<? super Throwable> predicate) {
      * @return the new Single instance
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> retryWhen(Function<? super Flowable<? extends Throwable>, ? extends Publisher<Object>> handler) {
+    public final Single<T> retryWhen(Function<? super Flowable<Throwable>, ? extends Publisher<Object>> handler) {
         return toSingle(toFlowable().retryWhen(handler));
     }
 
diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableInternalHelper.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableInternalHelper.java
index eb9d7a6f98..eeb2921c1b 100644
--- a/src/main/java/io/reactivex/internal/operators/observable/ObservableInternalHelper.java
+++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableInternalHelper.java
@@ -277,10 +277,10 @@ public boolean test(Notification<Object> t) throws Exception {
 
     static final class RetryWhenInner
     implements Function<Observable<Notification<Object>>, ObservableSource<?>> {
-        private final Function<? super Observable<? extends Throwable>, ? extends ObservableSource<?>> handler;
+        private final Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler;
 
         RetryWhenInner(
-                Function<? super Observable<? extends Throwable>, ? extends ObservableSource<?>> handler) {
+                Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler) {
             this.handler = handler;
         }
 
@@ -293,7 +293,7 @@ public ObservableSource<?> apply(Observable<Notification<Object>> no) throws Exc
         }
     }
 
-    public static <T> Function<Observable<Notification<Object>>, ObservableSource<?>> retryWhenHandler(final Function<? super Observable<? extends Throwable>, ? extends ObservableSource<?>> handler) {
+    public static <T> Function<Observable<Notification<Object>>, ObservableSource<?>> retryWhenHandler(final Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler) {
         return new RetryWhenInner(handler);
     }