Merge pull request #1751 from akarnokd/Remove_unused

benjchristensen · benjchristensen · commit 96e135f3a739 · 2014-10-13T08:53:29.000-07:00
Removed unused imports and variables.
diff --git a/src/main/java/rx/Subscriber.java b/src/main/java/rx/Subscriber.java
@@ -16,7 +16,6 @@
 package rx;
 
 import rx.internal.util.SubscriptionList;
-import rx.subscriptions.CompositeSubscription;
 
 /**
  * Provides a mechanism for receiving push-based notifications from Observables, and permits manual
diff --git a/src/main/java/rx/internal/operators/BlockingOperatorNext.java b/src/main/java/rx/internal/operators/BlockingOperatorNext.java
@@ -19,7 +19,6 @@
 import java.util.NoSuchElementException;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 import rx.Notification;
diff --git a/src/main/java/rx/internal/operators/BlockingOperatorToIterator.java b/src/main/java/rx/internal/operators/BlockingOperatorToIterator.java
@@ -19,7 +19,6 @@
 import java.util.NoSuchElementException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 
 import rx.Notification;
 import rx.Observable;
diff --git a/src/main/java/rx/internal/operators/BufferUntilSubscriber.java b/src/main/java/rx/internal/operators/BufferUntilSubscriber.java
@@ -21,7 +21,6 @@
 import rx.Observer;
 import rx.Subscriber;
 import rx.functions.Action0;
-import rx.observers.Observers;
 import rx.subjects.Subject;
 import rx.subscriptions.Subscriptions;
 
diff --git a/src/main/java/rx/internal/operators/OnSubscribeMulticastSelector.java b/src/main/java/rx/internal/operators/OnSubscribeMulticastSelector.java
@@ -24,7 +24,6 @@
 import rx.functions.Func1;
 import rx.observables.ConnectableObservable;
 import rx.observers.SafeSubscriber;
-import rx.subjects.ReplaySubject;
 import rx.subjects.Subject;
 
 /**
diff --git a/src/main/java/rx/internal/operators/OperatorToObservableList.java b/src/main/java/rx/internal/operators/OperatorToObservableList.java
@@ -19,7 +19,6 @@
 import rx.Subscriber;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
diff --git a/src/main/java/rx/internal/util/unsafe/MpmcArrayQueue.java b/src/main/java/rx/internal/util/unsafe/MpmcArrayQueue.java
@@ -18,8 +18,6 @@
 
 import static rx.internal.util.unsafe.UnsafeAccess.UNSAFE;
 
-import java.util.Queue;
-
 abstract class MpmcArrayQueueL1Pad<E> extends ConcurrentSequencedCircularArrayQueue<E> {
     long p10, p11, p12, p13, p14, p15, p16;
     long p30, p31, p32, p33, p34, p35, p36, p37;
diff --git a/src/main/java/rx/internal/util/unsafe/SpscArrayQueue.java b/src/main/java/rx/internal/util/unsafe/SpscArrayQueue.java
@@ -16,8 +16,6 @@
  */
 package rx.internal.util.unsafe;
 
-import java.util.Queue;
-
 abstract class SpscArrayQueueColdField<E> extends ConcurrentCircularArrayQueue<E> {
     private static final Integer MAX_LOOK_AHEAD_STEP = Integer.getInteger("jctoolts.spsc.max.lookahead.step", 4096);
     protected final int lookAheadStep;
diff --git a/src/main/java/rx/observables/GroupedObservable.java b/src/main/java/rx/observables/GroupedObservable.java
@@ -16,7 +16,6 @@
 package rx.observables;
 
 import rx.Observable;
-import rx.Subscriber;
 import rx.functions.Func1;
 
 /**
diff --git a/src/main/java/rx/observers/SafeSubscriber.java b/src/main/java/rx/observers/SafeSubscriber.java
@@ -16,7 +16,6 @@
 package rx.observers;
 
 import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 import rx.Subscriber;
 import rx.exceptions.CompositeException;
diff --git a/src/perf/java/rx/observables/BlockingObservablePerf.java b/src/perf/java/rx/observables/BlockingObservablePerf.java
@@ -22,8 +22,6 @@
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
-import rx.Observable;
-import rx.functions.Func1;
 import rx.jmh.InputWithIncrementingInteger;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/rx/SubscriberTest.java b/src/test/java/rx/SubscriberTest.java
@@ -19,7 +19,6 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
 
diff --git a/src/test/java/rx/exceptions/CompositeExceptionTest.java b/src/test/java/rx/exceptions/CompositeExceptionTest.java
@@ -148,7 +148,6 @@ public void testCompositeExceptionFromTwoDuplicateComposites() {
     private static void assertNoCircularReferences(Throwable ex) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PrintStream printStream = new PrintStream(baos);
-        StringWriter writer = new StringWriter();
         ex.printStackTrace(printStream);
         assertFalse(baos.toString().contains("CIRCULAR REFERENCE"));
     }
diff --git a/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java b/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java
@@ -16,7 +16,6 @@
 package rx.internal.operators;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.Arrays;
@@ -27,13 +26,11 @@
 import org.junit.Test;
 
 import rx.Observable;
-import rx.Observer;
 import rx.Subscriber;
 import rx.functions.Action1;
 import rx.functions.Func1;
 import rx.functions.Func2;
 import rx.internal.operators.OnSubscribeCache;
-import rx.observers.TestObserver;
 import rx.observers.TestSubscriber;
 import rx.schedulers.Schedulers;
 import rx.subjects.AsyncSubject;
diff --git a/src/test/java/rx/internal/operators/OnSubscribeToObservableFutureTest.java b/src/test/java/rx/internal/operators/OnSubscribeToObservableFutureTest.java
@@ -34,7 +34,6 @@
 
 import rx.Observable;
 import rx.Observer;
-import rx.Subscriber;
 import rx.Subscription;
 import rx.observers.TestObserver;
 import rx.observers.TestSubscriber;
diff --git a/src/test/java/rx/internal/operators/OperatorFilterTest.java b/src/test/java/rx/internal/operators/OperatorFilterTest.java
@@ -27,7 +27,6 @@
 
 import rx.Observable;
 import rx.Observer;
-import rx.Subscriber;
 import rx.functions.Func1;
 import rx.internal.util.RxRingBuffer;
 import rx.observers.TestSubscriber;
diff --git a/src/test/java/rx/internal/operators/OperatorFlatMapTest.java b/src/test/java/rx/internal/operators/OperatorFlatMapTest.java
@@ -29,7 +29,6 @@
 import rx.Observable;
 import rx.Observer;
 import rx.exceptions.TestException;
-import rx.functions.Action1;
 import rx.functions.Func0;
 import rx.functions.Func1;
 import rx.functions.Func2;
diff --git a/src/test/java/rx/internal/operators/OperatorObserveOnTest.java b/src/test/java/rx/internal/operators/OperatorObserveOnTest.java
@@ -34,7 +34,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.InOrder;
 
diff --git a/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java b/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java
@@ -32,7 +32,6 @@
 import rx.Subscriber;
 import rx.functions.Func1;
 import rx.observers.TestSubscriber;
-import rx.schedulers.Schedulers;
 
 public class OperatorOnErrorReturnTest {
 
diff --git a/src/test/java/rx/internal/operators/OperatorScanTest.java b/src/test/java/rx/internal/operators/OperatorScanTest.java
@@ -33,12 +33,9 @@
 import rx.Observable;
 import rx.Observer;
 import rx.Subscriber;
-import rx.functions.Action1;
 import rx.functions.Func1;
 import rx.functions.Func2;
-import rx.internal.util.RxRingBuffer;
 import rx.observers.TestSubscriber;
-import rx.schedulers.Schedulers;
 
 public class OperatorScanTest {
 
diff --git a/src/test/java/rx/internal/operators/OperatorWindowTest.java b/src/test/java/rx/internal/operators/OperatorWindowTest.java
@@ -38,7 +38,6 @@
 import rx.functions.Action1;
 import rx.functions.Func0;
 import rx.functions.Func1;
-import rx.schedulers.Schedulers;
 import rx.schedulers.TestScheduler;
 import rx.subjects.PublishSubject;
 
diff --git a/src/test/java/rx/internal/operators/OperatorZipTest.java b/src/test/java/rx/internal/operators/OperatorZipTest.java
@@ -830,7 +830,6 @@ public void call(String s) {
 
     @Test
     public void testStartAsync() throws InterruptedException {
-        final CountDownLatch latch = new CountDownLatch(1);
         Observable<String> os = ASYNC_OBSERVABLE_OF_INFINITE_INTEGERS(new CountDownLatch(1)).onBackpressureBuffer()
                 .zipWith(ASYNC_OBSERVABLE_OF_INFINITE_INTEGERS(new CountDownLatch(1)).onBackpressureBuffer(), new Func2<Integer, Integer, String>() {
 
diff --git a/src/test/java/rx/internal/util/IndexedRingBufferTest.java b/src/test/java/rx/internal/util/IndexedRingBufferTest.java
@@ -38,8 +38,8 @@ public class IndexedRingBufferTest {
     @Test
     public void add() {
         IndexedRingBuffer<LSubscription> list = IndexedRingBuffer.getInstance();
-        int head = list.add(new LSubscription(1));
-        int n2 = list.add(new LSubscription(2));
+        list.add(new LSubscription(1));
+        list.add(new LSubscription(2));
         final AtomicInteger c = new AtomicInteger();
 
         list.forEach(newCounterAction(c));
@@ -49,7 +49,7 @@ public void add() {
     @Test
     public void removeEnd() {
         IndexedRingBuffer<LSubscription> list = IndexedRingBuffer.getInstance();
-        int head = list.add(new LSubscription(1));
+        list.add(new LSubscription(1));
         int n2 = list.add(new LSubscription(2));
 
         final AtomicInteger c = new AtomicInteger();
@@ -66,9 +66,9 @@ public void removeEnd() {
     @Test
     public void removeMiddle() {
         IndexedRingBuffer<LSubscription> list = IndexedRingBuffer.getInstance();
-        int head = list.add(new LSubscription(1));
+        list.add(new LSubscription(1));
         int n2 = list.add(new LSubscription(2));
-        int n3 = list.add(new LSubscription(3));
+        list.add(new LSubscription(3));
 
         list.remove(n2);
 
@@ -306,7 +306,7 @@ public void testConcurrentAddAndRemoves() throws InterruptedException {
             public void call() {
                 try {
                     for (int i = 10000; i < 20000; i++) {
-                        int index = list.add(i);
+                        list.add(i);
                         //                        Integer v = list.remove(index);
                     }
                 } catch (Exception e) {
diff --git a/src/test/java/rx/internal/util/RxRingBufferSpmcTest.java b/src/test/java/rx/internal/util/RxRingBufferSpmcTest.java
@@ -55,8 +55,8 @@ public void testConcurrency() throws InterruptedException {
 
         final Producer p = new Producer() {
 
-            AtomicInteger c = new AtomicInteger();
-
+            // AtomicInteger c = new AtomicInteger();
+            
             @Override
             public void request(final long n) {
                 //                System.out.println("request[" + c.incrementAndGet() + "]: " + n + "  Thread: " + Thread.currentThread());
diff --git a/src/test/java/rx/internal/util/RxRingBufferSpscTest.java b/src/test/java/rx/internal/util/RxRingBufferSpscTest.java
@@ -54,7 +54,7 @@ public void testConcurrency() throws InterruptedException {
 
         final Producer p = new Producer() {
 
-            AtomicInteger c = new AtomicInteger();
+//            AtomicInteger c = new AtomicInteger();
 
             @Override
             public void request(final long n) {
diff --git a/src/test/java/rx/internal/util/RxRingBufferWithoutUnsafeTest.java b/src/test/java/rx/internal/util/RxRingBufferWithoutUnsafeTest.java
@@ -55,7 +55,7 @@ public void testConcurrency() throws InterruptedException {
 
         final Producer p = new Producer() {
 
-            AtomicInteger c = new AtomicInteger();
+//            AtomicInteger c = new AtomicInteger();
 
             @Override
             public void request(final long n) {
diff --git a/src/test/java/rx/internal/util/SubscriptionListTest.java b/src/test/java/rx/internal/util/SubscriptionListTest.java
@@ -16,8 +16,6 @@
 package rx.internal.util;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
