diff --git a/src/main/java/io/reactivex/BackpressureStrategy.java b/src/main/java/io/reactivex/BackpressureStrategy.java index a98a3f8f5e..c0d4665f20 100644 --- a/src/main/java/io/reactivex/BackpressureStrategy.java +++ b/src/main/java/io/reactivex/BackpressureStrategy.java @@ -22,7 +22,7 @@ public enum BackpressureStrategy { * Downstream has to deal with any overflow. *

Useful when one applies one of the custom-parameter onBackpressureXXX operators. */ - NONE, + MISSING, /** * Signals a MissingBackpressureException in case the downstream can't keep up. */ diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java index 3c376f36da..938126413d 100644 --- a/src/main/java/io/reactivex/Observable.java +++ b/src/main/java/io/reactivex/Observable.java @@ -11758,7 +11758,7 @@ public final Flowable toFlowable(BackpressureStrategy strategy) { return o.onBackpressureDrop(); case LATEST: return o.onBackpressureLatest(); - case NONE: + case MISSING: return o; case ERROR: return RxJavaPlugins.onAssembly(new FlowableOnBackpressureError(o)); diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCreate.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableCreate.java index ba458fa6db..b00d0f3caf 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCreate.java +++ b/src/main/java/io/reactivex/internal/operators/flowable/FlowableCreate.java @@ -45,8 +45,8 @@ public void subscribeActual(Subscriber t) { BaseEmitter emitter; switch (backpressure) { - case NONE: { - emitter = new NoneEmitter(t); + case MISSING: { + emitter = new MissingEmitter(t); break; } case ERROR: { @@ -319,12 +319,12 @@ public final FlowableEmitter serialize() { } } - static final class NoneEmitter extends BaseEmitter { + static final class MissingEmitter extends BaseEmitter { private static final long serialVersionUID = 3776720187248809713L; - NoneEmitter(Subscriber actual) { + MissingEmitter(Subscriber actual) { super(actual); } diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableCreateTest.java index c23fef5012..8317ec2177 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCreateTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowableCreateTest.java @@ -314,7 +314,7 @@ public void subscribe(FlowableEmitter e) throws Exception { } @Test - public void createNullValueNone() { + public void createNullValueMissing() { final Throwable[] error = { null }; Flowable.create(new FlowableOnSubscribe() { @@ -329,7 +329,7 @@ public void subscribe(FlowableEmitter e) throws Exception { error[0] = ex; } } - }, BackpressureStrategy.NONE) + }, BackpressureStrategy.MISSING) .test() .assertFailure(NullPointerException.class); @@ -433,7 +433,7 @@ public void subscribe(FlowableEmitter e) throws Exception { } @Test - public void createNullValueNoneSerialized() { + public void createNullValueMissingSerialized() { final Throwable[] error = { null }; Flowable.create(new FlowableOnSubscribe() { @@ -449,7 +449,7 @@ public void subscribe(FlowableEmitter e) throws Exception { error[0] = ex; } } - }, BackpressureStrategy.NONE) + }, BackpressureStrategy.MISSING) .test() .assertFailure(NullPointerException.class); @@ -653,7 +653,7 @@ public void subscribe(FlowableEmitter e) throws Exception { @Test(expected = NullPointerException.class) public void nullArgument() { - Flowable.create(null, BackpressureStrategy.NONE); + Flowable.create(null, BackpressureStrategy.MISSING); } @Test diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromObservableTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromObservableTest.java index 098f41247d..db97a97638 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromObservableTest.java @@ -21,13 +21,13 @@ public class FlowableFromObservableTest { @Test public void dispose() { - TestHelper.checkDisposed(Observable.just(1).toFlowable(BackpressureStrategy.NONE)); + TestHelper.checkDisposed(Observable.just(1).toFlowable(BackpressureStrategy.MISSING)); } @Test public void error() { Observable.error(new TestException()) - .toFlowable(BackpressureStrategy.NONE) + .toFlowable(BackpressureStrategy.MISSING) .test() .assertFailure(TestException.class); } diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSourceTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSourceTest.java index 0fa58394c1..a7f3d9748d 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSourceTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSourceTest.java @@ -96,8 +96,8 @@ public void normalLatest() { } @Test - public void normalNone() { - Flowable.create(source, BackpressureStrategy.NONE).subscribe(ts); + public void normalMissing() { + Flowable.create(source, BackpressureStrategy.MISSING).subscribe(ts); source.onNext(1); source.onNext(2); @@ -109,8 +109,8 @@ public void normalNone() { } @Test - public void normalNoneRequested() { - Flowable.create(source, BackpressureStrategy.NONE).subscribe(ts); + public void normalMissingRequested() { + Flowable.create(source, BackpressureStrategy.MISSING).subscribe(ts); ts.request(2); source.onNext(1); @@ -175,8 +175,8 @@ public void errorLatest() { } @Test - public void errorNone() { - Flowable.create(source, BackpressureStrategy.NONE).subscribe(ts); + public void errorMissing() { + Flowable.create(source, BackpressureStrategy.MISSING).subscribe(ts); source.onNext(1); source.onNext(2); @@ -254,8 +254,8 @@ public void unsubscribedDrop() { } @Test - public void unsubscribedNone() { - Flowable.create(source, BackpressureStrategy.NONE).subscribe(ts); + public void unsubscribedMissing() { + Flowable.create(source, BackpressureStrategy.MISSING).subscribe(ts); ts.cancel(); source.onNext(1); @@ -334,8 +334,8 @@ public void unsubscribedNoCancelDrop() { } @Test - public void unsubscribedNoCancelNone() { - Flowable.create(sourceNoCancel, BackpressureStrategy.NONE).subscribe(ts); + public void unsubscribedNoCancelMissing() { + Flowable.create(sourceNoCancel, BackpressureStrategy.MISSING).subscribe(ts); ts.cancel(); sourceNoCancel.onNext(1); diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishTest.java index e3c07d896e..3ecd984801 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishTest.java @@ -867,7 +867,7 @@ public void subscribe(FlowableEmitter s) throws Exception { s.onNext(i); } } - }, BackpressureStrategy.NONE) + }, BackpressureStrategy.MISSING) .publish(8) .autoConnect() .test(0L) diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableToXTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableToXTest.java index 18091c969c..9f0da1df6c 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableToXTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableToXTest.java @@ -69,7 +69,7 @@ public void toFlowableError2() { @Test public void toFlowableMissing() { TestSubscriber ts = Observable.range(1, 5) - .toFlowable(BackpressureStrategy.NONE) + .toFlowable(BackpressureStrategy.MISSING) .test(0); ts.request(2);