Skip to content

Commit 07d24c2

Browse files
ming13akarnokd
authored andcommitted
Rename BackpressureStrategy.NONE to MISSING (#4767)
1 parent 83ba4b9 commit 07d24c2

File tree

8 files changed

+25
-25
lines changed

8 files changed

+25
-25
lines changed

src/main/java/io/reactivex/BackpressureStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum BackpressureStrategy {
2222
* Downstream has to deal with any overflow.
2323
* <p>Useful when one applies one of the custom-parameter onBackpressureXXX operators.
2424
*/
25-
NONE,
25+
MISSING,
2626
/**
2727
* Signals a MissingBackpressureException in case the downstream can't keep up.
2828
*/

src/main/java/io/reactivex/Observable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11758,7 +11758,7 @@ public final Flowable<T> toFlowable(BackpressureStrategy strategy) {
1175811758
return o.onBackpressureDrop();
1175911759
case LATEST:
1176011760
return o.onBackpressureLatest();
11761-
case NONE:
11761+
case MISSING:
1176211762
return o;
1176311763
case ERROR:
1176411764
return RxJavaPlugins.onAssembly(new FlowableOnBackpressureError<T>(o));

src/main/java/io/reactivex/internal/operators/flowable/FlowableCreate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public void subscribeActual(Subscriber<? super T> t) {
4545
BaseEmitter<T> emitter;
4646

4747
switch (backpressure) {
48-
case NONE: {
49-
emitter = new NoneEmitter<T>(t);
48+
case MISSING: {
49+
emitter = new MissingEmitter<T>(t);
5050
break;
5151
}
5252
case ERROR: {
@@ -319,12 +319,12 @@ public final FlowableEmitter<T> serialize() {
319319
}
320320
}
321321

322-
static final class NoneEmitter<T> extends BaseEmitter<T> {
322+
static final class MissingEmitter<T> extends BaseEmitter<T> {
323323

324324

325325
private static final long serialVersionUID = 3776720187248809713L;
326326

327-
NoneEmitter(Subscriber<? super T> actual) {
327+
MissingEmitter(Subscriber<? super T> actual) {
328328
super(actual);
329329
}
330330

src/test/java/io/reactivex/internal/operators/flowable/FlowableCreateTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
314314
}
315315

316316
@Test
317-
public void createNullValueNone() {
317+
public void createNullValueMissing() {
318318
final Throwable[] error = { null };
319319

320320
Flowable.create(new FlowableOnSubscribe<Integer>() {
@@ -329,7 +329,7 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
329329
error[0] = ex;
330330
}
331331
}
332-
}, BackpressureStrategy.NONE)
332+
}, BackpressureStrategy.MISSING)
333333
.test()
334334
.assertFailure(NullPointerException.class);
335335

@@ -433,7 +433,7 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
433433
}
434434

435435
@Test
436-
public void createNullValueNoneSerialized() {
436+
public void createNullValueMissingSerialized() {
437437
final Throwable[] error = { null };
438438

439439
Flowable.create(new FlowableOnSubscribe<Integer>() {
@@ -449,7 +449,7 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
449449
error[0] = ex;
450450
}
451451
}
452-
}, BackpressureStrategy.NONE)
452+
}, BackpressureStrategy.MISSING)
453453
.test()
454454
.assertFailure(NullPointerException.class);
455455

@@ -653,7 +653,7 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
653653

654654
@Test(expected = NullPointerException.class)
655655
public void nullArgument() {
656-
Flowable.create(null, BackpressureStrategy.NONE);
656+
Flowable.create(null, BackpressureStrategy.MISSING);
657657
}
658658

659659
@Test

src/test/java/io/reactivex/internal/operators/flowable/FlowableFromObservableTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
public class FlowableFromObservableTest {
2222
@Test
2323
public void dispose() {
24-
TestHelper.checkDisposed(Observable.just(1).toFlowable(BackpressureStrategy.NONE));
24+
TestHelper.checkDisposed(Observable.just(1).toFlowable(BackpressureStrategy.MISSING));
2525
}
2626

2727
@Test
2828
public void error() {
2929
Observable.error(new TestException())
30-
.toFlowable(BackpressureStrategy.NONE)
30+
.toFlowable(BackpressureStrategy.MISSING)
3131
.test()
3232
.assertFailure(TestException.class);
3333
}

src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSourceTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ public void normalLatest() {
9696
}
9797

9898
@Test
99-
public void normalNone() {
100-
Flowable.create(source, BackpressureStrategy.NONE).subscribe(ts);
99+
public void normalMissing() {
100+
Flowable.create(source, BackpressureStrategy.MISSING).subscribe(ts);
101101

102102
source.onNext(1);
103103
source.onNext(2);
@@ -109,8 +109,8 @@ public void normalNone() {
109109
}
110110

111111
@Test
112-
public void normalNoneRequested() {
113-
Flowable.create(source, BackpressureStrategy.NONE).subscribe(ts);
112+
public void normalMissingRequested() {
113+
Flowable.create(source, BackpressureStrategy.MISSING).subscribe(ts);
114114
ts.request(2);
115115

116116
source.onNext(1);
@@ -175,8 +175,8 @@ public void errorLatest() {
175175
}
176176

177177
@Test
178-
public void errorNone() {
179-
Flowable.create(source, BackpressureStrategy.NONE).subscribe(ts);
178+
public void errorMissing() {
179+
Flowable.create(source, BackpressureStrategy.MISSING).subscribe(ts);
180180

181181
source.onNext(1);
182182
source.onNext(2);
@@ -254,8 +254,8 @@ public void unsubscribedDrop() {
254254
}
255255

256256
@Test
257-
public void unsubscribedNone() {
258-
Flowable.create(source, BackpressureStrategy.NONE).subscribe(ts);
257+
public void unsubscribedMissing() {
258+
Flowable.create(source, BackpressureStrategy.MISSING).subscribe(ts);
259259
ts.cancel();
260260

261261
source.onNext(1);
@@ -334,8 +334,8 @@ public void unsubscribedNoCancelDrop() {
334334
}
335335

336336
@Test
337-
public void unsubscribedNoCancelNone() {
338-
Flowable.create(sourceNoCancel, BackpressureStrategy.NONE).subscribe(ts);
337+
public void unsubscribedNoCancelMissing() {
338+
Flowable.create(sourceNoCancel, BackpressureStrategy.MISSING).subscribe(ts);
339339
ts.cancel();
340340

341341
sourceNoCancel.onNext(1);

src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ public void subscribe(FlowableEmitter<Object> s) throws Exception {
867867
s.onNext(i);
868868
}
869869
}
870-
}, BackpressureStrategy.NONE)
870+
}, BackpressureStrategy.MISSING)
871871
.publish(8)
872872
.autoConnect()
873873
.test(0L)

src/test/java/io/reactivex/internal/operators/observable/ObservableToXTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void toFlowableError2() {
6969
@Test
7070
public void toFlowableMissing() {
7171
TestSubscriber<Integer> ts = Observable.range(1, 5)
72-
.toFlowable(BackpressureStrategy.NONE)
72+
.toFlowable(BackpressureStrategy.MISSING)
7373
.test(0);
7474

7575
ts.request(2);

0 commit comments

Comments
 (0)