Skip to content

Commit b3d7f5f

Browse files
lorenzpahlakarnokd
lorenzpahl
authored and
akarnokd
committed
Make error messages of parameter checks consistent (ReactiveX#6433)
1 parent 0c4f5c1 commit b3d7f5f

File tree

5 files changed

+139
-140
lines changed

5 files changed

+139
-140
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2292,7 +2292,7 @@ public final Disposable subscribe() {
22922292
@SchedulerSupport(SchedulerSupport.NONE)
22932293
@Override
22942294
public final void subscribe(CompletableObserver observer) {
2295-
ObjectHelper.requireNonNull(observer, "s is null");
2295+
ObjectHelper.requireNonNull(observer, "observer is null");
22962296
try {
22972297

22982298
observer = RxJavaPlugins.onSubscribe(this, observer);

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

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,7 +1900,7 @@ public static <T> Flowable<T> empty() {
19001900
@BackpressureSupport(BackpressureKind.PASS_THROUGH)
19011901
@SchedulerSupport(SchedulerSupport.NONE)
19021902
public static <T> Flowable<T> error(Callable<? extends Throwable> supplier) {
1903-
ObjectHelper.requireNonNull(supplier, "errorSupplier is null");
1903+
ObjectHelper.requireNonNull(supplier, "supplier is null");
19041904
return RxJavaPlugins.onAssembly(new FlowableError<T>(supplier));
19051905
}
19061906

@@ -2235,7 +2235,7 @@ public static <T> Flowable<T> fromPublisher(final Publisher<? extends T> source)
22352235
if (source instanceof Flowable) {
22362236
return RxJavaPlugins.onAssembly((Flowable<T>)source);
22372237
}
2238-
ObjectHelper.requireNonNull(source, "publisher is null");
2238+
ObjectHelper.requireNonNull(source, "source is null");
22392239

22402240
return RxJavaPlugins.onAssembly(new FlowableFromPublisher<T>(source));
22412241
}
@@ -2662,8 +2662,8 @@ public static <T> Flowable<T> just(T item) {
26622662
@BackpressureSupport(BackpressureKind.FULL)
26632663
@SchedulerSupport(SchedulerSupport.NONE)
26642664
public static <T> Flowable<T> just(T item1, T item2) {
2665-
ObjectHelper.requireNonNull(item1, "The first item is null");
2666-
ObjectHelper.requireNonNull(item2, "The second item is null");
2665+
ObjectHelper.requireNonNull(item1, "item1 is null");
2666+
ObjectHelper.requireNonNull(item2, "item2 is null");
26672667

26682668
return fromArray(item1, item2);
26692669
}
@@ -2696,9 +2696,9 @@ public static <T> Flowable<T> just(T item1, T item2) {
26962696
@BackpressureSupport(BackpressureKind.FULL)
26972697
@SchedulerSupport(SchedulerSupport.NONE)
26982698
public static <T> Flowable<T> just(T item1, T item2, T item3) {
2699-
ObjectHelper.requireNonNull(item1, "The first item is null");
2700-
ObjectHelper.requireNonNull(item2, "The second item is null");
2701-
ObjectHelper.requireNonNull(item3, "The third item is null");
2699+
ObjectHelper.requireNonNull(item1, "item1 is null");
2700+
ObjectHelper.requireNonNull(item2, "item2 is null");
2701+
ObjectHelper.requireNonNull(item3, "item3 is null");
27022702

27032703
return fromArray(item1, item2, item3);
27042704
}
@@ -2733,10 +2733,10 @@ public static <T> Flowable<T> just(T item1, T item2, T item3) {
27332733
@BackpressureSupport(BackpressureKind.FULL)
27342734
@SchedulerSupport(SchedulerSupport.NONE)
27352735
public static <T> Flowable<T> just(T item1, T item2, T item3, T item4) {
2736-
ObjectHelper.requireNonNull(item1, "The first item is null");
2737-
ObjectHelper.requireNonNull(item2, "The second item is null");
2738-
ObjectHelper.requireNonNull(item3, "The third item is null");
2739-
ObjectHelper.requireNonNull(item4, "The fourth item is null");
2736+
ObjectHelper.requireNonNull(item1, "item1 is null");
2737+
ObjectHelper.requireNonNull(item2, "item2 is null");
2738+
ObjectHelper.requireNonNull(item3, "item3 is null");
2739+
ObjectHelper.requireNonNull(item4, "item4 is null");
27402740

27412741
return fromArray(item1, item2, item3, item4);
27422742
}
@@ -2773,11 +2773,11 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4) {
27732773
@BackpressureSupport(BackpressureKind.FULL)
27742774
@SchedulerSupport(SchedulerSupport.NONE)
27752775
public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5) {
2776-
ObjectHelper.requireNonNull(item1, "The first item is null");
2777-
ObjectHelper.requireNonNull(item2, "The second item is null");
2778-
ObjectHelper.requireNonNull(item3, "The third item is null");
2779-
ObjectHelper.requireNonNull(item4, "The fourth item is null");
2780-
ObjectHelper.requireNonNull(item5, "The fifth item is null");
2776+
ObjectHelper.requireNonNull(item1, "item1 is null");
2777+
ObjectHelper.requireNonNull(item2, "item2 is null");
2778+
ObjectHelper.requireNonNull(item3, "item3 is null");
2779+
ObjectHelper.requireNonNull(item4, "item4 is null");
2780+
ObjectHelper.requireNonNull(item5, "item5 is null");
27812781

27822782
return fromArray(item1, item2, item3, item4, item5);
27832783
}
@@ -2816,12 +2816,12 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5)
28162816
@BackpressureSupport(BackpressureKind.FULL)
28172817
@SchedulerSupport(SchedulerSupport.NONE)
28182818
public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6) {
2819-
ObjectHelper.requireNonNull(item1, "The first item is null");
2820-
ObjectHelper.requireNonNull(item2, "The second item is null");
2821-
ObjectHelper.requireNonNull(item3, "The third item is null");
2822-
ObjectHelper.requireNonNull(item4, "The fourth item is null");
2823-
ObjectHelper.requireNonNull(item5, "The fifth item is null");
2824-
ObjectHelper.requireNonNull(item6, "The sixth item is null");
2819+
ObjectHelper.requireNonNull(item1, "item1 is null");
2820+
ObjectHelper.requireNonNull(item2, "item2 is null");
2821+
ObjectHelper.requireNonNull(item3, "item3 is null");
2822+
ObjectHelper.requireNonNull(item4, "item4 is null");
2823+
ObjectHelper.requireNonNull(item5, "item5 is null");
2824+
ObjectHelper.requireNonNull(item6, "item6 is null");
28252825

28262826
return fromArray(item1, item2, item3, item4, item5, item6);
28272827
}
@@ -2862,13 +2862,13 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
28622862
@BackpressureSupport(BackpressureKind.FULL)
28632863
@SchedulerSupport(SchedulerSupport.NONE)
28642864
public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) {
2865-
ObjectHelper.requireNonNull(item1, "The first item is null");
2866-
ObjectHelper.requireNonNull(item2, "The second item is null");
2867-
ObjectHelper.requireNonNull(item3, "The third item is null");
2868-
ObjectHelper.requireNonNull(item4, "The fourth item is null");
2869-
ObjectHelper.requireNonNull(item5, "The fifth item is null");
2870-
ObjectHelper.requireNonNull(item6, "The sixth item is null");
2871-
ObjectHelper.requireNonNull(item7, "The seventh item is null");
2865+
ObjectHelper.requireNonNull(item1, "item1 is null");
2866+
ObjectHelper.requireNonNull(item2, "item2 is null");
2867+
ObjectHelper.requireNonNull(item3, "item3 is null");
2868+
ObjectHelper.requireNonNull(item4, "item4 is null");
2869+
ObjectHelper.requireNonNull(item5, "item5 is null");
2870+
ObjectHelper.requireNonNull(item6, "item6 is null");
2871+
ObjectHelper.requireNonNull(item7, "item7 is null");
28722872

28732873
return fromArray(item1, item2, item3, item4, item5, item6, item7);
28742874
}
@@ -2911,14 +2911,14 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
29112911
@BackpressureSupport(BackpressureKind.FULL)
29122912
@SchedulerSupport(SchedulerSupport.NONE)
29132913
public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) {
2914-
ObjectHelper.requireNonNull(item1, "The first item is null");
2915-
ObjectHelper.requireNonNull(item2, "The second item is null");
2916-
ObjectHelper.requireNonNull(item3, "The third item is null");
2917-
ObjectHelper.requireNonNull(item4, "The fourth item is null");
2918-
ObjectHelper.requireNonNull(item5, "The fifth item is null");
2919-
ObjectHelper.requireNonNull(item6, "The sixth item is null");
2920-
ObjectHelper.requireNonNull(item7, "The seventh item is null");
2921-
ObjectHelper.requireNonNull(item8, "The eighth item is null");
2914+
ObjectHelper.requireNonNull(item1, "item1 is null");
2915+
ObjectHelper.requireNonNull(item2, "item2 is null");
2916+
ObjectHelper.requireNonNull(item3, "item3 is null");
2917+
ObjectHelper.requireNonNull(item4, "item4 is null");
2918+
ObjectHelper.requireNonNull(item5, "item5 is null");
2919+
ObjectHelper.requireNonNull(item6, "item6 is null");
2920+
ObjectHelper.requireNonNull(item7, "item7 is null");
2921+
ObjectHelper.requireNonNull(item8, "item8 is null");
29222922

29232923
return fromArray(item1, item2, item3, item4, item5, item6, item7, item8);
29242924
}
@@ -2963,15 +2963,15 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
29632963
@BackpressureSupport(BackpressureKind.FULL)
29642964
@SchedulerSupport(SchedulerSupport.NONE)
29652965
public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) {
2966-
ObjectHelper.requireNonNull(item1, "The first item is null");
2967-
ObjectHelper.requireNonNull(item2, "The second item is null");
2968-
ObjectHelper.requireNonNull(item3, "The third item is null");
2969-
ObjectHelper.requireNonNull(item4, "The fourth item is null");
2970-
ObjectHelper.requireNonNull(item5, "The fifth item is null");
2971-
ObjectHelper.requireNonNull(item6, "The sixth item is null");
2972-
ObjectHelper.requireNonNull(item7, "The seventh item is null");
2973-
ObjectHelper.requireNonNull(item8, "The eighth item is null");
2974-
ObjectHelper.requireNonNull(item9, "The ninth is null");
2966+
ObjectHelper.requireNonNull(item1, "item1 is null");
2967+
ObjectHelper.requireNonNull(item2, "item2 is null");
2968+
ObjectHelper.requireNonNull(item3, "item3 is null");
2969+
ObjectHelper.requireNonNull(item4, "item4 is null");
2970+
ObjectHelper.requireNonNull(item5, "item5 is null");
2971+
ObjectHelper.requireNonNull(item6, "item6 is null");
2972+
ObjectHelper.requireNonNull(item7, "item7 is null");
2973+
ObjectHelper.requireNonNull(item8, "item8 is null");
2974+
ObjectHelper.requireNonNull(item9, "item9 is null");
29752975

29762976
return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9);
29772977
}
@@ -3018,16 +3018,16 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
30183018
@BackpressureSupport(BackpressureKind.FULL)
30193019
@SchedulerSupport(SchedulerSupport.NONE)
30203020
public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) {
3021-
ObjectHelper.requireNonNull(item1, "The first item is null");
3022-
ObjectHelper.requireNonNull(item2, "The second item is null");
3023-
ObjectHelper.requireNonNull(item3, "The third item is null");
3024-
ObjectHelper.requireNonNull(item4, "The fourth item is null");
3025-
ObjectHelper.requireNonNull(item5, "The fifth item is null");
3026-
ObjectHelper.requireNonNull(item6, "The sixth item is null");
3027-
ObjectHelper.requireNonNull(item7, "The seventh item is null");
3028-
ObjectHelper.requireNonNull(item8, "The eighth item is null");
3029-
ObjectHelper.requireNonNull(item9, "The ninth item is null");
3030-
ObjectHelper.requireNonNull(item10, "The tenth item is null");
3021+
ObjectHelper.requireNonNull(item1, "item1 is null");
3022+
ObjectHelper.requireNonNull(item2, "item2 is null");
3023+
ObjectHelper.requireNonNull(item3, "item3 is null");
3024+
ObjectHelper.requireNonNull(item4, "item4 is null");
3025+
ObjectHelper.requireNonNull(item5, "item5 is null");
3026+
ObjectHelper.requireNonNull(item6, "item6 is null");
3027+
ObjectHelper.requireNonNull(item7, "item7 is null");
3028+
ObjectHelper.requireNonNull(item8, "item8 is null");
3029+
ObjectHelper.requireNonNull(item9, "item9 is null");
3030+
ObjectHelper.requireNonNull(item10, "item10 is null");
30313031

30323032
return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9, item10);
30333033
}
@@ -4485,7 +4485,7 @@ public static <T, D> Flowable<T> using(Callable<? extends D> resourceSupplier,
44854485
Consumer<? super D> resourceDisposer, boolean eager) {
44864486
ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null");
44874487
ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null");
4488-
ObjectHelper.requireNonNull(resourceDisposer, "disposer is null");
4488+
ObjectHelper.requireNonNull(resourceDisposer, "resourceDisposer is null");
44894489
return RxJavaPlugins.onAssembly(new FlowableUsing<T, D>(resourceSupplier, sourceSupplier, resourceDisposer, eager));
44904490
}
44914491

@@ -8338,7 +8338,7 @@ public final Flowable<T> debounce(long timeout, TimeUnit unit, Scheduler schedul
83388338
@BackpressureSupport(BackpressureKind.FULL)
83398339
@SchedulerSupport(SchedulerSupport.NONE)
83408340
public final Flowable<T> defaultIfEmpty(T defaultItem) {
8341-
ObjectHelper.requireNonNull(defaultItem, "item is null");
8341+
ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
83428342
return switchIfEmpty(just(defaultItem));
83438343
}
83448344

@@ -9167,7 +9167,7 @@ private Flowable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Throwa
91679167
@BackpressureSupport(BackpressureKind.PASS_THROUGH)
91689168
@SchedulerSupport(SchedulerSupport.NONE)
91699169
public final Flowable<T> doOnEach(final Consumer<? super Notification<T>> onNotification) {
9170-
ObjectHelper.requireNonNull(onNotification, "consumer is null");
9170+
ObjectHelper.requireNonNull(onNotification, "onNotification is null");
91719171
return doOnEach(
91729172
Functions.notificationOnNext(onNotification),
91739173
Functions.notificationOnError(onNotification),
@@ -11769,7 +11769,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
1176911769
@BackpressureSupport(BackpressureKind.SPECIAL)
1177011770
@SchedulerSupport(SchedulerSupport.NONE)
1177111771
public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError, boolean unbounded) {
11772-
ObjectHelper.verifyPositive(capacity, "bufferSize");
11772+
ObjectHelper.verifyPositive(capacity, "capacity");
1177311773
return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<T>(this, capacity, unbounded, delayError, Functions.EMPTY_ACTION));
1177411774
}
1177511775

@@ -11877,7 +11877,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, Action onOverflow) {
1187711877
@BackpressureSupport(BackpressureKind.SPECIAL)
1187811878
@SchedulerSupport(SchedulerSupport.NONE)
1187911879
public final Flowable<T> onBackpressureBuffer(long capacity, Action onOverflow, BackpressureOverflowStrategy overflowStrategy) {
11880-
ObjectHelper.requireNonNull(overflowStrategy, "strategy is null");
11880+
ObjectHelper.requireNonNull(overflowStrategy, "overflowStrategy is null");
1188111881
ObjectHelper.verifyPositive(capacity, "capacity");
1188211882
return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy<T>(this, capacity, onOverflow, overflowStrategy));
1188311883
}
@@ -13882,7 +13882,7 @@ public final Flowable<T> scan(BiFunction<T, T, T> accumulator) {
1388213882
@BackpressureSupport(BackpressureKind.FULL)
1388313883
@SchedulerSupport(SchedulerSupport.NONE)
1388413884
public final <R> Flowable<R> scan(final R initialValue, BiFunction<R, ? super T, R> accumulator) {
13885-
ObjectHelper.requireNonNull(initialValue, "seed is null");
13885+
ObjectHelper.requireNonNull(initialValue, "initialValue is null");
1388613886
return scanWith(Functions.justCallable(initialValue), accumulator);
1388713887
}
1388813888

@@ -14562,7 +14562,7 @@ public final Flowable<T> startWith(Publisher<? extends T> other) {
1456214562
@BackpressureSupport(BackpressureKind.FULL)
1456314563
@SchedulerSupport(SchedulerSupport.NONE)
1456414564
public final Flowable<T> startWith(T value) {
14565-
ObjectHelper.requireNonNull(value, "item is null");
14565+
ObjectHelper.requireNonNull(value, "value is null");
1456614566
return concatArray(just(value), this);
1456714567
}
1456814568

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2533,7 +2533,7 @@ public final Single<Long> count() {
25332533
@NonNull
25342534
@SchedulerSupport(SchedulerSupport.NONE)
25352535
public final Maybe<T> defaultIfEmpty(T defaultItem) {
2536-
ObjectHelper.requireNonNull(defaultItem, "item is null");
2536+
ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
25372537
return switchIfEmpty(just(defaultItem));
25382538
}
25392539

@@ -2709,7 +2709,7 @@ public final Maybe<T> delaySubscription(long delay, TimeUnit unit, Scheduler sch
27092709
@NonNull
27102710
@SchedulerSupport(SchedulerSupport.NONE)
27112711
public final Maybe<T> doAfterSuccess(Consumer<? super T> onAfterSuccess) {
2712-
ObjectHelper.requireNonNull(onAfterSuccess, "doAfterSuccess is null");
2712+
ObjectHelper.requireNonNull(onAfterSuccess, "onAfterSuccess is null");
27132713
return RxJavaPlugins.onAssembly(new MaybeDoAfterSuccess<T>(this, onAfterSuccess));
27142714
}
27152715

@@ -2937,7 +2937,7 @@ public final Maybe<T> doOnTerminate(final Action onTerminate) {
29372937
public final Maybe<T> doOnSuccess(Consumer<? super T> onSuccess) {
29382938
return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
29392939
Functions.emptyConsumer(), // onSubscribe
2940-
ObjectHelper.requireNonNull(onSuccess, "onSubscribe is null"),
2940+
ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"),
29412941
Functions.emptyConsumer(), // onError
29422942
Functions.EMPTY_ACTION, // onComplete
29432943
Functions.EMPTY_ACTION, // (onSuccess | onError | onComplete)
@@ -3452,7 +3452,7 @@ public final Single<Boolean> isEmpty() {
34523452
@NonNull
34533453
@SchedulerSupport(SchedulerSupport.NONE)
34543454
public final <R> Maybe<R> lift(final MaybeOperator<? extends R, ? super T> lift) {
3455-
ObjectHelper.requireNonNull(lift, "onLift is null");
3455+
ObjectHelper.requireNonNull(lift, "lift is null");
34563456
return RxJavaPlugins.onAssembly(new MaybeLift<T, R>(this, lift));
34573457
}
34583458

@@ -4512,7 +4512,7 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit) {
45124512
@NonNull
45134513
@SchedulerSupport(SchedulerSupport.COMPUTATION)
45144514
public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, MaybeSource<? extends T> fallback) {
4515-
ObjectHelper.requireNonNull(fallback, "other is null");
4515+
ObjectHelper.requireNonNull(fallback, "fallback is null");
45164516
return timeout(timeout, timeUnit, Schedulers.computation(), fallback);
45174517
}
45184518

0 commit comments

Comments
 (0)