2.x: fix imports and raw type usage.

Author: akarnokd

src/test/java/io/reactivex/plugins/RxJavaPluginsTest.java

@@ -16,16 +16,26 @@
 
 package io.reactivex.plugins;
 
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import org.junit.*;
+import org.reactivestreams.*;
+
 import io.reactivex.*;
+import io.reactivex.Observable;
+import io.reactivex.Observer;
 import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
+import io.reactivex.disposables.*;
 import io.reactivex.exceptions.TestException;
 import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.BiFunction;
-import io.reactivex.functions.BooleanSupplier;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
+import io.reactivex.functions.*;
 import io.reactivex.internal.functions.Functions;
 import io.reactivex.internal.operators.completable.CompletableError;
 import io.reactivex.internal.operators.flowable.FlowableRange;
@@ -38,23 +48,6 @@
 import io.reactivex.observables.ConnectableObservable;
 import io.reactivex.parallel.ParallelFlowable;
 import io.reactivex.schedulers.Schedulers;
-import org.junit.*;
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
-
-import java.io.IOException;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.junit.Assert.*;
 
 public class RxJavaPluginsTest {
 
@@ -1178,8 +1171,10 @@ public void uncaughtException(Thread t, Throwable e) {
 
     /**
      * Ensure set*() accepts a consumers/functions with wider bounds
+     * @throws Exception on error
      */
     @Test
+    @SuppressWarnings("rawtypes")
     public void onErrorWithSuper() throws Exception {
         try {
             Consumer<? super Throwable> errorHandler = new Consumer<Throwable>() {

src/test/java/io/reactivex/schedulers/NewThreadSchedulerTest.java

@@ -118,6 +118,7 @@ public void run() {
 
     /**
      * Regression test to ensure there is no NPE when the worker has been disposed
+     * @throws Exception on error
      */
     @Test
     public void npeRegression() throws Exception {