Skip to content

Commit e749ede

Browse files
committedJul 3, 2019
ReactiveX#6551 Renaming Observable.onErrorResumeNext to Observable.onErrorResumeWith, removing unnecessary cast from null tests, and updating Observable.onErrorResumeWith's JavaDoc to reference correct parameter name, renamed test classes since the distinctions in their names are no longer necessary.
1 parent 335ee34 commit e749ede

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed
 

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -10126,10 +10126,10 @@ public final Observable<T> onErrorResumeNext(Function<? super Throwable, ? exten
1012610126
* <p>
1012710127
* By default, when an ObservableSource encounters an error that prevents it from emitting the expected item to
1012810128
* its {@link Observer}, the ObservableSource invokes its Observer's {@code onError} method, and then quits
10129-
* without invoking any more of its Observer's methods. The {@code onErrorResumeNext} method changes this
10130-
* behavior. If you pass another ObservableSource ({@code resumeSequence}) to an ObservableSource's
10131-
* {@code onErrorResumeNext} method, if the original ObservableSource encounters an error, instead of invoking its
10132-
* Observer's {@code onError} method, it will instead relinquish control to {@code resumeSequence} which
10129+
* without invoking any more of its Observer's methods. The {@code onErrorResumeWith} method changes this
10130+
* behavior. If you pass another ObservableSource ({@code next}) to an ObservableSource's
10131+
* {@code onErrorResumeWith} method, if the original ObservableSource encounters an error, instead of invoking its
10132+
* Observer's {@code onError} method, it will instead relinquish control to {@code next} which
1013310133
* will invoke the Observer's {@link Observer#onNext onNext} method if it is able to do so. In such a case,
1013410134
* because no ObservableSource necessarily invokes {@code onError}, the Observer may never know that an error
1013510135
* happened.
@@ -10138,7 +10138,7 @@ public final Observable<T> onErrorResumeNext(Function<? super Throwable, ? exten
1013810138
* encountered.
1013910139
* <dl>
1014010140
* <dt><b>Scheduler:</b></dt>
10141-
* <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
10141+
* <dd>{@code onErrorResumeWith} does not operate by default on a particular {@link Scheduler}.</dd>
1014210142
* </dl>
1014310143
*
1014410144
* @param next
@@ -10149,7 +10149,7 @@ public final Observable<T> onErrorResumeNext(Function<? super Throwable, ? exten
1014910149
*/
1015010150
@CheckReturnValue
1015110151
@SchedulerSupport(SchedulerSupport.NONE)
10152-
public final Observable<T> onErrorResumeNext(final ObservableSource<? extends T> next) {
10152+
public final Observable<T> onErrorResumeWith(final ObservableSource<? extends T> next) {
1015310153
ObjectHelper.requireNonNull(next, "next is null");
1015410154
return onErrorResumeNext(Functions.justFunction(next));
1015510155
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ public void accept(Throwable throwable) throws Exception {
876876
latch.countDown();
877877
}
878878
})
879-
.onErrorResumeNext(Observable.<String>empty())
879+
.onErrorResumeWith(Observable.<String>empty())
880880
.subscribe();
881881

882882
latch.await();

‎src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaFunctionTest.java ‎src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import io.reactivex.schedulers.Schedulers;
3333
import io.reactivex.testsupport.*;
3434

35-
public class ObservableOnErrorResumeNextViaFunctionTest {
35+
public class ObservableOnErrorResumeNextTest {
3636

3737
@Test
3838
public void resumeNextWithSynchronousExecution() {

‎src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextViaObservableTest.java ‎src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeWithTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import io.reactivex.schedulers.Schedulers;
2929
import io.reactivex.testsupport.TestHelper;
3030

31-
public class ObservableOnErrorResumeNextViaObservableTest {
31+
public class ObservableOnErrorResumeWithTest {
3232

3333
@Test
3434
public void resumeNext() {
@@ -37,7 +37,7 @@ public void resumeNext() {
3737
TestObservable f = new TestObservable(upstream, "one", "fail", "two", "three");
3838
Observable<String> w = Observable.unsafeCreate(f);
3939
Observable<String> resume = Observable.just("twoResume", "threeResume");
40-
Observable<String> observable = w.onErrorResumeNext(resume);
40+
Observable<String> observable = w.onErrorResumeWith(resume);
4141

4242
Observer<String> observer = TestHelper.mockObserver();
4343
observable.subscribe(observer);
@@ -79,7 +79,7 @@ public String apply(String s) {
7979
}
8080
});
8181

82-
Observable<String> observable = w.onErrorResumeNext(resume);
82+
Observable<String> observable = w.onErrorResumeWith(resume);
8383

8484
Observer<String> observer = TestHelper.mockObserver();
8585

@@ -112,7 +112,7 @@ public void subscribe(Observer<? super String> t1) {
112112

113113
});
114114
Observable<String> resume = Observable.just("resume");
115-
Observable<String> observable = testObservable.onErrorResumeNext(resume);
115+
Observable<String> observable = testObservable.onErrorResumeWith(resume);
116116

117117
Observer<String> observer = TestHelper.mockObserver();
118118
observable.subscribe(observer);
@@ -134,7 +134,7 @@ public void subscribe(Observer<? super String> t1) {
134134

135135
});
136136
Observable<String> resume = Observable.just("resume");
137-
Observable<String> observable = testObservable.subscribeOn(Schedulers.io()).onErrorResumeNext(resume);
137+
Observable<String> observable = testObservable.subscribeOn(Schedulers.io()).onErrorResumeWith(resume);
138138

139139
Observer<String> observer = TestHelper.mockObserver();
140140
TestObserver<String> to = new TestObserver<String>(observer);
@@ -194,7 +194,7 @@ public void run() {
194194
public void backpressure() {
195195
TestObserver<Integer> to = new TestObserver<Integer>();
196196
Observable.range(0, 100000)
197-
.onErrorResumeNext(Observable.just(1))
197+
.onErrorResumeWith(Observable.just(1))
198198
.observeOn(Schedulers.computation())
199199
.map(new Function<Integer, Integer>() {
200200
int c;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1700,7 +1700,7 @@ public void ofTypeNull() {
17001700

17011701
@Test(expected = NullPointerException.class)
17021702
public void onErrorResumeNextFunctionNull() {
1703-
just1.onErrorResumeNext((Function<Throwable, Observable<Integer>>)null);
1703+
just1.onErrorResumeNext(null);
17041704
}
17051705

17061706
@Test(expected = NullPointerException.class)
@@ -1715,7 +1715,7 @@ public Observable<Object> apply(Throwable e) {
17151715

17161716
@Test(expected = NullPointerException.class)
17171717
public void onErrorResumeNextObservableNull() {
1718-
just1.onErrorResumeNext((Observable<Integer>)null);
1718+
just1.onErrorResumeWith(null);
17191719
}
17201720

17211721
@Test(expected = NullPointerException.class)

0 commit comments

Comments
 (0)