2.x: cleanup based on IntelliJ 2017.1 inspections

src/main/java/io/reactivex/FlowableEmitter.java

@@ -33,14 +33,14 @@ public interface FlowableEmitter<T> extends Emitter<T> {
 
     /**
      * Sets a Disposable on this emitter; any previous Disposable
-     * or Cancellation will be unsubscribed/cancelled.
+     * or Cancellation will be disposed/cancelled.
      * @param s the disposable, null is allowed
      */
     void setDisposable(@Nullable Disposable s);
 
     /**
      * Sets a Cancellable on this emitter; any previous Disposable
-     * or Cancellation will be unsubscribed/cancelled.
+     * or Cancellation will be disposed/cancelled.
      * @param c the cancellable resource, null is allowed
      */
     void setCancellable(@Nullable Cancellable c);

src/main/java/io/reactivex/Maybe.java

@@ -660,7 +660,7 @@ public static <T> Maybe<T> fromCallable(final Callable<? extends T> callable) {
      * return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
      * method.
      * <p>
-     * <em>Important note:</em> This Maybe is blocking; you cannot unsubscribe from it.
+     * <em>Important note:</em> This Maybe is blocking; you cannot dispose it.
      * <p>
      * Unlike 1.x, cancelling the Maybe won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futureMaybe.doOnDispose(() -> future.cancel(true));}.
@@ -696,7 +696,7 @@ public static <T> Maybe<T> fromFuture(Future<? extends T> future) {
      * Unlike 1.x, cancelling the Maybe won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futureMaybe.doOnCancel(() -> future.cancel(true));}.
      * <p>
-     * <em>Important note:</em> This Maybe is blocking on the thread it gets subscribed on; you cannot unsubscribe from it.
+     * <em>Important note:</em> This Maybe is blocking on the thread it gets subscribed on; you cannot dispose it.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2036,7 +2036,7 @@ public final T blockingGet(T defaultValue) {
      * The operator subscribes only when the first downstream subscriber subscribes and maintains
      * a single subscription towards this Maybe.
      * <p>
-     * <em>Note:</em> You sacrifice the ability to unsubscribe from the origin when you use the {@code cache}.
+     * <em>Note:</em> You sacrifice the ability to dispose the origin when you use the {@code cache}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>

src/main/java/io/reactivex/Scheduler.java

@@ -199,7 +199,7 @@ public Disposable schedulePeriodicallyDirect(@NonNull Runnable run, long initial
      * size thread pool:
      * 
      * <pre>
-     * Scheduler limitSched = Schedulers.computation().when(workers -> {
+     * Scheduler limitScheduler = Schedulers.computation().when(workers -> {
      *  // use merge max concurrent to limit the number of concurrent
      *  // callbacks two at a time
      *  return Completable.merge(Flowable.merge(workers), 2);
@@ -217,7 +217,7 @@ public Disposable schedulePeriodicallyDirect(@NonNull Runnable run, long initial
      * subscription to the second.
      * 
      * <pre>
-     * Scheduler limitSched = Schedulers.computation().when(workers -> {
+     * Scheduler limitScheduler = Schedulers.computation().when(workers -> {
      *  // use merge max concurrent to limit the number of concurrent
      *  // Flowables two at a time
      *  return Completable.merge(Flowable.merge(workers, 2));
@@ -230,7 +230,7 @@ public Disposable schedulePeriodicallyDirect(@NonNull Runnable run, long initial
      * bucket algorithm).
      * 
      * <pre>
-     * Scheduler slowSched = Schedulers.computation().when(workers -> {
+     * Scheduler slowScheduler = Schedulers.computation().when(workers -> {
      *  // use concatenate to make each worker happen one at a time.
      *  return Completable.concat(workers.map(actions -> {
      *      // delay the starting of the next worker by 1 second.
@@ -254,7 +254,7 @@ public <S extends Scheduler & Disposable> S when(@NonNull Function<Flowable<Flow
     /**
      * Sequential Scheduler for executing actions on a single thread or event loop.
      * <p>
-     * Unsubscribing the {@link Worker} cancels all outstanding work and allows resource cleanup.
+     * Disposing the {@link Worker} cancels all outstanding work and allows resource cleanup.
      */
     public abstract static class Worker implements Disposable {
         /**

src/main/java/io/reactivex/Single.java

@@ -457,7 +457,7 @@ public static <T> Single<T> fromCallable(final Callable<? extends T> callable) {
      * value of the {@link Future#get} method of that object, by passing the object into the {@code from}
      * method.
      * <p>
-     * <em>Important note:</em> This Single is blocking; you cannot unsubscribe from it.
+     * <em>Important note:</em> This Single is blocking; you cannot dispose it.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -486,7 +486,7 @@ public static <T> Single<T> fromFuture(Future<? extends T> future) {
      * the return value of the {@link Future#get} method of that object, by passing the object into the
      * {@code from} method.
      * <p>
-     * <em>Important note:</em> This {@code Single} is blocking; you cannot unsubscribe from it.
+     * <em>Important note:</em> This {@code Single} is blocking; you cannot dispose it.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -519,7 +519,7 @@ public static <T> Single<T> fromFuture(Future<? extends T> future, long timeout,
      * the return value of the {@link Future#get} method of that object, by passing the object into the
      * {@code from} method.
      * <p>
-     * <em>Important note:</em> This {@code Single} is blocking; you cannot unsubscribe from it.
+     * <em>Important note:</em> This {@code Single} is blocking; you cannot dispose it.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>You specify the {@link Scheduler} where the blocking wait will happen.</dd>

src/main/java/io/reactivex/exceptions/CompositeException.java

@@ -49,7 +49,7 @@ public final class CompositeException extends RuntimeException {
      */
     public CompositeException(Throwable... exceptions) {
         this(exceptions == null ?
-            Arrays.asList(new NullPointerException("exceptions was null")) : Arrays.asList(exceptions));
+                Collections.singletonList(new NullPointerException("exceptions was null")) : Arrays.asList(exceptions));
     }
 
     /**
@@ -129,7 +129,7 @@ public synchronized Throwable getCause() { // NOPMD
                     chain.initCause(e);
                 } catch (Throwable t) { // NOPMD
                     // ignore
-                    // the javadocs say that some Throwables (depending on how they're made) will never
+                    // the JavaDocs say that some Throwables (depending on how they're made) will never
                     // let me call initCause without blowing up even if it returns null
                 }
                 chain = getRootCause(chain);

src/main/java/io/reactivex/internal/fuseable/SimplePlainQueue.java

@@ -18,7 +18,7 @@
 /**
  * Override of the SimpleQueue interface with no throws Exception on poll().
  *
- * @param <T> the value type to enqueue and dequeue, not null
+ * @param <T> the value type to offer and poll, not null
  */
 public interface SimplePlainQueue<T> extends SimpleQueue<T> {
 

src/main/java/io/reactivex/internal/fuseable/SimpleQueue.java

@@ -18,7 +18,7 @@
 /**
  * A minimalist queue interface without the method bloat of java.util.Collection and java.util.Queue.
  *
- * @param <T> the value type to enqueue and dequeue, not null
+ * @param <T> the value type to offer and poll, not null
  */
 public interface SimpleQueue<T> {
 

src/main/java/io/reactivex/internal/operators/completable/CompletableAmb.java

@@ -48,7 +48,7 @@ public void subscribeActual(final CompletableObserver s) {
                         sources = b;
                     }
                     sources[count++] = element;
-                };
+                }
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 EmptyDisposable.error(e, s);

src/main/java/io/reactivex/internal/operators/flowable/FlowableCache.java

@@ -167,7 +167,6 @@ public void removeChild(ReplaySubscription<T> p) {
                 ReplaySubscription<T>[] b;
                 if (n == 1) {
                     b = EMPTY;
-                    return;
                 } else {
                     b = new ReplaySubscription[n - 1];
                     System.arraycopy(a, 0, b, 0, j);

src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletable.java

@@ -129,7 +129,6 @@ public void onError(Throwable e) {
                     if (decrementAndGet() == 0) {
                         Throwable ex = errors.terminate();
                         actual.onError(ex);
-                        return;
                     } else {
                         if (maxConcurrency != Integer.MAX_VALUE) {
                             s.request(1);
@@ -140,7 +139,6 @@ public void onError(Throwable e) {
                     if (getAndSet(0) > 0) {
                         Throwable ex = errors.terminate();
                         actual.onError(ex);
-                        return;
                     }
                 }
             } else {

src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java

@@ -136,7 +136,6 @@ public void onError(Throwable e) {
                     if (decrementAndGet() == 0) {
                         Throwable ex = errors.terminate();
                         actual.onError(ex);
-                        return;
                     } else {
                         if (maxConcurrency != Integer.MAX_VALUE) {
                             s.request(1);
@@ -147,7 +146,6 @@ public void onError(Throwable e) {
                     if (getAndSet(0) > 0) {
                         Throwable ex = errors.terminate();
                         actual.onError(ex);
-                        return;
                     }
                 }
             } else {

src/main/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterable.java

@@ -270,7 +270,6 @@ void drain() {
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             s.cancel();
-                            it = null;
                             ExceptionHelper.addThrowable(error, ex);
                             ex = ExceptionHelper.terminate(error);
                             a.onError(ex);

src/main/java/io/reactivex/internal/operators/flowable/FlowableWindow.java

@@ -72,8 +72,6 @@ static final class WindowExactSubscriber<T>
 
         UnicastProcessor<T> window;
 
-        boolean done;
-
         WindowExactSubscriber(Subscriber<? super Flowable<T>> actual, long size, int bufferSize) {
             super(1);
             this.actual = actual;
@@ -92,10 +90,6 @@ public void onSubscribe(Subscription s) {
 
         @Override
         public void onNext(T t) {
-            if (done) {
-                return;
-            }
-
             long i = index;
 
             UnicastProcessor<T> w = window;
@@ -123,10 +117,6 @@ public void onNext(T t) {
 
         @Override
         public void onError(Throwable t) {
-            if (done) {
-                RxJavaPlugins.onError(t);
-                return;
-            }
             Processor<T, T> w = window;
             if (w != null) {
                 window = null;
@@ -138,10 +128,6 @@ public void onError(Throwable t) {
 
         @Override
         public void onComplete() {
-            if (done) {
-                return;
-            }
-
             Processor<T, T> w = window;
             if (w != null) {
                 window = null;
@@ -199,8 +185,6 @@ static final class WindowSkipSubscriber<T>
 
         UnicastProcessor<T> window;
 
-        boolean done;
-
         WindowSkipSubscriber(Subscriber<? super Flowable<T>> actual, long size, long skip, int bufferSize) {
             super(1);
             this.actual = actual;
@@ -221,10 +205,6 @@ public void onSubscribe(Subscription s) {
 
         @Override
         public void onNext(T t) {
-            if (done) {
-                return;
-            }
-
             long i = index;
 
             UnicastProcessor<T> w = window;
@@ -258,10 +238,6 @@ public void onNext(T t) {
 
         @Override
         public void onError(Throwable t) {
-            if (done) {
-                RxJavaPlugins.onError(t);
-                return;
-            }
             Processor<T, T> w = window;
             if (w != null) {
                 window = null;
@@ -273,10 +249,6 @@ public void onError(Throwable t) {
 
         @Override
         public void onComplete() {
-            if (done) {
-                return;
-            }
-
             Processor<T, T> w = window;
             if (w != null) {
                 window = null;

src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowTimed.java

@@ -788,15 +788,13 @@ void drainLoop() {
                                 worker.schedule(new Completion(w), timespan, unit);
                             } else {
                                 a.onError(new MissingBackpressureException("Can't emit window due to lack of requests"));
-                                continue;
                             }
                         } else {
                             ws.remove(work.w);
                             work.w.onComplete();
                             if (ws.isEmpty() && cancelled) {
                                 terminated = true;
                             }
-                            continue;
                         }
                     } else {
                         for (UnicastProcessor<T> w : ws) {

src/main/java/io/reactivex/internal/operators/flowable/FlowableZip.java

@@ -98,8 +98,6 @@ static final class ZipCoordinator<T, R>
 
         final boolean delayErrors;
 
-        volatile boolean done;
-
         volatile boolean cancelled;
 
         final Object[] current;
@@ -112,7 +110,7 @@ static final class ZipCoordinator<T, R>
             @SuppressWarnings("unchecked")
             ZipSubscriber<T, R>[] a = new ZipSubscriber[n];
             for (int i = 0; i < n; i++) {
-                a[i] = new ZipSubscriber<T, R>(this, prefetch, i);
+                a[i] = new ZipSubscriber<T, R>(this, prefetch);
             }
             this.current = new Object[n];
             this.subscribers = a;
@@ -123,7 +121,7 @@ static final class ZipCoordinator<T, R>
         void subscribe(Publisher<? extends T>[] sources, int n) {
             ZipSubscriber<T, R>[] a = subscribers;
             for (int i = 0; i < n; i++) {
-                if (done || cancelled || (!delayErrors && errors.get() != null)) {
+                if (cancelled || (!delayErrors && errors.get() != null)) {
                     return;
                 }
                 sources[i].subscribe(a[i]);
@@ -333,8 +331,6 @@ static final class ZipSubscriber<T, R> extends AtomicReference<Subscription> imp
 
         final int limit;
 
-        final int index;
-
         SimpleQueue<T> queue;
 
         long produced;
@@ -343,10 +339,9 @@ static final class ZipSubscriber<T, R> extends AtomicReference<Subscription> imp
 
         int sourceMode;
 
-        ZipSubscriber(ZipCoordinator<T, R> parent, int prefetch, int index) {
+        ZipSubscriber(ZipCoordinator<T, R> parent, int prefetch) {
             this.parent = parent;
             this.prefetch = prefetch;
-            this.index = index;
             this.limit = prefetch - (prefetch >> 2);
         }