Organize Imports

Author: benjchristensen

rxjava-core/src/main/java/rx/Observable.java

@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
@@ -77,7 +76,6 @@
 import rx.util.OnErrorNotImplementedException;
 import rx.util.Range;
 import rx.util.Timestamped;
-import rx.util.functions.Action;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
 import rx.util.functions.Func0;
@@ -87,7 +85,6 @@
 import rx.util.functions.Func4;
 import rx.util.functions.FuncN;
 import rx.util.functions.Function;
-import rx.util.functions.Functions;
 
 /**
  * The Observable interface that implements the Reactive Pattern.

rxjava-core/src/main/java/rx/Scheduler.java

@@ -29,7 +29,6 @@
 import rx.concurrency.TestScheduler;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action0;
-import rx.util.functions.Func0;
 import rx.util.functions.Func1;
 import rx.util.functions.Func2;
 

rxjava-core/src/main/java/rx/observables/BlockingObservable.java

@@ -15,18 +15,16 @@
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
-import rx.operators.SafeObservableSubscription;
-import rx.operators.SafeObserver;
 import rx.operators.OperationMostRecent;
 import rx.operators.OperationNext;
 import rx.operators.OperationToFuture;
 import rx.operators.OperationToIterator;
+import rx.operators.SafeObservableSubscription;
+import rx.operators.SafeObserver;
 import rx.subscriptions.BooleanSubscription;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action1;
 import rx.util.functions.Func1;
-import rx.util.functions.FuncN;
-import rx.util.functions.Functions;
 
 /**
  * An extension of {@link Observable} that provides blocking operators.

rxjava-core/src/main/java/rx/operators/OperationAll.java

@@ -1,17 +1,16 @@
 package rx.operators;
 
+import static org.mockito.Mockito.*;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.junit.Test;
+
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
 import rx.util.functions.Func1;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 /**
  * Returns an Observable that emits a Boolean that indicates whether all items emitted by an
  * Observable satisfy a condition.

rxjava-core/src/main/java/rx/operators/OperationMulticast.java

@@ -15,7 +15,10 @@
  */
 package rx.operators;
 
+import static org.mockito.Mockito.*;
+
 import org.junit.Test;
+
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
@@ -24,8 +27,6 @@
 import rx.subjects.Subject;
 import rx.util.functions.Func1;
 
-import static org.mockito.Mockito.*;
-
 public class OperationMulticast {
     public static <T, R> ConnectableObservable<R> multicast(Observable<T> source, final Subject<T, R> subject) {
         return new MulticastConnectableObservable<T, R>(source, subject);

rxjava-core/src/main/java/rx/operators/OperationSubscribeOn.java

@@ -15,22 +15,20 @@
  */
 package rx.operators;
 
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
 import org.junit.Test;
-import org.mockito.Matchers;
 
 import rx.Observable;
 import rx.Observer;
 import rx.Scheduler;
 import rx.Subscription;
 import rx.concurrency.Schedulers;
 import rx.util.functions.Action0;
-import rx.util.functions.Func0;
 import rx.util.functions.Func1;
 import rx.util.functions.Func2;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
-
 /**
  * Asynchronously subscribes and unsubscribes Observers on the specified Scheduler.
  * <p>

rxjava-core/src/main/java/rx/operators/OperationSwitch.java

@@ -19,7 +19,6 @@
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Before;

rxjava-core/src/main/java/rx/operators/OperationTake.java

@@ -18,7 +18,6 @@
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
-import static rx.operators.OperatorTester.UnitTest.*;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;

rxjava-core/src/main/java/rx/operators/SafeObservableSubscription.java

@@ -15,14 +15,13 @@
  */
 package rx.operators;
 
-import org.junit.Test;
-import rx.Subscription;
+import static org.mockito.Mockito.*;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import org.junit.Test;
+
+import rx.Subscription;
 
 /**
  * Thread-safe wrapper around Observable Subscription that ensures unsubscribe can be called only once.

rxjava-core/src/main/java/rx/subjects/UnsubscribeTester.java

@@ -15,15 +15,13 @@
  */
 package rx.subjects;
 
+import static org.junit.Assert.*;
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
 import rx.util.functions.Action1;
 import rx.util.functions.Func0;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /* package */class UnsubscribeTester {
 
     /*