Skip to content

enhance generics on onErrorResumeNext and onErrorReturn #4452

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/main/java/rx/Observable.java
Original file line number Diff line number Diff line change
Expand Up @@ -8035,7 +8035,7 @@ public final Observable<T> onBackpressureLatest() {
* @return the original Observable, with appropriately modified behavior
* @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
*/
public final Observable<T> onErrorResumeNext(final Func1<Throwable, ? extends Observable<? extends T>> resumeFunction) {
public final Observable<T> onErrorResumeNext(final Func1<? super Throwable, ? extends Observable<? extends T>> resumeFunction) {
return lift(new OperatorOnErrorResumeNextViaFunction<T>(resumeFunction));
}

Expand Down Expand Up @@ -8111,7 +8111,7 @@ public final Observable<T> onErrorResumeNext(final Observable<? extends T> resum
* @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
*/
@SuppressWarnings("cast")
public final Observable<T> onErrorReturn(Func1<Throwable, ? extends T> resumeFunction) {
public final Observable<T> onErrorReturn(Func1<? super Throwable, ? extends T> resumeFunction) {
return lift((Operator<T, T>)OperatorOnErrorResumeNextViaFunction.withSingle(resumeFunction));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
*/
public final class OperatorOnErrorResumeNextViaFunction<T> implements Operator<T, T> {

final Func1<Throwable, ? extends Observable<? extends T>> resumeFunction;
final Func1<? super Throwable, ? extends Observable<? extends T>> resumeFunction;

public static <T> OperatorOnErrorResumeNextViaFunction<T> withSingle(final Func1<Throwable, ? extends T> resumeFunction) {
public static <T> OperatorOnErrorResumeNextViaFunction<T> withSingle(final Func1<? super Throwable, ? extends T> resumeFunction) {
return new OperatorOnErrorResumeNextViaFunction<T>(new Func1<Throwable, Observable<? extends T>>() {
@Override
public Observable<? extends T> call(Throwable t) {
Expand Down Expand Up @@ -76,7 +76,7 @@ public Observable<? extends T> call(Throwable t) {
});
}

public OperatorOnErrorResumeNextViaFunction(Func1<Throwable, ? extends Observable<? extends T>> f) {
public OperatorOnErrorResumeNextViaFunction(Func1<? super Throwable, ? extends Observable<? extends T>> f) {
this.resumeFunction = f;
}

Expand Down