@@ -827,6 +827,8 @@ public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>
827
827
@ SchedulerSupport (SchedulerSupport .NONE )
828
828
@ SuppressWarnings ({ "unchecked" , "rawtypes" })
829
829
public static <T > Flowable <T > merge (Publisher <? extends MaybeSource <? extends T >> sources , int maxConcurrency ) {
830
+ ObjectHelper .requireNonNull (sources , "source is null" );
831
+ ObjectHelper .verifyPositive (maxConcurrency , "maxConcurrency" );
830
832
return RxJavaPlugins .onAssembly (new FlowableFlatMapPublisher (sources , MaybeToPublisher .instance (), false , maxConcurrency , Flowable .bufferSize ()));
831
833
}
832
834
@@ -852,6 +854,7 @@ public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>
852
854
@ SchedulerSupport (SchedulerSupport .NONE )
853
855
@ SuppressWarnings ({ "unchecked" , "rawtypes" })
854
856
public static <T > Maybe <T > merge (MaybeSource <? extends MaybeSource <? extends T >> source ) {
857
+ ObjectHelper .requireNonNull (source , "source is null" );
855
858
return RxJavaPlugins .onAssembly (new MaybeFlatten (source , Functions .identity ()));
856
859
}
857
860
@@ -1028,6 +1031,9 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
1028
1031
@ CheckReturnValue
1029
1032
@ SchedulerSupport (SchedulerSupport .NONE )
1030
1033
public static <T > Flowable <T > mergeArrayDelayError (MaybeSource <? extends T >... sources ) {
1034
+ if (sources .length == 0 ) {
1035
+ return Flowable .empty ();
1036
+ }
1031
1037
return Flowable .fromArray (sources ).flatMap ((Function )MaybeToPublisher .instance (), true , sources .length );
1032
1038
}
1033
1039
@@ -1309,6 +1315,9 @@ public static <T> Single<Boolean> sequenceEqual(MaybeSource<? extends T> source1
1309
1315
@ SchedulerSupport (SchedulerSupport .NONE )
1310
1316
public static <T > Single <Boolean > sequenceEqual (MaybeSource <? extends T > source1 , MaybeSource <? extends T > source2 ,
1311
1317
BiPredicate <? super T , ? super T > isEqual ) {
1318
+ ObjectHelper .requireNonNull (source1 , "source1 is null" );
1319
+ ObjectHelper .requireNonNull (source2 , "source2 is null" );
1320
+ ObjectHelper .requireNonNull (isEqual , "isEqual is null" );
1312
1321
return RxJavaPlugins .onAssembly (new MaybeEqualSingle <T >(source1 , source2 , isEqual ));
1313
1322
}
1314
1323
@@ -2281,6 +2290,7 @@ public final Maybe<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
2281
2290
@ SchedulerSupport (SchedulerSupport .NONE )
2282
2291
@ BackpressureSupport (BackpressureKind .UNBOUNDED_IN )
2283
2292
public final <U , V > Maybe <T > delay (Publisher <U > delayIndicator ) {
2293
+ ObjectHelper .requireNonNull (delayIndicator , "delayIndicator is null" );
2284
2294
return RxJavaPlugins .onAssembly (new MaybeDelayOtherPublisher <T , U >(this , delayIndicator ));
2285
2295
}
2286
2296
@@ -2677,6 +2687,8 @@ public final <R> Maybe<R> flatMap(
2677
2687
@ SchedulerSupport (SchedulerSupport .NONE )
2678
2688
public final <U , R > Maybe <R > flatMap (Function <? super T , ? extends MaybeSource <? extends U >> mapper ,
2679
2689
BiFunction <? super T , ? super U , ? extends R > resultSelector ) {
2690
+ ObjectHelper .requireNonNull (mapper , "mapper is null" );
2691
+ ObjectHelper .requireNonNull (resultSelector , "resultSelector is null" );
2680
2692
return RxJavaPlugins .onAssembly (new MaybeFlatMapBiSelector <T , U , R >(this , mapper , resultSelector ));
2681
2693
}
2682
2694
@@ -2704,6 +2716,7 @@ public final <U, R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<?
2704
2716
@ CheckReturnValue
2705
2717
@ SchedulerSupport (SchedulerSupport .NONE )
2706
2718
public final <U > Flowable <U > flattenAsFlowable (final Function <? super T , ? extends Iterable <? extends U >> mapper ) {
2719
+ ObjectHelper .requireNonNull (mapper , "mapper is null" );
2707
2720
return RxJavaPlugins .onAssembly (new MaybeFlatMapIterableFlowable <T , U >(this , mapper ));
2708
2721
}
2709
2722
@@ -2727,6 +2740,7 @@ public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? exten
2727
2740
@ CheckReturnValue
2728
2741
@ SchedulerSupport (SchedulerSupport .NONE )
2729
2742
public final <U > Observable <U > flattenAsObservable (final Function <? super T , ? extends Iterable <? extends U >> mapper ) {
2743
+ ObjectHelper .requireNonNull (mapper , "mapper is null" );
2730
2744
return RxJavaPlugins .onAssembly (new MaybeFlatMapIterableObservable <T , U >(this , mapper ));
2731
2745
}
2732
2746
@@ -3691,6 +3705,9 @@ public final Disposable subscribe(Consumer<? super T> onSuccess, Consumer<? supe
3691
3705
@ SchedulerSupport (SchedulerSupport .NONE )
3692
3706
public final Disposable subscribe (Consumer <? super T > onSuccess , Consumer <? super Throwable > onError ,
3693
3707
Action onComplete ) {
3708
+ ObjectHelper .requireNonNull (onSuccess , "onSuccess is null" );
3709
+ ObjectHelper .requireNonNull (onError , "onError is null" );
3710
+ ObjectHelper .requireNonNull (onComplete , "onComplete is null" );
3694
3711
return subscribeWith (new MaybeCallbackObserver <T >(onSuccess , onError , onComplete ));
3695
3712
}
3696
3713
0 commit comments