1.x: increase coverage of internal utils, remove unused/unnecessary items (ReactiveX#4119)

* 1.x: increase coverage of internal utils, remove unused/unnecessary
items

* fix wrong assertion

Author: akarnokd

src/main/java/rx/Observable.java

@@ -9158,7 +9158,7 @@ static <T> Subscription subscribe(Subscriber<? super T> subscriber, Observable<T
             Exceptions.throwIfFatal(e);
             // in case the subscriber can't listen to exceptions anymore
             if (subscriber.isUnsubscribed()) {
-                RxJavaPluginUtils.handleException(RxJavaHooks.onObservableError(e));
+                RxJavaHooks.onError(RxJavaHooks.onObservableError(e));
             } else {
                 // if an unhandled error occurs executing the onSubscribe we will propagate it
                 try {

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

@@ -15,14 +15,12 @@
  */
 package rx.internal.operators;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
+import java.util.*;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 
-import rx.Notification;
+import rx.*;
 import rx.Observable;
-import rx.Subscriber;
 import rx.exceptions.Exceptions;
 
 /**

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

@@ -15,8 +15,7 @@
  */
 package rx.internal.operators;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
+import java.util.*;
 
 import rx.Observable;
 import rx.Subscriber;

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

@@ -15,15 +15,12 @@
  */
 package rx.internal.operators;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
+import java.util.*;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import rx.Notification;
+import rx.*;
 import rx.Observable;
-import rx.Subscriber;
 import rx.exceptions.Exceptions;
 
 /**

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

@@ -15,17 +15,10 @@
  */
 package rx.internal.operators;
 
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
-import rx.Observable;
-import rx.Subscriber;
-import rx.Subscription;
+import rx.*;
 
 /**
  * Returns a Future representing the single value emitted by an Observable.

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

@@ -15,14 +15,11 @@
  */
 package rx.internal.operators;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.*;
+import java.util.concurrent.*;
 
-import rx.Notification;
+import rx.*;
 import rx.Observable;
-import rx.Subscriber;
 import rx.exceptions.Exceptions;
 import rx.internal.util.RxRingBuffer;
 

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

@@ -18,8 +18,7 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReference;
 
-import rx.Observer;
-import rx.Subscriber;
+import rx.*;
 import rx.functions.Action0;
 import rx.subjects.Subject;
 import rx.subscriptions.Subscriptions;

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

@@ -15,16 +15,13 @@
  */
 package rx.internal.operators;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReference;
 
+import rx.*;
 import rx.Observable;
 import rx.Observable.OnSubscribe;
-import rx.Producer;
-import rx.Subscriber;
 import rx.functions.Action0;
 import rx.subscriptions.Subscriptions;
 

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

@@ -17,9 +17,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import rx.*;
 import rx.Observable.OnSubscribe;
-import rx.Subscriber;
-import rx.Subscription;
 import rx.functions.Action1;
 import rx.observables.ConnectableObservable;
 import rx.observers.Subscribers;

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

@@ -15,9 +15,8 @@
  */
 package rx.internal.operators;
 
-import rx.Observable;
+import rx.*;
 import rx.Observable.OnSubscribe;
-import rx.Subscriber;
 import rx.exceptions.Exceptions;
 import rx.functions.Func0;
 import rx.observers.Subscribers;

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

@@ -19,7 +19,7 @@
 import rx.*;
 import rx.Observable.OnSubscribe;
 import rx.observers.Subscribers;
-import rx.plugins.*;
+import rx.plugins.RxJavaHooks;
 import rx.subscriptions.*;
 
 /**

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

@@ -19,7 +19,7 @@
 
 import rx.*;
 import rx.Observable.OnSubscribe;
-import rx.internal.util.RxJavaPluginUtils;
+import rx.plugins.RxJavaHooks;
 
 /**
  * Nulls out references to upstream data structures when the source terminates or 
@@ -80,7 +80,7 @@ public void onError(Throwable e) {
             if (a != null) {
                 a.onError(e);
             } else {
-                RxJavaPluginUtils.handleException(e);
+                RxJavaHooks.onError(e);
             }
         }
 

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

@@ -19,7 +19,7 @@
 import rx.Observable.OnSubscribe;
 import rx.exceptions.*;
 import rx.functions.Func1;
-import rx.internal.util.RxJavaPluginUtils;
+import rx.plugins.RxJavaHooks;
 
 /**
  * Filters an Observable by discarding any items it emits that do not meet some test.
@@ -82,7 +82,7 @@ public void onNext(T t) {
         @Override
         public void onError(Throwable e) {
             if (done) {
-                RxJavaPluginUtils.handleException(e);
+                RxJavaHooks.onError(e);
                 return;
             }
             done = true;

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

@@ -27,6 +27,7 @@
 import rx.internal.util.*;
 import rx.internal.util.atomic.*;
 import rx.internal.util.unsafe.*;
+import rx.plugins.RxJavaHooks;
 
 /**
  * Flattens a sequence if Iterable sources, generated via a function, into a single sequence.
@@ -136,7 +137,7 @@ public void onError(Throwable e) {
                 done = true;
                 drain();
             } else {
-                RxJavaPluginUtils.handleException(e);
+                RxJavaHooks.onError(e);
             }
         }
 

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

@@ -16,13 +16,12 @@
 
 package rx.internal.operators;
 
-import rx.Observable;
-import rx.Subscriber;
+import java.util.concurrent.Callable;
+
+import rx.*;
 import rx.exceptions.Exceptions;
 import rx.internal.producers.SingleDelayedProducer;
 
-import java.util.concurrent.Callable;
-
 /**
  * Do not invoke the function until an Observer subscribes; Invokes function on each
  * subscription.

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

@@ -19,7 +19,7 @@
 import rx.Observable.*;
 import rx.Subscriber;
 import rx.exceptions.Exceptions;
-import rx.plugins.*;
+import rx.plugins.RxJavaHooks;
 
 /**
  * Transforms the downstream Subscriber into a Subscriber via an operator

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

@@ -19,7 +19,7 @@
 import rx.Observable.OnSubscribe;
 import rx.exceptions.*;
 import rx.functions.Func1;
-import rx.internal.util.RxJavaPluginUtils;
+import rx.plugins.RxJavaHooks;
 
 /**
  * Applies a function of your choosing to every item emitted by an {@code Observable}, and emits the results of
@@ -80,7 +80,7 @@ public void onNext(T t) {
         @Override
         public void onError(Throwable e) {
             if (done) {
-                RxJavaPluginUtils.handleException(e);
+                RxJavaHooks.onError(e);
                 return;
             }
             done = true;

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

@@ -15,8 +15,8 @@
  */
 package rx.internal.operators;
 
-import rx.*;
 import rx.Observable.OnSubscribe;
+import rx.Subscriber;
 import rx.exceptions.AssemblyStackTraceException;
 
 /**

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

@@ -33,19 +33,11 @@
 
 import static rx.Observable.create;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-
-import rx.Notification;
-import rx.Observable;
-import rx.Observable.OnSubscribe;
-import rx.Observable.Operator;
-import rx.Producer;
-import rx.Scheduler;
-import rx.Subscriber;
-import rx.functions.Action0;
-import rx.functions.Func1;
-import rx.functions.Func2;
+import java.util.concurrent.atomic.*;
+
+import rx.*;
+import rx.Observable.*;
+import rx.functions.*;
 import rx.internal.producers.ProducerArbiter;
 import rx.observers.Subscribers;
 import rx.schedulers.Schedulers;

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

@@ -15,18 +15,14 @@
  */
 package rx.internal.operators;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.ReentrantLock;
 
+import rx.*;
 import rx.Observable.OnSubscribe;
-import rx.Subscriber;
-import rx.Subscription;
-import rx.functions.Action0;
-import rx.functions.Action1;
+import rx.functions.*;
 import rx.observables.ConnectableObservable;
-import rx.subscriptions.CompositeSubscription;
-import rx.subscriptions.Subscriptions;
+import rx.subscriptions.*;
 
 /**
  * Returns an observable sequence that stays connected to the source as long as

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

@@ -15,13 +15,10 @@
  */
 package rx.internal.operators;
 
-import rx.Observable;
-import rx.Single;
-import rx.SingleSubscriber;
-import rx.Subscriber;
-
 import java.util.NoSuchElementException;
 
+import rx.*;
+
 /**
  * Allows conversion of an Observable to a Single ensuring that exactly one item is emitted - no more and no less.
  * Also forwards errors as appropriate.

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

@@ -16,11 +16,11 @@
 package rx.internal.operators;
 
 import java.util.concurrent.TimeUnit;
+
+import rx.*;
 import rx.Observable.OnSubscribe;
-import rx.Scheduler;
 import rx.Scheduler.Worker;
 import rx.exceptions.Exceptions;
-import rx.Subscriber;
 import rx.functions.Action0;
 
 /**

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

@@ -16,11 +16,11 @@
 package rx.internal.operators;
 
 import java.util.concurrent.TimeUnit;
+
+import rx.*;
 import rx.Observable.OnSubscribe;
-import rx.Scheduler;
 import rx.Scheduler.Worker;
 import rx.exceptions.Exceptions;
-import rx.Subscriber;
 import rx.functions.Action0;
 
 /**

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

@@ -15,12 +15,11 @@
  */
 package rx.internal.operators;
 
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 import rx.Observable.OnSubscribe;
-import rx.exceptions.Exceptions;
 import rx.Subscriber;
+import rx.exceptions.Exceptions;
 import rx.functions.Action0;
 import rx.internal.producers.SingleProducer;
 import rx.subscriptions.Subscriptions;

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

@@ -15,17 +15,15 @@
  */
 package rx.internal.operators;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 import rx.Observable;
 import rx.Observable.Operator;
-import rx.exceptions.Exceptions;
 import rx.Observer;
 import rx.Subscriber;
+import rx.exceptions.Exceptions;
 import rx.functions.Func0;
-import rx.observers.SerializedSubscriber;
-import rx.observers.Subscribers;
+import rx.observers.*;
 
 /**
  * This operation takes