Skip to content

Commit ed92ba8

Browse files
authored
1.x: increase coverage of internal utils, remove unused/unnecessary items (#4119)
* 1.x: increase coverage of internal utils, remove unused/unnecessary items * fix wrong assertion
1 parent 1d75f4a commit ed92ba8

File tree

93 files changed

+523
-424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+523
-424
lines changed

src/main/java/rx/Observable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9158,7 +9158,7 @@ static <T> Subscription subscribe(Subscriber<? super T> subscriber, Observable<T
91589158
Exceptions.throwIfFatal(e);
91599159
// in case the subscriber can't listen to exceptions anymore
91609160
if (subscriber.isUnsubscribed()) {
9161-
RxJavaPluginUtils.handleException(RxJavaHooks.onObservableError(e));
9161+
RxJavaHooks.onError(RxJavaHooks.onObservableError(e));
91629162
} else {
91639163
// if an unhandled error occurs executing the onSubscribe we will propagate it
91649164
try {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@
1515
*/
1616
package rx.internal.operators;
1717

18-
import java.util.Iterator;
19-
import java.util.NoSuchElementException;
18+
import java.util.*;
2019
import java.util.concurrent.Semaphore;
2120
import java.util.concurrent.atomic.AtomicReference;
2221

23-
import rx.Notification;
22+
import rx.*;
2423
import rx.Observable;
25-
import rx.Subscriber;
2624
import rx.exceptions.Exceptions;
2725

2826
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616
package rx.internal.operators;
1717

18-
import java.util.Iterator;
19-
import java.util.NoSuchElementException;
18+
import java.util.*;
2019

2120
import rx.Observable;
2221
import rx.Subscriber;

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515
*/
1616
package rx.internal.operators;
1717

18-
import java.util.Iterator;
19-
import java.util.NoSuchElementException;
20-
import java.util.concurrent.ArrayBlockingQueue;
21-
import java.util.concurrent.BlockingQueue;
18+
import java.util.*;
19+
import java.util.concurrent.*;
2220
import java.util.concurrent.atomic.AtomicInteger;
2321

24-
import rx.Notification;
22+
import rx.*;
2523
import rx.Observable;
26-
import rx.Subscriber;
2724
import rx.exceptions.Exceptions;
2825

2926
/**

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,10 @@
1515
*/
1616
package rx.internal.operators;
1717

18-
import java.util.concurrent.CancellationException;
19-
import java.util.concurrent.CountDownLatch;
20-
import java.util.concurrent.ExecutionException;
21-
import java.util.concurrent.Future;
22-
import java.util.concurrent.TimeUnit;
23-
import java.util.concurrent.TimeoutException;
18+
import java.util.concurrent.*;
2419
import java.util.concurrent.atomic.AtomicReference;
2520

26-
import rx.Observable;
27-
import rx.Subscriber;
28-
import rx.Subscription;
21+
import rx.*;
2922

3023
/**
3124
* Returns a Future representing the single value emitted by an Observable.

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
*/
1616
package rx.internal.operators;
1717

18-
import java.util.Iterator;
19-
import java.util.NoSuchElementException;
20-
import java.util.concurrent.BlockingQueue;
21-
import java.util.concurrent.LinkedBlockingQueue;
18+
import java.util.*;
19+
import java.util.concurrent.*;
2220

23-
import rx.Notification;
21+
import rx.*;
2422
import rx.Observable;
25-
import rx.Subscriber;
2623
import rx.exceptions.Exceptions;
2724
import rx.internal.util.RxRingBuffer;
2825

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
import java.util.concurrent.ConcurrentLinkedQueue;
1919
import java.util.concurrent.atomic.AtomicReference;
2020

21-
import rx.Observer;
22-
import rx.Subscriber;
21+
import rx.*;
2322
import rx.functions.Action0;
2423
import rx.subjects.Subject;
2524
import rx.subscriptions.Subscriptions;

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@
1515
*/
1616
package rx.internal.operators;
1717

18-
import java.util.ArrayList;
19-
import java.util.Collection;
20-
import java.util.List;
18+
import java.util.*;
2119
import java.util.concurrent.ConcurrentLinkedQueue;
2220
import java.util.concurrent.atomic.AtomicReference;
2321

22+
import rx.*;
2423
import rx.Observable;
2524
import rx.Observable.OnSubscribe;
26-
import rx.Producer;
27-
import rx.Subscriber;
2825
import rx.functions.Action0;
2926
import rx.subscriptions.Subscriptions;
3027

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717

1818
import java.util.concurrent.atomic.AtomicInteger;
1919

20+
import rx.*;
2021
import rx.Observable.OnSubscribe;
21-
import rx.Subscriber;
22-
import rx.Subscription;
2322
import rx.functions.Action1;
2423
import rx.observables.ConnectableObservable;
2524
import rx.observers.Subscribers;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
*/
1616
package rx.internal.operators;
1717

18-
import rx.Observable;
18+
import rx.*;
1919
import rx.Observable.OnSubscribe;
20-
import rx.Subscriber;
2120
import rx.exceptions.Exceptions;
2221
import rx.functions.Func0;
2322
import rx.observers.Subscribers;

0 commit comments

Comments
 (0)