Skip to content

Commit 9fb4040

Browse files
akarnokdakarnokd
authored
2.x: API removals and renames (#4413)
1 parent 7db9f95 commit 9fb4040

File tree

9 files changed

+23
-1876
lines changed

9 files changed

+23
-1876
lines changed

‎src/main/java/io/reactivex/Flowable.java‎

Lines changed: 4 additions & 633 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 587 deletions
Large diffs are not rendered by default.

‎src/main/java/io/reactivex/Single.java‎

Lines changed: 0 additions & 453 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -521,13 +521,13 @@ public void mergeIterableOneIsNull() {
521521

522522
@Test(expected = NullPointerException.class)
523523
public void mergeArrayNull() {
524-
Flowable.merge(128, 128, (Publisher<Object>[])null);
524+
Flowable.mergeArray(128, 128, (Publisher<Object>[])null);
525525
}
526526

527527
@SuppressWarnings("unchecked")
528528
@Test(expected = NullPointerException.class)
529529
public void mergeArrayOneIsNull() {
530-
Flowable.merge(128, 128, just1, null).blockingLast();
530+
Flowable.mergeArray(128, 128, just1, null).blockingLast();
531531
}
532532

533533
@Test(expected = NullPointerException.class)
@@ -553,13 +553,13 @@ public void mergeDelayErrorIterableOneIsNull() {
553553

554554
@Test(expected = NullPointerException.class)
555555
public void mergeDelayErrorArrayNull() {
556-
Flowable.mergeDelayError(128, 128, (Publisher<Object>[])null);
556+
Flowable.mergeArrayDelayError(128, 128, (Publisher<Object>[])null);
557557
}
558558

559559
@SuppressWarnings("unchecked")
560560
@Test(expected = NullPointerException.class)
561561
public void mergeDelayErrorArrayOneIsNull() {
562-
Flowable.mergeDelayError(128, 128, just1, null).blockingLast();
562+
Flowable.mergeArrayDelayError(128, 128, just1, null).blockingLast();
563563
}
564564

565565
@Test(expected = NullPointerException.class)
@@ -2204,26 +2204,6 @@ public void takeLastSizeTimedSchedulerNull() {
22042204
just1.takeLast(1, 1, TimeUnit.SECONDS, null);
22052205
}
22062206

2207-
@Test(expected = NullPointerException.class)
2208-
public void takeLastBufferTimedUnitNull() {
2209-
just1.takeLastBuffer(1, null, Schedulers.single());
2210-
}
2211-
2212-
@Test(expected = NullPointerException.class)
2213-
public void takeLastBufferTimedSchedulerNull() {
2214-
just1.takeLastBuffer(1, TimeUnit.SECONDS, null);
2215-
}
2216-
2217-
@Test(expected = NullPointerException.class)
2218-
public void takeLastBufferSizeTimedUnitNull() {
2219-
just1.takeLastBuffer(1, 1, null, Schedulers.single());
2220-
}
2221-
2222-
@Test(expected = NullPointerException.class)
2223-
public void takeLastBufferSizeTimedSchedulerNull() {
2224-
just1.takeLastBuffer(1, 1, TimeUnit.SECONDS, null);
2225-
}
2226-
22272207
@Test(expected = NullPointerException.class)
22282208
public void takeUntilPredicateNull() {
22292209
just1.takeUntil((Predicate<Integer>)null);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ public void mergeArrayMaxConcurrent() {
14881488
PublishProcessor<Integer> ps1 = PublishProcessor.create();
14891489
PublishProcessor<Integer> ps2 = PublishProcessor.create();
14901490

1491-
Flowable.merge(1, new Flowable[] { ps1, ps2 }).subscribe(ts);
1491+
Flowable.mergeArray(1, 128, new Flowable[] { ps1, ps2 }).subscribe(ts);
14921492

14931493
assertTrue("ps1 has no subscribers?!", ps1.hasSubscribers());
14941494
assertFalse("ps2 has subscribers?!", ps2.hasSubscribers());

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

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -577,80 +577,4 @@ public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e
577577
ts.assertComplete();
578578
}
579579

580-
@Test
581-
public void with5Others() {
582-
Flowable<Integer> just = Flowable.just(1);
583-
584-
TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
585-
586-
just.withLatestFrom(just, just, just, just, just, new Function6<Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
587-
@Override
588-
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f) {
589-
return Arrays.asList(a, b, c, d, e, f);
590-
}
591-
})
592-
.subscribe(ts);
593-
594-
ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1));
595-
ts.assertNoErrors();
596-
ts.assertComplete();
597-
}
598-
599-
@Test
600-
public void with6Others() {
601-
Flowable<Integer> just = Flowable.just(1);
602-
603-
TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
604-
605-
just.withLatestFrom(just, just, just, just, just, just, new Function7<Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
606-
@Override
607-
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g) {
608-
return Arrays.asList(a, b, c, d, e, f, g);
609-
}
610-
})
611-
.subscribe(ts);
612-
613-
ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1));
614-
ts.assertNoErrors();
615-
ts.assertComplete();
616-
}
617-
618-
@Test
619-
public void with7Others() {
620-
Flowable<Integer> just = Flowable.just(1);
621-
622-
TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
623-
624-
just.withLatestFrom(just, just, just, just, just, just, just, new Function8<Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
625-
@Override
626-
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g, Integer i) {
627-
return Arrays.asList(a, b, c, d, e, f, g, i);
628-
}
629-
})
630-
.subscribe(ts);
631-
632-
ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1, 1));
633-
ts.assertNoErrors();
634-
ts.assertComplete();
635-
}
636-
637-
@Test
638-
public void with8Others() {
639-
Flowable<Integer> just = Flowable.just(1);
640-
641-
TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
642-
643-
just.withLatestFrom(just, just, just, just, just, just, just, just, new Function9<Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
644-
@Override
645-
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g, Integer i, Integer j) {
646-
return Arrays.asList(a, b, c, d, e, f, g, i, j);
647-
}
648-
})
649-
.subscribe(ts);
650-
651-
ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1, 1, 1));
652-
ts.assertNoErrors();
653-
ts.assertComplete();
654-
}
655-
656580
}

‎src/test/java/io/reactivex/internal/operators/observable/ObservableWithLatestFromTest.java‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -543,80 +543,4 @@ public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e
543543
ts.assertComplete();
544544
}
545545

546-
@Test
547-
public void with5Others() {
548-
Observable<Integer> just = Observable.just(1);
549-
550-
TestObserver<List<Integer>> ts = new TestObserver<List<Integer>>();
551-
552-
just.withLatestFrom(just, just, just, just, just, new Function6<Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
553-
@Override
554-
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f) {
555-
return Arrays.asList(a, b, c, d, e, f);
556-
}
557-
})
558-
.subscribe(ts);
559-
560-
ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1));
561-
ts.assertNoErrors();
562-
ts.assertComplete();
563-
}
564-
565-
@Test
566-
public void with6Others() {
567-
Observable<Integer> just = Observable.just(1);
568-
569-
TestObserver<List<Integer>> ts = new TestObserver<List<Integer>>();
570-
571-
just.withLatestFrom(just, just, just, just, just, just, new Function7<Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
572-
@Override
573-
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g) {
574-
return Arrays.asList(a, b, c, d, e, f, g);
575-
}
576-
})
577-
.subscribe(ts);
578-
579-
ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1));
580-
ts.assertNoErrors();
581-
ts.assertComplete();
582-
}
583-
584-
@Test
585-
public void with7Others() {
586-
Observable<Integer> just = Observable.just(1);
587-
588-
TestObserver<List<Integer>> ts = new TestObserver<List<Integer>>();
589-
590-
just.withLatestFrom(just, just, just, just, just, just, just, new Function8<Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
591-
@Override
592-
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g, Integer i) {
593-
return Arrays.asList(a, b, c, d, e, f, g, i);
594-
}
595-
})
596-
.subscribe(ts);
597-
598-
ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1, 1));
599-
ts.assertNoErrors();
600-
ts.assertComplete();
601-
}
602-
603-
@Test
604-
public void with8Others() {
605-
Observable<Integer> just = Observable.just(1);
606-
607-
TestObserver<List<Integer>> ts = new TestObserver<List<Integer>>();
608-
609-
just.withLatestFrom(just, just, just, just, just, just, just, just, new Function9<Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
610-
@Override
611-
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g, Integer i, Integer j) {
612-
return Arrays.asList(a, b, c, d, e, f, g, i, j);
613-
}
614-
})
615-
.subscribe(ts);
616-
617-
ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1, 1, 1));
618-
ts.assertNoErrors();
619-
ts.assertComplete();
620-
}
621-
622546
}

‎src/test/java/io/reactivex/observable/ObservableNullTests.java‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -603,13 +603,13 @@ public void mergeIterableOneIsNull() {
603603

604604
@Test(expected = NullPointerException.class)
605605
public void mergeArrayNull() {
606-
Observable.merge(128, 128, (Observable<Object>[])null);
606+
Observable.mergeArray(128, 128, (Observable<Object>[])null);
607607
}
608608

609609
@SuppressWarnings("unchecked")
610610
@Test(expected = NullPointerException.class)
611611
public void mergeArrayOneIsNull() {
612-
Observable.merge(128, 128, just1, null).blockingLast();
612+
Observable.mergeArray(128, 128, just1, null).blockingLast();
613613
}
614614

615615
@Test(expected = NullPointerException.class)
@@ -635,13 +635,13 @@ public void mergeDelayErrorIterableOneIsNull() {
635635

636636
@Test(expected = NullPointerException.class)
637637
public void mergeDelayErrorArrayNull() {
638-
Observable.mergeDelayError(128, 128, (Observable<Object>[])null);
638+
Observable.mergeArrayDelayError(128, 128, (Observable<Object>[])null);
639639
}
640640

641641
@SuppressWarnings("unchecked")
642642
@Test(expected = NullPointerException.class)
643643
public void mergeDelayErrorArrayOneIsNull() {
644-
Observable.mergeDelayError(128, 128, just1, null).blockingLast();
644+
Observable.mergeArrayDelayError(128, 128, just1, null).blockingLast();
645645
}
646646

647647
@Test(expected = NullPointerException.class)
@@ -2276,26 +2276,6 @@ public void takeLastSizeTimedSchedulerNull() {
22762276
just1.takeLast(1, 1, TimeUnit.SECONDS, null);
22772277
}
22782278

2279-
@Test(expected = NullPointerException.class)
2280-
public void takeLastBufferTimedUnitNull() {
2281-
just1.takeLastBuffer(1, null, Schedulers.single());
2282-
}
2283-
2284-
@Test(expected = NullPointerException.class)
2285-
public void takeLastBufferTimedSchedulerNull() {
2286-
just1.takeLastBuffer(1, TimeUnit.SECONDS, null);
2287-
}
2288-
2289-
@Test(expected = NullPointerException.class)
2290-
public void takeLastBufferSizeTimedUnitNull() {
2291-
just1.takeLastBuffer(1, 1, null, Schedulers.single());
2292-
}
2293-
2294-
@Test(expected = NullPointerException.class)
2295-
public void takeLastBufferSizeTimedSchedulerNull() {
2296-
just1.takeLastBuffer(1, 1, TimeUnit.SECONDS, null);
2297-
}
2298-
22992279
@Test(expected = NullPointerException.class)
23002280
public void takeUntilPredicateNull() {
23012281
just1.takeUntil((Predicate<Integer>)null);

‎src/test/java/io/reactivex/single/SingleNullTests.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ public void concatObservableNull() {
9393

9494
@Test
9595
public void concatNull() throws Exception {
96+
int maxArgs = 4;
97+
9698
@SuppressWarnings("rawtypes")
9799
Class<Single> clazz = Single.class;
98-
for (int argCount = 2; argCount < 10; argCount++) {
100+
for (int argCount = 2; argCount <= maxArgs; argCount++) {
99101
for (int argNull = 1; argNull <= argCount; argNull++) {
100102
Class<?>[] params = new Class[argCount];
101103
Arrays.fill(params, SingleSource.class);
@@ -255,9 +257,11 @@ public void mergeSingleNull() {
255257

256258
@Test
257259
public void mergeNull() throws Exception {
260+
int maxArgs = 4;
261+
258262
@SuppressWarnings("rawtypes")
259263
Class<Single> clazz = Single.class;
260-
for (int argCount = 2; argCount < 10; argCount++) {
264+
for (int argCount = 2; argCount <= maxArgs; argCount++) {
261265
for (int argNull = 1; argNull <= argCount; argNull++) {
262266
Class<?>[] params = new Class[argCount];
263267
Arrays.fill(params, SingleSource.class);

0 commit comments

Comments
 (0)