Skip to content

2.x: fixes, cleanups, renames #4421

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 2 commits into from
Aug 24, 2016
Merged

2.x: fixes, cleanups, renames #4421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b05aa63
2.x: fixes, cleanups, renames
akarnokd Aug 24, 2016
8dd5763
Rename a few more parameters
akarnokd Aug 24, 2016
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
Prev Previous commit
Rename a few more parameters
  • Loading branch information
@akarnokd
akarnokd committed Aug 24, 2016
commit 8dd5763ddd4efb609c729467cc54993949080536
12 changes: 6 additions & 6 deletions src/main/java/io/reactivex/Flowable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11416,7 +11416,7 @@ public final Flowable<T> sorted(Comparator<? super T> sortFunction) {
* <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param values
* @param items
* an Iterable that contains the items you want the modified Publisher to emit first
* @return a Flowable that emits the items in the specified {@link Iterable} and then emits the items
* emitted by the source Publisher
Expand All @@ -11425,8 +11425,8 @@ public final Flowable<T> sorted(Comparator<? super T> sortFunction) {
@SuppressWarnings("unchecked")
@BackpressureSupport(BackpressureKind.FULL)
@SchedulerSupport(SchedulerSupport.NONE)
public final Flowable<T> startWith(Iterable<? extends T> values) {
return concatArray(fromIterable(values), this);
public final Flowable<T> startWith(Iterable<? extends T> items) {
return concatArray(fromIterable(items), this);
}

/**
Expand Down Expand Up @@ -11499,7 +11499,7 @@ public final Flowable<T> startWith(T value) {
* <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param values
* @param items
* the array of values to emit first
* @return a Flowable that emits the specified items before it begins to emit items emitted by the source
* Publisher
Expand All @@ -11508,8 +11508,8 @@ public final Flowable<T> startWith(T value) {
@SuppressWarnings("unchecked")
@BackpressureSupport(BackpressureKind.FULL)
@SchedulerSupport(SchedulerSupport.NONE)
public final Flowable<T> startWithArray(T... values) {
Flowable<T> fromArray = fromArray(values);
public final Flowable<T> startWithArray(T... items) {
Flowable<T> fromArray = fromArray(items);
if (fromArray == empty()) {
return RxJavaPlugins.onAssembly(this);
}
Expand Down
150 changes: 75 additions & 75 deletions src/main/java/io/reactivex/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,23 +1339,23 @@ public static <T> Observable<T> error(final Throwable exception) {
* <dd>{@code from} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param values
* @param items
* the array of elements
* @param <T>
* the type of items in the Array and the type of items to be emitted by the resulting ObservableSource
* @return a Observable that emits each item in the source Array
* @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
*/
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> fromArray(T... values) {
ObjectHelper.requireNonNull(values, "values is null");
if (values.length == 0) {
public static <T> Observable<T> fromArray(T... items) {
ObjectHelper.requireNonNull(items, "items is null");
if (items.length == 0) {
return empty();
} else
if (values.length == 1) {
return just(values[0]);
if (items.length == 1) {
return just(items[0]);
}
return RxJavaPlugins.onAssembly(new ObservableFromArray<T>(values));
return RxJavaPlugins.onAssembly(new ObservableFromArray<T>(items));
}

/**
Expand Down Expand Up @@ -1873,17 +1873,17 @@ public static Observable<Long> intervalRange(long start, long count, long initia
* <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param value
* @param item
* the item to emit
* @param <T>
* the type of that item
* @return a Observable that emits {@code value} as a single item and then completes
* @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
*/
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T value) {
ObjectHelper.requireNonNull(value, "The value is null");
return RxJavaPlugins.onAssembly(new ObservableJust<T>(value));
public static <T> Observable<T> just(T item) {
ObjectHelper.requireNonNull(item, "The item is null");
return RxJavaPlugins.onAssembly(new ObservableJust<T>(item));
}

/**
Expand All @@ -1907,8 +1907,8 @@ public static <T> Observable<T> just(T value) {
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");

return fromArray(item1, item2);
}
Expand Down Expand Up @@ -1936,9 +1936,9 @@ public static <T> Observable<T> just(T item1, T item2) {
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2, T item3) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item3, "The third value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");
ObjectHelper.requireNonNull(item3, "The third item is null");

return fromArray(item1, item2, item3);
}
Expand Down Expand Up @@ -1968,10 +1968,10 @@ public static <T> Observable<T> just(T item1, T item2, T item3) {
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2, T item3, T item4) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item3, "The third value is null");
ObjectHelper.requireNonNull(item4, "The fourth value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");
ObjectHelper.requireNonNull(item3, "The third item is null");
ObjectHelper.requireNonNull(item4, "The fourth item is null");

return fromArray(item1, item2, item3, item4);
}
Expand Down Expand Up @@ -2003,11 +2003,11 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4) {
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item3, "The third value is null");
ObjectHelper.requireNonNull(item4, "The fourth value is null");
ObjectHelper.requireNonNull(item5, "The fifth value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");
ObjectHelper.requireNonNull(item3, "The third item is null");
ObjectHelper.requireNonNull(item4, "The fourth item is null");
ObjectHelper.requireNonNull(item5, "The fifth item is null");

return fromArray(item1, item2, item3, item4, item5);
}
Expand Down Expand Up @@ -2041,12 +2041,12 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item3, "The third value is null");
ObjectHelper.requireNonNull(item4, "The fourth value is null");
ObjectHelper.requireNonNull(item5, "The fifth value is null");
ObjectHelper.requireNonNull(item6, "The sixth value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");
ObjectHelper.requireNonNull(item3, "The third item is null");
ObjectHelper.requireNonNull(item4, "The fourth item is null");
ObjectHelper.requireNonNull(item5, "The fifth item is null");
ObjectHelper.requireNonNull(item6, "The sixth item is null");

return fromArray(item1, item2, item3, item4, item5, item6);
}
Expand Down Expand Up @@ -2082,13 +2082,13 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item3, "The third value is null");
ObjectHelper.requireNonNull(item4, "The fourth value is null");
ObjectHelper.requireNonNull(item5, "The fifth value is null");
ObjectHelper.requireNonNull(item6, "The sixth value is null");
ObjectHelper.requireNonNull(item7, "The seventh value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");
ObjectHelper.requireNonNull(item3, "The third item is null");
ObjectHelper.requireNonNull(item4, "The fourth item is null");
ObjectHelper.requireNonNull(item5, "The fifth item is null");
ObjectHelper.requireNonNull(item6, "The sixth item is null");
ObjectHelper.requireNonNull(item7, "The seventh item is null");

return fromArray(item1, item2, item3, item4, item5, item6, item7);
}
Expand Down Expand Up @@ -2126,14 +2126,14 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item3, "The third value is null");
ObjectHelper.requireNonNull(item4, "The fourth value is null");
ObjectHelper.requireNonNull(item5, "The fifth value is null");
ObjectHelper.requireNonNull(item6, "The sixth value is null");
ObjectHelper.requireNonNull(item7, "The seventh value is null");
ObjectHelper.requireNonNull(item8, "The eighth value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");
ObjectHelper.requireNonNull(item3, "The third item is null");
ObjectHelper.requireNonNull(item4, "The fourth item is null");
ObjectHelper.requireNonNull(item5, "The fifth item is null");
ObjectHelper.requireNonNull(item6, "The sixth item is null");
ObjectHelper.requireNonNull(item7, "The seventh item is null");
ObjectHelper.requireNonNull(item8, "The eighth item is null");

return fromArray(item1, item2, item3, item4, item5, item6, item7, item8);
}
Expand Down Expand Up @@ -2173,15 +2173,15 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item3, "The third value is null");
ObjectHelper.requireNonNull(item4, "The fourth value is null");
ObjectHelper.requireNonNull(item5, "The fifth value is null");
ObjectHelper.requireNonNull(item6, "The sixth value is null");
ObjectHelper.requireNonNull(item7, "The seventh value is null");
ObjectHelper.requireNonNull(item8, "The eighth value is null");
ObjectHelper.requireNonNull(item9, "The ninth value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");
ObjectHelper.requireNonNull(item3, "The third item is null");
ObjectHelper.requireNonNull(item4, "The fourth item is null");
ObjectHelper.requireNonNull(item5, "The fifth item is null");
ObjectHelper.requireNonNull(item6, "The sixth item is null");
ObjectHelper.requireNonNull(item7, "The seventh item is null");
ObjectHelper.requireNonNull(item8, "The eighth item is null");
ObjectHelper.requireNonNull(item9, "The ninth item is null");

return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9);
}
Expand Down Expand Up @@ -2223,16 +2223,16 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) {
ObjectHelper.requireNonNull(item1, "The first value is null");
ObjectHelper.requireNonNull(item2, "The second value is null");
ObjectHelper.requireNonNull(item3, "The third value is null");
ObjectHelper.requireNonNull(item4, "The fourth value is null");
ObjectHelper.requireNonNull(item5, "The fifth value is null");
ObjectHelper.requireNonNull(item6, "The sixth value is null");
ObjectHelper.requireNonNull(item7, "The seventh value is null");
ObjectHelper.requireNonNull(item8, "The eighth value is null");
ObjectHelper.requireNonNull(item9, "The ninth value is null");
ObjectHelper.requireNonNull(item10, "The tenth value is null");
ObjectHelper.requireNonNull(item1, "The first item is null");
ObjectHelper.requireNonNull(item2, "The second item is null");
ObjectHelper.requireNonNull(item3, "The third item is null");
ObjectHelper.requireNonNull(item4, "The fourth item is null");
ObjectHelper.requireNonNull(item5, "The fifth item is null");
ObjectHelper.requireNonNull(item6, "The sixth item is null");
ObjectHelper.requireNonNull(item7, "The seventh item is null");
ObjectHelper.requireNonNull(item8, "The eighth item is null");
ObjectHelper.requireNonNull(item9, "The ninth item is null");
ObjectHelper.requireNonNull(item10, "The tenth item is null");

return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9, item10);
}
Expand Down Expand Up @@ -9648,16 +9648,16 @@ public final Observable<T> sorted(Comparator<? super T> sortFunction) {
* <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param values
* @param items
* an Iterable that contains the items you want the modified ObservableSource to emit first
* @return a Observable that emits the items in the specified {@link Iterable} and then emits the items
* emitted by the source ObservableSource
* @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
*/
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public final Observable<T> startWith(Iterable<? extends T> values) {
return concatArray(fromIterable(values), this);
public final Observable<T> startWith(Iterable<? extends T> items) {
return concatArray(fromIterable(items), this);
}

/**
Expand Down Expand Up @@ -9693,17 +9693,17 @@ public final Observable<T> startWith(ObservableSource<? extends T> other) {
* <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param value
* @param item
* the item to emit first
* @return a Observable that emits the specified item before it begins to emit items emitted by the source
* ObservableSource
* @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
*/
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public final Observable<T> startWith(T value) {
ObjectHelper.requireNonNull(value, "value is null");
return concatArray(just(value), this);
public final Observable<T> startWith(T item) {
ObjectHelper.requireNonNull(item, "item is null");
return concatArray(just(item), this);
}

/**
Expand All @@ -9716,16 +9716,16 @@ public final Observable<T> startWith(T value) {
* <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param values
* @param items
* the array of values to emit first
* @return a Observable that emits the specified items before it begins to emit items emitted by the source
* ObservableSource
* @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
*/
@SuppressWarnings("unchecked")
@SchedulerSupport(SchedulerSupport.NONE)
public final Observable<T> startWithArray(T... values) {
Observable<T> fromArray = fromArray(values);
public final Observable<T> startWithArray(T... items) {
Observable<T> fromArray = fromArray(items);
if (fromArray == empty()) {
return RxJavaPlugins.onAssembly(this);
}
Expand Down