Skip to content

Commit 1b0ccc8

Browse files
committed
Cleanup: added missing annotations, removed unnecesary annotations
1 parent dd38912 commit 1b0ccc8

33 files changed

+86
-23
lines changed

src/main/java/rx/Observable.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3628,6 +3628,7 @@ public final Observable<T> concatWith(Observable<? extends T> t1) {
36283628
*/
36293629
public final Observable<Boolean> contains(final Object element) {
36303630
return exists(new Func1<T, Boolean>() {
3631+
@Override
36313632
public final Boolean call(T t1) {
36323633
return element == null ? t1 == null : element.equals(t1);
36333634
}
@@ -5188,6 +5189,7 @@ public final Observable<T> observeOn(Scheduler scheduler) {
51885189
*/
51895190
public final <R> Observable<R> ofType(final Class<R> klass) {
51905191
return filter(new Func1<T, Boolean>() {
5192+
@Override
51915193
public final Boolean call(T t) {
51925194
return klass.isInstance(t);
51935195
}

src/main/java/rx/Subscriber.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public final void unsubscribe() {
7171
*
7272
* @return {@code true} if this Subscriber has unsubscribed from its subscriptions, {@code false} otherwise
7373
*/
74+
@Override
7475
public final boolean isUnsubscribed() {
7576
return cs.isUnsubscribed();
7677
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,12 @@ private static class WrappedPrintStream extends PrintStreamOrWriter {
201201
this.printStream = printStream;
202202
}
203203

204+
@Override
204205
Object lock() {
205206
return printStream;
206207
}
207208

209+
@Override
208210
void println(Object o) {
209211
printStream.println(o);
210212
}
@@ -217,10 +219,12 @@ private static class WrappedPrintWriter extends PrintStreamOrWriter {
217219
this.printWriter = printWriter;
218220
}
219221

222+
@Override
220223
Object lock() {
221224
return printWriter;
222225
}
223226

227+
@Override
224228
void println(Object o) {
225229
printWriter.println(o);
226230
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private Actions() {
2727

2828
@SuppressWarnings("unchecked")
2929
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() {
30-
return (EmptyAction<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>) EMPTY_ACTION;
30+
return EMPTY_ACTION;
3131
}
3232

3333
@SuppressWarnings("rawtypes")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public Boolean call(Object o) {
414414
*/
415415
@SuppressWarnings("unchecked")
416416
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() {
417-
return (NullFunction<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, R>) NULL_FUNCTION;
417+
return NULL_FUNCTION;
418418
}
419419

420420
@SuppressWarnings("rawtypes")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public boolean hasNext() {
102102
}
103103

104104
@SuppressWarnings("unchecked")
105-
Notification<? extends T> n = (Notification<? extends T>)REFERENCE_UPDATER.getAndSet(this, null);
105+
Notification<? extends T> n = REFERENCE_UPDATER.getAndSet(this, null);
106106
iNotif = n;
107107
if (iNotif.isOnError()) {
108108
throw Exceptions.propagate(iNotif.getThrowable());

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public static <T> NotificationLite<T> instance() {
5454
private static final Object ON_COMPLETED_SENTINEL = new Serializable() {
5555
private static final long serialVersionUID = 1;
5656

57+
@Override
5758
public String toString() {
5859
return "Notification=>Completed";
5960
}
@@ -62,6 +63,7 @@ public String toString() {
6263
private static final Object ON_NEXT_NULL_SENTINEL = new Serializable() {
6364
private static final long serialVersionUID = 2;
6465

66+
@Override
6567
public String toString() {
6668
return "Notification=>NULL";
6769
}
@@ -75,6 +77,7 @@ public OnErrorSentinel(Throwable e) {
7577
this.e = e;
7678
}
7779

80+
@Override
7881
public String toString() {
7982
return "Notification=>Error:" + e;
8083
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public void call(final Subscriber<? super Integer> o) {
4141

4242
private static final class RangeProducer implements Producer {
4343
private final Subscriber<? super Integer> o;
44-
@SuppressWarnings("unused")
4544
// accessed by REQUESTED_UPDATER
4645
private volatile long requested;
4746
private static final AtomicLongFieldUpdater<RangeProducer> REQUESTED_UPDATER = AtomicLongFieldUpdater.newUpdater(RangeProducer.class, "requested");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public OnSubscribeUsing(Func0<Resource> resourceFactory,
4141
this.dispose = dispose;
4242
}
4343

44+
@Override
4445
public void call(Subscriber<? super T> subscriber) {
4546
try {
4647
final Resource resource = resourceFactory.call();

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,9 @@ private void emitItem(GroupState<K, T> groupState, Object item) {
273273
REQUESTED.decrementAndGet(this);
274274
// short circuit buffering
275275
if (keyRequested != null && keyRequested.get() > 0 && (q == null || q.isEmpty())) {
276-
nl.accept((Observer) groupState.getObserver(), item);
276+
@SuppressWarnings("unchecked")
277+
Observer<Object> obs = (Observer<Object>)groupState.getObserver();
278+
nl.accept(obs, item);
277279
keyRequested.decrementAndGet();
278280
} else {
279281
q.add(item);
@@ -316,7 +318,9 @@ private void drainIfPossible(GroupState<K, T> groupState) {
316318
while (groupState.requested.get() > 0) {
317319
Object t = groupState.buffer.poll();
318320
if (t != null) {
319-
nl.accept((Observer) groupState.getObserver(), t);
321+
@SuppressWarnings("unchecked")
322+
Observer<Object> obs = (Observer<Object>)groupState.getObserver();
323+
nl.accept(obs, t);
320324
groupState.requested.decrementAndGet();
321325
BUFFERED_COUNT.decrementAndGet(this);
322326

0 commit comments

Comments
 (0)