Skip to content

Commit 96e135f

Browse files
Merge pull request #1751 from akarnokd/Remove_unused
Removed unused imports and variables.
2 parents 5885237 + 5ac4448 commit 96e135f

27 files changed

+10
-41
lines changed

src/main/java/rx/Subscriber.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package rx;
1717

1818
import rx.internal.util.SubscriptionList;
19-
import rx.subscriptions.CompositeSubscription;
2019

2120
/**
2221
* Provides a mechanism for receiving push-based notifications from Observables, and permits manual

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.NoSuchElementException;
2020
import java.util.concurrent.ArrayBlockingQueue;
2121
import java.util.concurrent.BlockingQueue;
22-
import java.util.concurrent.atomic.AtomicBoolean;
2322
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
2423

2524
import rx.Notification;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.NoSuchElementException;
2020
import java.util.concurrent.BlockingQueue;
2121
import java.util.concurrent.LinkedBlockingQueue;
22-
import java.util.concurrent.TimeUnit;
2322

2423
import rx.Notification;
2524
import rx.Observable;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import rx.Observer;
2222
import rx.Subscriber;
2323
import rx.functions.Action0;
24-
import rx.observers.Observers;
2524
import rx.subjects.Subject;
2625
import rx.subscriptions.Subscriptions;
2726

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import rx.functions.Func1;
2525
import rx.observables.ConnectableObservable;
2626
import rx.observers.SafeSubscriber;
27-
import rx.subjects.ReplaySubject;
2827
import rx.subjects.Subject;
2928

3029
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import rx.Subscriber;
2020

2121
import java.util.ArrayList;
22-
import java.util.Collections;
2322
import java.util.LinkedList;
2423
import java.util.List;
2524

src/main/java/rx/internal/util/unsafe/MpmcArrayQueue.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import static rx.internal.util.unsafe.UnsafeAccess.UNSAFE;
2020

21-
import java.util.Queue;
22-
2321
abstract class MpmcArrayQueueL1Pad<E> extends ConcurrentSequencedCircularArrayQueue<E> {
2422
long p10, p11, p12, p13, p14, p15, p16;
2523
long p30, p31, p32, p33, p34, p35, p36, p37;

src/main/java/rx/internal/util/unsafe/SpscArrayQueue.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
*/
1717
package rx.internal.util.unsafe;
1818

19-
import java.util.Queue;
20-
2119
abstract class SpscArrayQueueColdField<E> extends ConcurrentCircularArrayQueue<E> {
2220
private static final Integer MAX_LOOK_AHEAD_STEP = Integer.getInteger("jctoolts.spsc.max.lookahead.step", 4096);
2321
protected final int lookAheadStep;

src/main/java/rx/observables/GroupedObservable.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package rx.observables;
1717

1818
import rx.Observable;
19-
import rx.Subscriber;
2019
import rx.functions.Func1;
2120

2221
/**

src/main/java/rx/observers/SafeSubscriber.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package rx.observers;
1717

1818
import java.util.Arrays;
19-
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
2019

2120
import rx.Subscriber;
2221
import rx.exceptions.CompositeException;

src/perf/java/rx/observables/BlockingObservablePerf.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import org.openjdk.jmh.annotations.Param;
2323
import org.openjdk.jmh.annotations.Scope;
2424
import org.openjdk.jmh.annotations.State;
25-
import rx.Observable;
26-
import rx.functions.Func1;
2725
import rx.jmh.InputWithIncrementingInteger;
2826

2927
import java.util.concurrent.TimeUnit;

src/test/java/rx/SubscriberTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.util.concurrent.atomic.AtomicInteger;
2121
import java.util.concurrent.atomic.AtomicLong;
22-
import java.util.concurrent.atomic.AtomicReference;
2322

2423
import org.junit.Test;
2524

src/test/java/rx/exceptions/CompositeExceptionTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ public void testCompositeExceptionFromTwoDuplicateComposites() {
148148
private static void assertNoCircularReferences(Throwable ex) {
149149
ByteArrayOutputStream baos = new ByteArrayOutputStream();
150150
PrintStream printStream = new PrintStream(baos);
151-
StringWriter writer = new StringWriter();
152151
ex.printStackTrace(printStream);
153152
assertFalse(baos.toString().contains("CIRCULAR REFERENCE"));
154153
}

src/test/java/rx/internal/operators/OnSubscribeCacheTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package rx.internal.operators;
1717

1818
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertTrue;
2019
import static org.junit.Assert.fail;
2120

2221
import java.util.Arrays;
@@ -27,13 +26,11 @@
2726
import org.junit.Test;
2827

2928
import rx.Observable;
30-
import rx.Observer;
3129
import rx.Subscriber;
3230
import rx.functions.Action1;
3331
import rx.functions.Func1;
3432
import rx.functions.Func2;
3533
import rx.internal.operators.OnSubscribeCache;
36-
import rx.observers.TestObserver;
3734
import rx.observers.TestSubscriber;
3835
import rx.schedulers.Schedulers;
3936
import rx.subjects.AsyncSubject;

src/test/java/rx/internal/operators/OnSubscribeToObservableFutureTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
import rx.Observable;
3636
import rx.Observer;
37-
import rx.Subscriber;
3837
import rx.Subscription;
3938
import rx.observers.TestObserver;
4039
import rx.observers.TestSubscriber;

src/test/java/rx/internal/operators/OperatorFilterTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import rx.Observable;
2929
import rx.Observer;
30-
import rx.Subscriber;
3130
import rx.functions.Func1;
3231
import rx.internal.util.RxRingBuffer;
3332
import rx.observers.TestSubscriber;

src/test/java/rx/internal/operators/OperatorFlatMapTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import rx.Observable;
3030
import rx.Observer;
3131
import rx.exceptions.TestException;
32-
import rx.functions.Action1;
3332
import rx.functions.Func0;
3433
import rx.functions.Func1;
3534
import rx.functions.Func2;

src/test/java/rx/internal/operators/OperatorObserveOnTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.concurrent.atomic.AtomicInteger;
3535
import java.util.concurrent.atomic.AtomicLong;
3636

37-
import org.junit.Ignore;
3837
import org.junit.Test;
3938
import org.mockito.InOrder;
4039

src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import rx.Subscriber;
3333
import rx.functions.Func1;
3434
import rx.observers.TestSubscriber;
35-
import rx.schedulers.Schedulers;
3635

3736
public class OperatorOnErrorReturnTest {
3837

src/test/java/rx/internal/operators/OperatorScanTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@
3333
import rx.Observable;
3434
import rx.Observer;
3535
import rx.Subscriber;
36-
import rx.functions.Action1;
3736
import rx.functions.Func1;
3837
import rx.functions.Func2;
39-
import rx.internal.util.RxRingBuffer;
4038
import rx.observers.TestSubscriber;
41-
import rx.schedulers.Schedulers;
4239

4340
public class OperatorScanTest {
4441

src/test/java/rx/internal/operators/OperatorWindowTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import rx.functions.Action1;
3939
import rx.functions.Func0;
4040
import rx.functions.Func1;
41-
import rx.schedulers.Schedulers;
4241
import rx.schedulers.TestScheduler;
4342
import rx.subjects.PublishSubject;
4443

src/test/java/rx/internal/operators/OperatorZipTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,6 @@ public void call(String s) {
830830

831831
@Test
832832
public void testStartAsync() throws InterruptedException {
833-
final CountDownLatch latch = new CountDownLatch(1);
834833
Observable<String> os = ASYNC_OBSERVABLE_OF_INFINITE_INTEGERS(new CountDownLatch(1)).onBackpressureBuffer()
835834
.zipWith(ASYNC_OBSERVABLE_OF_INFINITE_INTEGERS(new CountDownLatch(1)).onBackpressureBuffer(), new Func2<Integer, Integer, String>() {
836835

src/test/java/rx/internal/util/IndexedRingBufferTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public class IndexedRingBufferTest {
3838
@Test
3939
public void add() {
4040
IndexedRingBuffer<LSubscription> list = IndexedRingBuffer.getInstance();
41-
int head = list.add(new LSubscription(1));
42-
int n2 = list.add(new LSubscription(2));
41+
list.add(new LSubscription(1));
42+
list.add(new LSubscription(2));
4343
final AtomicInteger c = new AtomicInteger();
4444

4545
list.forEach(newCounterAction(c));
@@ -49,7 +49,7 @@ public void add() {
4949
@Test
5050
public void removeEnd() {
5151
IndexedRingBuffer<LSubscription> list = IndexedRingBuffer.getInstance();
52-
int head = list.add(new LSubscription(1));
52+
list.add(new LSubscription(1));
5353
int n2 = list.add(new LSubscription(2));
5454

5555
final AtomicInteger c = new AtomicInteger();
@@ -66,9 +66,9 @@ public void removeEnd() {
6666
@Test
6767
public void removeMiddle() {
6868
IndexedRingBuffer<LSubscription> list = IndexedRingBuffer.getInstance();
69-
int head = list.add(new LSubscription(1));
69+
list.add(new LSubscription(1));
7070
int n2 = list.add(new LSubscription(2));
71-
int n3 = list.add(new LSubscription(3));
71+
list.add(new LSubscription(3));
7272

7373
list.remove(n2);
7474

@@ -306,7 +306,7 @@ public void testConcurrentAddAndRemoves() throws InterruptedException {
306306
public void call() {
307307
try {
308308
for (int i = 10000; i < 20000; i++) {
309-
int index = list.add(i);
309+
list.add(i);
310310
// Integer v = list.remove(index);
311311
}
312312
} catch (Exception e) {

src/test/java/rx/internal/util/RxRingBufferSpmcTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public void testConcurrency() throws InterruptedException {
5555

5656
final Producer p = new Producer() {
5757

58-
AtomicInteger c = new AtomicInteger();
59-
58+
// AtomicInteger c = new AtomicInteger();
59+
6060
@Override
6161
public void request(final long n) {
6262
// System.out.println("request[" + c.incrementAndGet() + "]: " + n + " Thread: " + Thread.currentThread());

src/test/java/rx/internal/util/RxRingBufferSpscTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void testConcurrency() throws InterruptedException {
5454

5555
final Producer p = new Producer() {
5656

57-
AtomicInteger c = new AtomicInteger();
57+
// AtomicInteger c = new AtomicInteger();
5858

5959
@Override
6060
public void request(final long n) {

src/test/java/rx/internal/util/RxRingBufferWithoutUnsafeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void testConcurrency() throws InterruptedException {
5555

5656
final Producer p = new Producer() {
5757

58-
AtomicInteger c = new AtomicInteger();
58+
// AtomicInteger c = new AtomicInteger();
5959

6060
@Override
6161
public void request(final long n) {

src/test/java/rx/internal/util/SubscriptionListTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
package rx.internal.util;
1717

1818
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertFalse;
20-
import static org.junit.Assert.assertTrue;
2119
import static org.junit.Assert.fail;
2220

2321
import java.util.ArrayList;

0 commit comments

Comments
 (0)