Skip to content

2.x: API removals and renames #4413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2016
Merged

2.x: API removals and renames #4413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
637 changes: 4 additions & 633 deletions src/main/java/io/reactivex/Flowable.java
View file
Open in desktop

Large diffs are not rendered by default.

591 changes: 4 additions & 587 deletions src/main/java/io/reactivex/Observable.java
View file
Open in desktop

Large diffs are not rendered by default.

453 changes: 0 additions & 453 deletions src/main/java/io/reactivex/Single.java
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 4 additions & 24 deletions src/test/java/io/reactivex/flowable/FlowableNullTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,13 +521,13 @@ public void mergeIterableOneIsNull() {

@Test(expected = NullPointerException.class)
public void mergeArrayNull() {
Flowable.merge(128, 128, (Publisher<Object>[])null);
Flowable.mergeArray(128, 128, (Publisher<Object>[])null);
}

@SuppressWarnings("unchecked")
@Test(expected = NullPointerException.class)
public void mergeArrayOneIsNull() {
Flowable.merge(128, 128, just1, null).blockingLast();
Flowable.mergeArray(128, 128, just1, null).blockingLast();
}

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

@Test(expected = NullPointerException.class)
public void mergeDelayErrorArrayNull() {
Flowable.mergeDelayError(128, 128, (Publisher<Object>[])null);
Flowable.mergeArrayDelayError(128, 128, (Publisher<Object>[])null);
}

@SuppressWarnings("unchecked")
@Test(expected = NullPointerException.class)
public void mergeDelayErrorArrayOneIsNull() {
Flowable.mergeDelayError(128, 128, just1, null).blockingLast();
Flowable.mergeArrayDelayError(128, 128, just1, null).blockingLast();
}

@Test(expected = NullPointerException.class)
Expand Down Expand Up @@ -2204,26 +2204,6 @@ public void takeLastSizeTimedSchedulerNull() {
just1.takeLast(1, 1, TimeUnit.SECONDS, null);
}

@Test(expected = NullPointerException.class)
public void takeLastBufferTimedUnitNull() {
just1.takeLastBuffer(1, null, Schedulers.single());
}

@Test(expected = NullPointerException.class)
public void takeLastBufferTimedSchedulerNull() {
just1.takeLastBuffer(1, TimeUnit.SECONDS, null);
}

@Test(expected = NullPointerException.class)
public void takeLastBufferSizeTimedUnitNull() {
just1.takeLastBuffer(1, 1, null, Schedulers.single());
}

@Test(expected = NullPointerException.class)
public void takeLastBufferSizeTimedSchedulerNull() {
just1.takeLastBuffer(1, 1, TimeUnit.SECONDS, null);
}

@Test(expected = NullPointerException.class)
public void takeUntilPredicateNull() {
just1.takeUntil((Predicate<Integer>)null);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@ public void mergeArrayMaxConcurrent() {
PublishProcessor<Integer> ps1 = PublishProcessor.create();
PublishProcessor<Integer> ps2 = PublishProcessor.create();

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

assertTrue("ps1 has no subscribers?!", ps1.hasSubscribers());
assertFalse("ps2 has subscribers?!", ps2.hasSubscribers());
Expand Down
76 changes: 0 additions & 76 deletions src/test/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,80 +577,4 @@ public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e
ts.assertComplete();
}

@Test
public void with5Others() {
Flowable<Integer> just = Flowable.just(1);

TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();

just.withLatestFrom(just, just, just, just, just, new Function6<Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
@Override
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f) {
return Arrays.asList(a, b, c, d, e, f);
}
})
.subscribe(ts);

ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1));
ts.assertNoErrors();
ts.assertComplete();
}

@Test
public void with6Others() {
Flowable<Integer> just = Flowable.just(1);

TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();

just.withLatestFrom(just, just, just, just, just, just, new Function7<Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
@Override
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g) {
return Arrays.asList(a, b, c, d, e, f, g);
}
})
.subscribe(ts);

ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1));
ts.assertNoErrors();
ts.assertComplete();
}

@Test
public void with7Others() {
Flowable<Integer> just = Flowable.just(1);

TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();

just.withLatestFrom(just, just, just, just, just, just, just, new Function8<Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
@Override
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g, Integer i) {
return Arrays.asList(a, b, c, d, e, f, g, i);
}
})
.subscribe(ts);

ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1, 1));
ts.assertNoErrors();
ts.assertComplete();
}

@Test
public void with8Others() {
Flowable<Integer> just = Flowable.just(1);

TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();

just.withLatestFrom(just, just, just, just, just, just, just, just, new Function9<Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
@Override
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g, Integer i, Integer j) {
return Arrays.asList(a, b, c, d, e, f, g, i, j);
}
})
.subscribe(ts);

ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1, 1, 1));
ts.assertNoErrors();
ts.assertComplete();
}

}
76 changes: 0 additions & 76 deletions src/test/java/io/reactivex/internal/operators/observable/ObservableWithLatestFromTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,80 +543,4 @@ public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e
ts.assertComplete();
}

@Test
public void with5Others() {
Observable<Integer> just = Observable.just(1);

TestObserver<List<Integer>> ts = new TestObserver<List<Integer>>();

just.withLatestFrom(just, just, just, just, just, new Function6<Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
@Override
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f) {
return Arrays.asList(a, b, c, d, e, f);
}
})
.subscribe(ts);

ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1));
ts.assertNoErrors();
ts.assertComplete();
}

@Test
public void with6Others() {
Observable<Integer> just = Observable.just(1);

TestObserver<List<Integer>> ts = new TestObserver<List<Integer>>();

just.withLatestFrom(just, just, just, just, just, just, new Function7<Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
@Override
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g) {
return Arrays.asList(a, b, c, d, e, f, g);
}
})
.subscribe(ts);

ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1));
ts.assertNoErrors();
ts.assertComplete();
}

@Test
public void with7Others() {
Observable<Integer> just = Observable.just(1);

TestObserver<List<Integer>> ts = new TestObserver<List<Integer>>();

just.withLatestFrom(just, just, just, just, just, just, just, new Function8<Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
@Override
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g, Integer i) {
return Arrays.asList(a, b, c, d, e, f, g, i);
}
})
.subscribe(ts);

ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1, 1));
ts.assertNoErrors();
ts.assertComplete();
}

@Test
public void with8Others() {
Observable<Integer> just = Observable.just(1);

TestObserver<List<Integer>> ts = new TestObserver<List<Integer>>();

just.withLatestFrom(just, just, just, just, just, just, just, just, new Function9<Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
@Override
public List<Integer> apply(Integer a, Integer b, Integer c, Integer d, Integer e, Integer f, Integer g, Integer i, Integer j) {
return Arrays.asList(a, b, c, d, e, f, g, i, j);
}
})
.subscribe(ts);

ts.assertValue(Arrays.asList(1, 1, 1, 1, 1, 1, 1, 1, 1));
ts.assertNoErrors();
ts.assertComplete();
}

}
28 changes: 4 additions & 24 deletions src/test/java/io/reactivex/observable/ObservableNullTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,13 +603,13 @@ public void mergeIterableOneIsNull() {

@Test(expected = NullPointerException.class)
public void mergeArrayNull() {
Observable.merge(128, 128, (Observable<Object>[])null);
Observable.mergeArray(128, 128, (Observable<Object>[])null);
}

@SuppressWarnings("unchecked")
@Test(expected = NullPointerException.class)
public void mergeArrayOneIsNull() {
Observable.merge(128, 128, just1, null).blockingLast();
Observable.mergeArray(128, 128, just1, null).blockingLast();
}

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

@Test(expected = NullPointerException.class)
public void mergeDelayErrorArrayNull() {
Observable.mergeDelayError(128, 128, (Observable<Object>[])null);
Observable.mergeArrayDelayError(128, 128, (Observable<Object>[])null);
}

@SuppressWarnings("unchecked")
@Test(expected = NullPointerException.class)
public void mergeDelayErrorArrayOneIsNull() {
Observable.mergeDelayError(128, 128, just1, null).blockingLast();
Observable.mergeArrayDelayError(128, 128, just1, null).blockingLast();
}

@Test(expected = NullPointerException.class)
Expand Down Expand Up @@ -2276,26 +2276,6 @@ public void takeLastSizeTimedSchedulerNull() {
just1.takeLast(1, 1, TimeUnit.SECONDS, null);
}

@Test(expected = NullPointerException.class)
public void takeLastBufferTimedUnitNull() {
just1.takeLastBuffer(1, null, Schedulers.single());
}

@Test(expected = NullPointerException.class)
public void takeLastBufferTimedSchedulerNull() {
just1.takeLastBuffer(1, TimeUnit.SECONDS, null);
}

@Test(expected = NullPointerException.class)
public void takeLastBufferSizeTimedUnitNull() {
just1.takeLastBuffer(1, 1, null, Schedulers.single());
}

@Test(expected = NullPointerException.class)
public void takeLastBufferSizeTimedSchedulerNull() {
just1.takeLastBuffer(1, 1, TimeUnit.SECONDS, null);
}

@Test(expected = NullPointerException.class)
public void takeUntilPredicateNull() {
just1.takeUntil((Predicate<Integer>)null);
Expand Down
8 changes: 6 additions & 2 deletions src/test/java/io/reactivex/single/SingleNullTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,11 @@ public void concatObservableNull() {

@Test
public void concatNull() throws Exception {
int maxArgs = 4;

@SuppressWarnings("rawtypes")
Class<Single> clazz = Single.class;
for (int argCount = 2; argCount < 10; argCount++) {
for (int argCount = 2; argCount <= maxArgs; argCount++) {
for (int argNull = 1; argNull <= argCount; argNull++) {
Class<?>[] params = new Class[argCount];
Arrays.fill(params, SingleSource.class);
Expand Down Expand Up @@ -255,9 +257,11 @@ public void mergeSingleNull() {

@Test
public void mergeNull() throws Exception {
int maxArgs = 4;

@SuppressWarnings("rawtypes")
Class<Single> clazz = Single.class;
for (int argCount = 2; argCount < 10; argCount++) {
for (int argCount = 2; argCount <= maxArgs; argCount++) {
for (int argNull = 1; argNull <= argCount; argNull++) {
Class<?>[] params = new Class[argCount];
Arrays.fill(params, SingleSource.class);
Expand Down