diff --git a/src/main/java/io/reactivex/Flowable.java b/src/main/java/io/reactivex/Flowable.java index 50c1fe436a..26b2e9f4a9 100644 --- a/src/main/java/io/reactivex/Flowable.java +++ b/src/main/java/io/reactivex/Flowable.java @@ -14598,7 +14598,7 @@ public final Flowable sorted(Comparator sortFunction) { * is expected to honor backpressure as well. If it violates this rule, it may throw an * {@code IllegalStateException} when the source {@code Publisher} completes. *
Scheduler:
- *
{@code startWith} does not operate by default on a particular {@link Scheduler}.
+ *
{@code startWithIterable} does not operate by default on a particular {@link Scheduler}.
* * * @param items @@ -14606,12 +14606,15 @@ public final Flowable sorted(Comparator sortFunction) { * @return a Flowable that emits the items in the specified {@link Iterable} and then emits the items * emitted by the source Publisher * @see ReactiveX operators documentation: StartWith + * @see #startWithArray(Object...) + * @see #startWithItem(Object) + * @since 3.0.0 */ @SuppressWarnings("unchecked") @CheckReturnValue @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) - public final Flowable startWith(Iterable items) { + public final Flowable startWithIterable(Iterable items) { return concatArray(fromIterable(items), this); } @@ -14656,23 +14659,26 @@ public final Flowable startWith(Publisher other) { * is expected to honor backpressure as well. If it violates this rule, it may throw an * {@code IllegalStateException} when the source {@code Publisher} completes. *
Scheduler:
- *
{@code startWith} does not operate by default on a particular {@link Scheduler}.
+ *
{@code startWithItem} does not operate by default on a particular {@link Scheduler}.
* * - * @param value + * @param item * the item to emit first * @return a Flowable that emits the specified item before it begins to emit items emitted by the source * Publisher * @see ReactiveX operators documentation: StartWith + * @see #startWithArray(Object...) + * @see #startWithIterable(Iterable) + * @since 3.0.0 */ @SuppressWarnings("unchecked") @CheckReturnValue @NonNull @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) - public final Flowable startWith(T value) { - ObjectHelper.requireNonNull(value, "value is null"); - return concatArray(just(value), this); + public final Flowable startWithItem(T item) { + ObjectHelper.requireNonNull(item, "item is null"); + return concatArray(just(item), this); } /** @@ -14694,6 +14700,8 @@ public final Flowable startWith(T value) { * @return a Flowable that emits the specified items before it begins to emit items emitted by the source * Publisher * @see ReactiveX operators documentation: StartWith + * @see #startWithItem(Object) + * @see #startWithIterable(Iterable) */ @SuppressWarnings("unchecked") @CheckReturnValue diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java index a258106c64..de774168f8 100644 --- a/src/main/java/io/reactivex/Observable.java +++ b/src/main/java/io/reactivex/Observable.java @@ -12036,7 +12036,7 @@ public final Observable sorted(Comparator sortFunction) { * *
*
Scheduler:
- *
{@code startWith} does not operate by default on a particular {@link Scheduler}.
+ *
{@code startWithIterable} does not operate by default on a particular {@link Scheduler}.
*
* * @param items @@ -12044,11 +12044,14 @@ public final Observable sorted(Comparator sortFunction) { * @return an Observable that emits the items in the specified {@link Iterable} and then emits the items * emitted by the source ObservableSource * @see ReactiveX operators documentation: StartWith + * @since 3.0.0 + * @see #startWithItem(Object) + * @see #startWithArray(Object...) */ @SuppressWarnings("unchecked") @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) - public final Observable startWith(Iterable items) { + public final Observable startWithIterable(Iterable items) { return concatArray(fromIterable(items), this); } @@ -12083,7 +12086,7 @@ public final Observable startWith(ObservableSource other) { * *
*
Scheduler:
- *
{@code startWith} does not operate by default on a particular {@link Scheduler}.
+ *
{@code startWithItem} does not operate by default on a particular {@link Scheduler}.
*
* * @param item @@ -12091,11 +12094,14 @@ public final Observable startWith(ObservableSource other) { * @return an Observable that emits the specified item before it begins to emit items emitted by the source * ObservableSource * @see ReactiveX operators documentation: StartWith + * @see #startWithArray(Object...) + * @see #startWithIterable(Iterable) + * @since 3.0.0 */ @SuppressWarnings("unchecked") @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) - public final Observable startWith(T item) { + public final Observable startWithItem(T item) { ObjectHelper.requireNonNull(item, "item is null"); return concatArray(just(item), this); } @@ -12115,6 +12121,8 @@ public final Observable startWith(T item) { * @return an Observable that emits the specified items before it begins to emit items emitted by the source * ObservableSource * @see ReactiveX operators documentation: StartWith + * @see #startWithItem(Object) + * @see #startWithIterable(Iterable) */ @SuppressWarnings("unchecked") @CheckReturnValue diff --git a/src/test/java/io/reactivex/flowable/FlowableCovarianceTest.java b/src/test/java/io/reactivex/flowable/FlowableCovarianceTest.java index b40ff86193..1b5df85a87 100644 --- a/src/test/java/io/reactivex/flowable/FlowableCovarianceTest.java +++ b/src/test/java/io/reactivex/flowable/FlowableCovarianceTest.java @@ -212,7 +212,7 @@ public Flowable apply(List> listOfLists) { @Override public Publisher apply(Flowable> movieList) { return movieList - .startWith(new ArrayList()) + .startWithItem(new ArrayList()) .buffer(2, 1) .skip(1) .flatMap(calculateDelta); diff --git a/src/test/java/io/reactivex/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/flowable/FlowableNullTests.java index eb98758a25..e78772c7c4 100644 --- a/src/test/java/io/reactivex/flowable/FlowableNullTests.java +++ b/src/test/java/io/reactivex/flowable/FlowableNullTests.java @@ -2103,12 +2103,12 @@ public void skipWhileNull() { @Test(expected = NullPointerException.class) public void startWithIterableNull() { - just1.startWith((Iterable)null); + just1.startWithIterable((Iterable)null); } @Test(expected = NullPointerException.class) public void startWithIterableIteratorNull() { - just1.startWith(new Iterable() { + just1.startWithIterable(new Iterable() { @Override public Iterator iterator() { return null; @@ -2118,12 +2118,12 @@ public Iterator iterator() { @Test(expected = NullPointerException.class) public void startWithIterableOneNull() { - just1.startWith(Arrays.asList(1, null)).blockingSubscribe(); + just1.startWithIterable(Arrays.asList(1, null)).blockingSubscribe(); } @Test(expected = NullPointerException.class) public void startWithSingleNull() { - just1.startWith((Integer)null); + just1.startWithItem((Integer)null); } @Test(expected = NullPointerException.class) diff --git a/src/test/java/io/reactivex/flowable/FlowableStartWithTests.java b/src/test/java/io/reactivex/flowable/FlowableStartWithTests.java index 699f38c603..39fdf11bd0 100644 --- a/src/test/java/io/reactivex/flowable/FlowableStartWithTests.java +++ b/src/test/java/io/reactivex/flowable/FlowableStartWithTests.java @@ -37,7 +37,7 @@ public void startWithIterable() { List li = new ArrayList(); li.add("alpha"); li.add("beta"); - List values = Flowable.just("one", "two").startWith(li).toList().blockingGet(); + List values = Flowable.just("one", "two").startWithIterable(li).toList().blockingGet(); assertEquals("alpha", values.get(0)); assertEquals("beta", values.get(1)); diff --git a/src/test/java/io/reactivex/flowable/FlowableTests.java b/src/test/java/io/reactivex/flowable/FlowableTests.java index 5d6671d56e..ba7c077041 100644 --- a/src/test/java/io/reactivex/flowable/FlowableTests.java +++ b/src/test/java/io/reactivex/flowable/FlowableTests.java @@ -968,7 +968,7 @@ public void justWithScheduler() { @Test public void startWithWithScheduler() { TestScheduler scheduler = new TestScheduler(); - Flowable flowable = Flowable.just(3, 4).startWith(Arrays.asList(1, 2)).subscribeOn(scheduler); + Flowable flowable = Flowable.just(3, 4).startWithIterable(Arrays.asList(1, 2)).subscribeOn(scheduler); Subscriber subscriber = TestHelper.mockSubscriber(); diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableCombineLatestTest.java index 6ac0cce4ad..a2e4571dee 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCombineLatestTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowableCombineLatestTest.java @@ -1363,7 +1363,7 @@ public Object apply(Object[] a) throws Exception { } }, 128, - Flowable.error(new TestException()).startWith(1), + Flowable.error(new TestException()).startWithItem(1), Flowable.empty() ) .test() diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeDelayErrorTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeDelayErrorTest.java index bc5fe1685a..4ef639f31e 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeDelayErrorTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeDelayErrorTest.java @@ -499,7 +499,7 @@ public void errorInParentFlowable() { TestSubscriberEx ts = new TestSubscriberEx(); Flowable.mergeDelayError( Flowable.just(Flowable.just(1), Flowable.just(2)) - .startWith(Flowable. error(new RuntimeException())) + .startWithItem(Flowable. error(new RuntimeException())) ).subscribe(ts); ts.awaitDone(5, TimeUnit.SECONDS); ts.assertTerminated(); diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryTest.java index ea4491e751..a0d9eab6db 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryTest.java @@ -145,7 +145,7 @@ public Flowable apply(Flowable t1) { public Integer apply(Throwable t1) { return 1; } - }).startWith(1).cast(Object.class); + }).startWithItem(1).cast(Object.class); } }) .doOnError(new Consumer() { @@ -183,7 +183,7 @@ public Flowable apply(Flowable t1) { public Integer apply(Throwable t1) { return 0; } - }).startWith(0).cast(Object.class); + }).startWithItem(0).cast(Object.class); } }).subscribe(subscriber); diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithSizeTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithSizeTest.java index 8adf026366..e1c2e7a4e2 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithSizeTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithSizeTest.java @@ -289,7 +289,7 @@ public void takeFlatMapCompletes() { .flatMap(new Function, Flowable>() { @Override public Flowable apply(Flowable w) { - return w.startWith(indicator); + return w.startWithItem(indicator); } }).subscribe(ts); diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithTimeTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithTimeTest.java index 5ef9620dad..45f87d9963 100644 --- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithTimeTest.java +++ b/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithTimeTest.java @@ -200,7 +200,7 @@ public void run() { .flatMap(new Function, Flowable>() { @Override public Flowable apply(Flowable w) { - return w.startWith(indicator) + return w.startWithItem(indicator) .doOnComplete(new Action() { @Override public void run() { diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableCombineLatestTest.java index 62b4fa5dc9..8dacbecf0c 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableCombineLatestTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableCombineLatestTest.java @@ -951,7 +951,7 @@ public Object apply(Object[] a) throws Exception { } }, 128, - Observable.error(new TestException()).startWith(1), + Observable.error(new TestException()).startWithItem(1), Observable.empty() ) .test() diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java index 6868c33e21..8aedb08b47 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java @@ -493,7 +493,7 @@ public void errorInParentObservable() { TestObserverEx to = new TestObserverEx(); Observable.mergeDelayError( Observable.just(Observable.just(1), Observable.just(2)) - .startWith(Observable. error(new RuntimeException())) + .startWithItem(Observable. error(new RuntimeException())) ).subscribe(to); to.awaitDone(5, TimeUnit.SECONDS); to.assertTerminated(); diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java index cc3e77dce6..568b3486a9 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java @@ -147,7 +147,7 @@ public Observable apply(Observable t1) { public Object apply(Throwable t1) { return 1; } - }).startWith(1); + }).startWithItem(1); } }) .doOnError(new Consumer() { @@ -185,7 +185,7 @@ public Observable apply(Observable t1) { public Integer apply(Throwable t1) { return 0; } - }).startWith(0).cast(Object.class); + }).startWithItem(0).cast(Object.class); } }).subscribe(observer); diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java index 97a5e438d8..752ec7f613 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java @@ -251,7 +251,7 @@ public void takeFlatMapCompletes() { .flatMap(new Function, Observable>() { @Override public Observable apply(Observable w) { - return w.startWith(indicator); + return w.startWithItem(indicator); } }).subscribe(to); diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java index d00ad6ceb9..80a906cd9a 100644 --- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java +++ b/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java @@ -200,7 +200,7 @@ public void run() { .flatMap(new Function, Observable>() { @Override public Observable apply(Observable w) { - return w.startWith(indicator) + return w.startWithItem(indicator) .doOnComplete(new Action() { @Override public void run() { diff --git a/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java b/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java index 2164d8263c..82da68bb38 100644 --- a/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java +++ b/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java @@ -211,7 +211,7 @@ public Observable apply(List> listOfLists) { @Override public Observable apply(Observable> movieList) { return movieList - .startWith(new ArrayList()) + .startWithItem(new ArrayList()) .buffer(2, 1) .skip(1) .flatMap(calculateDelta); diff --git a/src/test/java/io/reactivex/observable/ObservableNullTests.java b/src/test/java/io/reactivex/observable/ObservableNullTests.java index 71719bdbab..47c2ab674a 100644 --- a/src/test/java/io/reactivex/observable/ObservableNullTests.java +++ b/src/test/java/io/reactivex/observable/ObservableNullTests.java @@ -2140,12 +2140,12 @@ public void skipWhileNull() { @Test(expected = NullPointerException.class) public void startWithIterableNull() { - just1.startWith((Iterable)null); + just1.startWithIterable((Iterable)null); } @Test(expected = NullPointerException.class) public void startWithIterableIteratorNull() { - just1.startWith(new Iterable() { + just1.startWithIterable(new Iterable() { @Override public Iterator iterator() { return null; @@ -2155,12 +2155,12 @@ public Iterator iterator() { @Test(expected = NullPointerException.class) public void startWithIterableOneNull() { - just1.startWith(Arrays.asList(1, null)).blockingSubscribe(); + just1.startWithIterable(Arrays.asList(1, null)).blockingSubscribe(); } @Test(expected = NullPointerException.class) public void startWithSingleNull() { - just1.startWith((Integer)null); + just1.startWithItem((Integer)null); } @Test(expected = NullPointerException.class) diff --git a/src/test/java/io/reactivex/observable/ObservableStartWithTests.java b/src/test/java/io/reactivex/observable/ObservableStartWithTests.java index 78cf31311b..269eea0215 100644 --- a/src/test/java/io/reactivex/observable/ObservableStartWithTests.java +++ b/src/test/java/io/reactivex/observable/ObservableStartWithTests.java @@ -37,7 +37,7 @@ public void startWithIterable() { List li = new ArrayList(); li.add("alpha"); li.add("beta"); - List values = Observable.just("one", "two").startWith(li).toList().blockingGet(); + List values = Observable.just("one", "two").startWithIterable(li).toList().blockingGet(); assertEquals("alpha", values.get(0)); assertEquals("beta", values.get(1)); diff --git a/src/test/java/io/reactivex/observable/ObservableTest.java b/src/test/java/io/reactivex/observable/ObservableTest.java index ae8edf1cbf..296612d1b9 100644 --- a/src/test/java/io/reactivex/observable/ObservableTest.java +++ b/src/test/java/io/reactivex/observable/ObservableTest.java @@ -990,7 +990,7 @@ public void justWithScheduler() { @Test public void startWithWithScheduler() { TestScheduler scheduler = new TestScheduler(); - Observable o = Observable.just(3, 4).startWith(Arrays.asList(1, 2)).subscribeOn(scheduler); + Observable o = Observable.just(3, 4).startWithIterable(Arrays.asList(1, 2)).subscribeOn(scheduler); Observer observer = TestHelper.mockObserver();