Skip to content

Removed unused imports and variables. #1751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/rx/Subscriber.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import rx.functions.Func1;
import rx.observables.ConnectableObservable;
import rx.observers.SafeSubscriber;
import rx.subjects.ReplaySubject;
import rx.subjects.Subject;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import rx.Subscriber;

import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/rx/internal/util/unsafe/MpmcArrayQueue.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/rx/internal/util/unsafe/SpscArrayQueue.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/rx/observables/GroupedObservable.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package rx.observables;

import rx.Observable;
import rx.Subscriber;
import rx.functions.Func1;

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/rx/observers/SafeSubscriber.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package rx.observers;

import java.util.Arrays;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;

import rx.Subscriber;
import rx.exceptions.CompositeException;
Expand Down
2 changes: 0 additions & 2 deletions src/perf/java/rx/observables/BlockingObservablePerf.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/test/java/rx/SubscriberTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/test/java/rx/exceptions/CompositeExceptionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/rx/internal/operators/OnSubscribeCacheTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

import rx.Observable;
import rx.Observer;
import rx.Subscriber;
import rx.Subscription;
import rx.observers.TestObserver;
import rx.observers.TestSubscriber;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import rx.Subscriber;
import rx.functions.Func1;
import rx.observers.TestSubscriber;
import rx.schedulers.Schedulers;

public class OperatorOnErrorReturnTest {

Expand Down
3 changes: 0 additions & 3 deletions src/test/java/rx/internal/operators/OperatorScanTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/test/java/rx/internal/operators/OperatorZipTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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>() {

Expand Down
12 changes: 6 additions & 6 deletions src/test/java/rx/internal/util/IndexedRingBufferTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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();
Expand All @@ -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);

Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/rx/internal/util/RxRingBufferSpmcTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/rx/internal/util/RxRingBufferSpscTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/rx/internal/util/SubscriptionListTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down