Merge pull request #1757 from akarnokd/Cleanup_Override_n_SuppressWarnings

Cleanup: added missing annotations, removed unnecesary annotations

Author: benjchristensen

src/main/java/rx/Observable.java

@@ -3628,6 +3628,7 @@ public final Observable<T> concatWith(Observable<? extends T> t1) {
      */
     public final Observable<Boolean> contains(final Object element) {
         return exists(new Func1<T, Boolean>() {
+            @Override
             public final Boolean call(T t1) {
                 return element == null ? t1 == null : element.equals(t1);
             }
@@ -5188,6 +5189,7 @@ public final Observable<T> observeOn(Scheduler scheduler) {
      */
     public final <R> Observable<R> ofType(final Class<R> klass) {
         return filter(new Func1<T, Boolean>() {
+            @Override
             public final Boolean call(T t) {
                 return klass.isInstance(t);
             }

src/main/java/rx/Subscriber.java

@@ -71,6 +71,7 @@ public final void unsubscribe() {
      * 
      * @return {@code true} if this Subscriber has unsubscribed from its subscriptions, {@code false} otherwise
      */
+    @Override
     public final boolean isUnsubscribed() {
         return cs.isUnsubscribed();
     }

src/main/java/rx/exceptions/CompositeException.java

@@ -201,10 +201,12 @@ private static class WrappedPrintStream extends PrintStreamOrWriter {
             this.printStream = printStream;
         }
 
+        @Override
         Object lock() {
             return printStream;
         }
 
+        @Override
         void println(Object o) {
             printStream.println(o);
         }
@@ -217,10 +219,12 @@ private static class WrappedPrintWriter extends PrintStreamOrWriter {
             this.printWriter = printWriter;
         }
 
+        @Override
         Object lock() {
             return printWriter;
         }
 
+        @Override
         void println(Object o) {
             printWriter.println(o);
         }

src/main/java/rx/functions/Actions.java

@@ -27,7 +27,7 @@ private Actions() {
 
     @SuppressWarnings("unchecked")
     public static final <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> EmptyAction<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> empty() {
-        return (EmptyAction<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>) EMPTY_ACTION;
+        return EMPTY_ACTION;
     }
 
     @SuppressWarnings("rawtypes")

src/main/java/rx/functions/Functions.java

@@ -414,7 +414,7 @@ public Boolean call(Object o) {
      */
     @SuppressWarnings("unchecked")
     public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, R> NullFunction<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, R> returnNull() {
-        return (NullFunction<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, R>) NULL_FUNCTION;
+        return NULL_FUNCTION;
     }
 
     @SuppressWarnings("rawtypes")

src/main/java/rx/internal/operators/BlockingOperatorLatest.java

@@ -102,7 +102,7 @@ public boolean hasNext() {
                     }
 
                     @SuppressWarnings("unchecked")
-                    Notification<? extends T> n = (Notification<? extends T>)REFERENCE_UPDATER.getAndSet(this, null);
+                    Notification<? extends T> n = REFERENCE_UPDATER.getAndSet(this, null);
                     iNotif = n;
                     if (iNotif.isOnError()) {
                         throw Exceptions.propagate(iNotif.getThrowable());

src/main/java/rx/internal/operators/NotificationLite.java

@@ -54,6 +54,7 @@ public static <T> NotificationLite<T> instance() {
     private static final Object ON_COMPLETED_SENTINEL = new Serializable() {
         private static final long serialVersionUID = 1;
 
+        @Override
         public String toString() {
             return "Notification=>Completed";
         }
@@ -62,6 +63,7 @@ public String toString() {
     private static final Object ON_NEXT_NULL_SENTINEL = new Serializable() {
         private static final long serialVersionUID = 2;
 
+        @Override
         public String toString() {
             return "Notification=>NULL";
         }
@@ -75,6 +77,7 @@ public OnErrorSentinel(Throwable e) {
             this.e = e;
         }
 
+        @Override
         public String toString() {
             return "Notification=>Error:" + e;
         }

src/main/java/rx/internal/operators/OnSubscribeRange.java

@@ -41,7 +41,6 @@ public void call(final Subscriber<? super Integer> o) {
 
     private static final class RangeProducer implements Producer {
         private final Subscriber<? super Integer> o;
-        @SuppressWarnings("unused")
         // accessed by REQUESTED_UPDATER
         private volatile long requested;
         private static final AtomicLongFieldUpdater<RangeProducer> REQUESTED_UPDATER = AtomicLongFieldUpdater.newUpdater(RangeProducer.class, "requested");

src/main/java/rx/internal/operators/OnSubscribeUsing.java

@@ -41,6 +41,7 @@ public OnSubscribeUsing(Func0<Resource> resourceFactory,
         this.dispose = dispose;
     }
 
+    @Override
     public void call(Subscriber<? super T> subscriber) {
         try {
             final Resource resource = resourceFactory.call();

src/main/java/rx/internal/operators/OperatorGroupBy.java

@@ -273,7 +273,9 @@ private void emitItem(GroupState<K, T> groupState, Object item) {
             REQUESTED.decrementAndGet(this);
             // short circuit buffering
             if (keyRequested != null && keyRequested.get() > 0 && (q == null || q.isEmpty())) {
-                nl.accept((Observer) groupState.getObserver(), item);
+                @SuppressWarnings("unchecked")
+                Observer<Object> obs = (Observer<Object>)groupState.getObserver();
+                nl.accept(obs, item);
                 keyRequested.decrementAndGet();
             } else {
                 q.add(item);
@@ -316,7 +318,9 @@ private void drainIfPossible(GroupState<K, T> groupState) {
             while (groupState.requested.get() > 0) {
                 Object t = groupState.buffer.poll();
                 if (t != null) {
-                    nl.accept((Observer) groupState.getObserver(), t);
+                    @SuppressWarnings("unchecked")
+                    Observer<Object> obs = (Observer<Object>)groupState.getObserver();
+                    nl.accept(obs, t);
                     groupState.requested.decrementAndGet();
                     BUFFERED_COUNT.decrementAndGet(this);