Skip to content

Commit cc85157

Browse files
JakeWhartonakarnokd
JakeWharton
authored and
akarnokd
committed
Correct default subscriber name. (ReactiveX#4293)
1 parent 3aa20c7 commit cc85157

File tree

56 files changed

+154
-154
lines changed

Some content is hidden

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

56 files changed

+154
-154
lines changed

‎src/main/java/io/reactivex/flowables/BlockingFlowable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import io.reactivex.internal.subscribers.flowable.*;
3030
import io.reactivex.internal.util.NotificationLite;
3131
import io.reactivex.plugins.RxJavaPlugins;
32-
import io.reactivex.subscribers.DefaultObserver;
32+
import io.reactivex.subscribers.DefaultSubscriber;
3333

3434
public final class BlockingFlowable<T> implements Publisher<T>, Iterable<T> {
3535
final Publisher<? extends T> o;
@@ -373,7 +373,7 @@ public void subscribe(final Consumer<? super T> onNext, final Consumer<? super T
373373
* @param onComplete the callback action for the completion event.
374374
*/
375375
public void subscribe(final Consumer<? super T> onNext, final Consumer<? super Throwable> onError, final Runnable onComplete) {
376-
subscribe(new DefaultObserver<T>() {
376+
subscribe(new DefaultSubscriber<T>() {
377377
boolean done;
378378
@Override
379379
public void onNext(T t) {

‎src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import io.reactivex.exceptions.Exceptions;
2121
import io.reactivex.internal.util.NotificationLite;
22-
import io.reactivex.subscribers.DefaultObserver;
22+
import io.reactivex.subscribers.DefaultSubscriber;
2323

2424
/**
2525
* Returns an Iterable that always returns the item most recently emitted by an Observable, or a
@@ -58,7 +58,7 @@ public Iterator<T> iterator() {
5858
};
5959
}
6060

61-
static final class MostRecentObserver<T> extends DefaultObserver<T> {
61+
static final class MostRecentObserver<T> extends DefaultSubscriber<T> {
6262
volatile Object value;
6363

6464
private MostRecentObserver(T value) {

src/main/java/io/reactivex/subscribers/DefaultObserver.java renamed to src/main/java/io/reactivex/subscribers/DefaultSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import io.reactivex.internal.subscriptions.SubscriptionHelper;
1919

20-
public abstract class DefaultObserver<T> implements Subscriber<T> {
20+
public abstract class DefaultSubscriber<T> implements Subscriber<T> {
2121
private Subscription s;
2222
@Override
2323
public final void onSubscribe(Subscription s) {

‎src/main/java/io/reactivex/subscribers/Subscribers.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public void onComplete() {
274274
};
275275
}
276276

277-
public static <T> DefaultObserver<T> create(
277+
public static <T> DefaultSubscriber<T> create(
278278
final Consumer<? super T> onNext,
279279
final Consumer<? super Throwable> onError,
280280
final Runnable onComplete,
@@ -283,7 +283,7 @@ public static <T> DefaultObserver<T> create(
283283
Objects.requireNonNull(onError, "onError is null");
284284
Objects.requireNonNull(onComplete, "onComplete is null");
285285
Objects.requireNonNull(onStart, "onStart is null");
286-
return new DefaultObserver<T>() {
286+
return new DefaultSubscriber<T>() {
287287
boolean done;
288288
@Override
289289
protected void onStart() {

‎src/perf/java/io/reactivex/InputWithIncrementingInteger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.reactivestreams.*;
2121

2222
import io.reactivex.internal.subscriptions.EmptySubscription;
23-
import io.reactivex.subscribers.DefaultObserver;
23+
import io.reactivex.subscribers.DefaultSubscriber;
2424

2525
/**
2626
* Exposes an Observable and Observer that increments n Integers and consumes them in a Blackhole.
@@ -83,7 +83,7 @@ public PerfSubscriber newLatchedObserver() {
8383
}
8484

8585
public Subscriber<Integer> newSubscriber() {
86-
return new DefaultObserver<Integer>() {
86+
return new DefaultSubscriber<Integer>() {
8787

8888
@Override
8989
public void onComplete() {

‎src/test/java/io/reactivex/flowable/FlowableConversionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public Flowable<T> apply(final Publisher<T> onSubscribe) {
147147

148148
@Test
149149
public void testConversionBetweenObservableClasses() {
150-
final TestSubscriber<String> subscriber = new TestSubscriber<String>(new DefaultObserver<String>() {
150+
final TestSubscriber<String> subscriber = new TestSubscriber<String>(new DefaultSubscriber<String>() {
151151

152152
@Override
153153
public void onComplete() {
@@ -229,7 +229,7 @@ public Integer apply(Integer k) {
229229
@Override
230230
public ConcurrentLinkedQueue<Integer> apply(Flowable<Integer> onSubscribe) {
231231
final ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<Integer>();
232-
onSubscribe.subscribe(new DefaultObserver<Integer>(){
232+
onSubscribe.subscribe(new DefaultSubscriber<Integer>(){
233233
@Override
234234
public void onComplete() {
235235
isFinished.set(true);

‎src/test/java/io/reactivex/flowable/FlowableErrorHandlingTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import io.reactivex.Flowable;
2525
import io.reactivex.schedulers.Schedulers;
26-
import io.reactivex.subscribers.DefaultObserver;
26+
import io.reactivex.subscribers.DefaultSubscriber;
2727

2828
public class FlowableErrorHandlingTests {
2929

@@ -36,7 +36,7 @@ public void testOnNextError() throws InterruptedException {
3636
final CountDownLatch latch = new CountDownLatch(1);
3737
final AtomicReference<Throwable> caughtError = new AtomicReference<Throwable>();
3838
Flowable<Long> o = Flowable.interval(50, TimeUnit.MILLISECONDS);
39-
Subscriber<Long> observer = new DefaultObserver<Long>() {
39+
Subscriber<Long> observer = new DefaultSubscriber<Long>() {
4040

4141
@Override
4242
public void onComplete() {
@@ -72,7 +72,7 @@ public void testOnNextErrorAcrossThread() throws InterruptedException {
7272
final CountDownLatch latch = new CountDownLatch(1);
7373
final AtomicReference<Throwable> caughtError = new AtomicReference<Throwable>();
7474
Flowable<Long> o = Flowable.interval(50, TimeUnit.MILLISECONDS);
75-
Subscriber<Long> observer = new DefaultObserver<Long>() {
75+
Subscriber<Long> observer = new DefaultSubscriber<Long>() {
7676

7777
@Override
7878
public void onComplete() {

‎src/test/java/io/reactivex/flowable/FlowableSubscriberTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public void cancel() {
362362
@Test
363363
public void testOnStartCalledOnceViaSubscribe() {
364364
final AtomicInteger c = new AtomicInteger();
365-
Flowable.just(1, 2, 3, 4).take(2).subscribe(new DefaultObserver<Integer>() {
365+
Flowable.just(1, 2, 3, 4).take(2).subscribe(new DefaultSubscriber<Integer>() {
366366

367367
@Override
368368
public void onStart() {
@@ -393,7 +393,7 @@ public void onNext(Integer t) {
393393
@Test
394394
public void testOnStartCalledOnceViaUnsafeSubscribe() {
395395
final AtomicInteger c = new AtomicInteger();
396-
Flowable.just(1, 2, 3, 4).take(2).unsafeSubscribe(new DefaultObserver<Integer>() {
396+
Flowable.just(1, 2, 3, 4).take(2).unsafeSubscribe(new DefaultSubscriber<Integer>() {
397397

398398
@Override
399399
public void onStart() {
@@ -428,7 +428,7 @@ public void testOnStartCalledOnceViaLift() {
428428

429429
@Override
430430
public Subscriber<? super Integer> apply(final Subscriber<? super Integer> child) {
431-
return new DefaultObserver<Integer>() {
431+
return new DefaultSubscriber<Integer>() {
432432

433433
@Override
434434
public void onStart() {
@@ -465,7 +465,7 @@ public void onNext(Integer t) {
465465
public void testNegativeRequestThrowsIllegalArgumentException() throws InterruptedException {
466466
final CountDownLatch latch = new CountDownLatch(1);
467467
final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
468-
Flowable.just(1,2,3,4).subscribe(new DefaultObserver<Integer>() {
468+
Flowable.just(1,2,3,4).subscribe(new DefaultSubscriber<Integer>() {
469469

470470
@Override
471471
public void onStart() {
@@ -496,7 +496,7 @@ public void onNext(Integer t) {
496496
@Test
497497
public void testOnStartRequestsAreAdditive() {
498498
final List<Integer> list = new ArrayList<Integer>();
499-
Flowable.just(1,2,3,4,5).subscribe(new DefaultObserver<Integer>() {
499+
Flowable.just(1,2,3,4,5).subscribe(new DefaultSubscriber<Integer>() {
500500
@Override
501501
public void onStart() {
502502
request(3);
@@ -523,7 +523,7 @@ public void onNext(Integer t) {
523523
@Test
524524
public void testOnStartRequestsAreAdditiveAndOverflowBecomesMaxValue() {
525525
final List<Integer> list = new ArrayList<Integer>();
526-
Flowable.just(1,2,3,4,5).subscribe(new DefaultObserver<Integer>() {
526+
Flowable.just(1,2,3,4,5).subscribe(new DefaultSubscriber<Integer>() {
527527
@Override
528528
public void onStart() {
529529
request(2);

‎src/test/java/io/reactivex/flowable/FlowableTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public void testCustomObservableWithErrorInObserverAsynchronous() throws Interru
317317
// FIXME custom built???
318318
Flowable.just("1", "2", "three", "4")
319319
.subscribeOn(Schedulers.newThread())
320-
.safeSubscribe(new DefaultObserver<String>() {
320+
.safeSubscribe(new DefaultSubscriber<String>() {
321321
@Override
322322
public void onComplete() {
323323
System.out.println("completed");
@@ -364,7 +364,7 @@ public void testCustomObservableWithErrorInObserverSynchronous() {
364364

365365
// FIXME custom built???
366366
Flowable.just("1", "2", "three", "4")
367-
.safeSubscribe(new DefaultObserver<String>() {
367+
.safeSubscribe(new DefaultSubscriber<String>() {
368368

369369
@Override
370370
public void onComplete() {
@@ -411,7 +411,7 @@ public Throwable call() {
411411
return new NumberFormatException();
412412
}
413413
}))
414-
.subscribe(new DefaultObserver<String>() {
414+
.subscribe(new DefaultSubscriber<String>() {
415415

416416
@Override
417417
public void onComplete() {
@@ -686,7 +686,7 @@ public void testTakeWithErrorInObserver() {
686686
final AtomicInteger count = new AtomicInteger();
687687
final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
688688
Flowable.just("1", "2", "three", "4").take(3)
689-
.safeSubscribe(new DefaultObserver<String>() {
689+
.safeSubscribe(new DefaultSubscriber<String>() {
690690

691691
@Override
692692
public void onComplete() {

‎src/test/java/io/reactivex/internal/operators/flowable/FlowableAmbTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void testAmb() {
104104
Flowable2, Flowable3);
105105

106106
@SuppressWarnings("unchecked")
107-
DefaultObserver<String> observer = mock(DefaultObserver.class);
107+
DefaultSubscriber<String> observer = mock(DefaultSubscriber.class);
108108
o.subscribe(observer);
109109

110110
scheduler.advanceTimeBy(100000, TimeUnit.MILLISECONDS);
@@ -134,7 +134,7 @@ public void testAmb2() {
134134
Flowable2, Flowable3);
135135

136136
@SuppressWarnings("unchecked")
137-
DefaultObserver<String> observer = mock(DefaultObserver.class);
137+
DefaultSubscriber<String> observer = mock(DefaultSubscriber.class);
138138
o.subscribe(observer);
139139

140140
scheduler.advanceTimeBy(100000, TimeUnit.MILLISECONDS);
@@ -162,7 +162,7 @@ public void testAmb3() {
162162
Flowable2, Flowable3);
163163

164164
@SuppressWarnings("unchecked")
165-
DefaultObserver<String> observer = mock(DefaultObserver.class);
165+
DefaultSubscriber<String> observer = mock(DefaultSubscriber.class);
166166
o.subscribe(observer);
167167

168168
scheduler.advanceTimeBy(100000, TimeUnit.MILLISECONDS);

0 commit comments

Comments
 (0)