removed some <? super Throwable>s because that's rather unnecessary

Author: Joachim Hofer

rxjava-core/src/main/java/rx/Observable.java

@@ -287,7 +287,7 @@ public Subscription subscribe(final Action1<? super T> onNext, Scheduler schedul
         return subscribeOn(scheduler).subscribe(onNext);
     }
 
-    public Subscription subscribe(final Action1<? super T> onNext, final Action1<? super Throwable> onError) {
+    public Subscription subscribe(final Action1<? super T> onNext, final Action1<Throwable> onError) {
         if (onNext == null) {
             throw new IllegalArgumentException("onNext can not be null");
         }
@@ -321,11 +321,11 @@ public void onNext(T args) {
         });
     }
 
-    public Subscription subscribe(final Action1<? super T> onNext, final Action1<? super Throwable> onError, Scheduler scheduler) {
+    public Subscription subscribe(final Action1<? super T> onNext, final Action1<Throwable> onError, Scheduler scheduler) {
         return subscribeOn(scheduler).subscribe(onNext, onError);
     }
 
-    public Subscription subscribe(final Action1<? super T> onNext, final Action1<? super Throwable> onError, final Action0 onComplete) {
+    public Subscription subscribe(final Action1<? super T> onNext, final Action1<Throwable> onError, final Action0 onComplete) {
         if (onNext == null) {
             throw new IllegalArgumentException("onNext can not be null");
         }
@@ -362,7 +362,7 @@ public void onNext(T args) {
         });
     }
 
-    public Subscription subscribe(final Action1<? super T> onNext, final Action1<? super Throwable> onError, final Action0 onComplete, Scheduler scheduler) {
+    public Subscription subscribe(final Action1<? super T> onNext, final Action1<Throwable> onError, final Action0 onComplete, Scheduler scheduler) {
         return subscribeOn(scheduler).subscribe(onNext, onError, onComplete);
     }
 
@@ -1730,7 +1730,7 @@ public <T2> Observable<T2> dematerialize() {
      *            encounters an error
      * @return the original Observable, with appropriately modified behavior
      */
-    public Observable<T> onErrorResumeNext(final Func1<? super Throwable, ? extends Observable<? extends T>> resumeFunction) {
+    public Observable<T> onErrorResumeNext(final Func1<Throwable, ? extends Observable<? extends T>> resumeFunction) {
         return create(OperationOnErrorResumeNextViaFunction.onErrorResumeNextViaFunction(this, resumeFunction));
     }
 
@@ -1815,7 +1815,7 @@ public Observable<T> onExceptionResumeNext(final Observable<? extends T> resumeS
      *            Observable encounters an error
      * @return the original Observable with appropriately modified behavior
      */
-    public Observable<T> onErrorReturn(Func1<? super Throwable, ? extends T> resumeFunction) {
+    public Observable<T> onErrorReturn(Func1<Throwable, ? extends T> resumeFunction) {
         return create(OperationOnErrorReturn.onErrorReturn(this, resumeFunction));
     }
 

rxjava-core/src/main/java/rx/operators/OperationGroupBy.java

@@ -418,7 +418,7 @@ public String call(Event event) {
                         }
                     });
 
-                };
+                }
             }).subscribe(new Observer<String>() {
 
                 @Override
@@ -515,7 +515,7 @@ public String call(Event event) {
                                         }
                                     });
 
-                        };
+                        }
                     }).subscribe(new Observer<String>() {
 
                         @Override

rxjava-core/src/main/java/rx/operators/OperationOnErrorResumeNextViaFunction.java

@@ -53,16 +53,16 @@
  */
 public final class OperationOnErrorResumeNextViaFunction<T> {
 
-    public static <T> Func1<Observer<? super T>, Subscription> onErrorResumeNextViaFunction(Observable<? extends T> originalSequence, Func1<? super Throwable, ? extends Observable<? extends T>> resumeFunction) {
+    public static <T> Func1<Observer<? super T>, Subscription> onErrorResumeNextViaFunction(Observable<? extends T> originalSequence, Func1<Throwable, ? extends Observable<? extends T>> resumeFunction) {
         return new OnErrorResumeNextViaFunction<T>(originalSequence, resumeFunction);
     }
 
     private static class OnErrorResumeNextViaFunction<T> implements Func1<Observer<? super T>, Subscription> {
 
-        private final Func1<? super Throwable, ? extends Observable<? extends T>> resumeFunction;
+        private final Func1<Throwable, ? extends Observable<? extends T>> resumeFunction;
         private final Observable<? extends T> originalSequence;
 
-        public OnErrorResumeNextViaFunction(Observable<? extends T> originalSequence, Func1<? super Throwable, ? extends Observable<? extends T>> resumeFunction) {
+        public OnErrorResumeNextViaFunction(Observable<? extends T> originalSequence, Func1<Throwable, ? extends Observable<? extends T>> resumeFunction) {
             this.resumeFunction = resumeFunction;
             this.originalSequence = originalSequence;
         }

rxjava-core/src/main/java/rx/operators/OperationOnErrorReturn.java

@@ -50,15 +50,15 @@
  */
 public final class OperationOnErrorReturn<T> {
 
-    public static <T> Func1<Observer<? super T>, Subscription> onErrorReturn(Observable<? extends T> originalSequence, Func1<? super Throwable, ? extends T> resumeFunction) {
+    public static <T> Func1<Observer<? super T>, Subscription> onErrorReturn(Observable<? extends T> originalSequence, Func1<Throwable, ? extends T> resumeFunction) {
         return new OnErrorReturn<T>(originalSequence, resumeFunction);
     }
 
     private static class OnErrorReturn<T> implements Func1<Observer<? super T>, Subscription> {
-        private final Func1<? super Throwable, ? extends T> resumeFunction;
+        private final Func1<Throwable, ? extends T> resumeFunction;
         private final Observable<? extends T> originalSequence;
 
-        public OnErrorReturn(Observable<? extends T> originalSequence, Func1<? super Throwable, ? extends T> resumeFunction) {
+        public OnErrorReturn(Observable<? extends T> originalSequence, Func1<Throwable, ? extends T> resumeFunction) {
             this.resumeFunction = resumeFunction;
             this.originalSequence = originalSequence;
         }