diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java index 06183c66db..f25320d66b 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Completable.java +++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java @@ -12,6 +12,7 @@ */ package io.reactivex.rxjava3.core; +import java.util.Objects; import java.util.concurrent.*; import org.reactivestreams.Publisher; @@ -120,7 +121,7 @@ public abstract class Completable implements CompletableSource { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable ambArray(final CompletableSource... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return complete(); } @@ -149,7 +150,7 @@ public static Completable ambArray(final CompletableSource... sources) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable amb(final Iterable sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new CompletableAmb(null, sources)); } @@ -187,7 +188,7 @@ public static Completable complete() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable concatArray(CompletableSource... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return complete(); } else @@ -213,7 +214,7 @@ public static Completable concatArray(CompletableSource... sources) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable concat(Iterable sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new CompletableConcatIterable(sources)); } @@ -261,7 +262,7 @@ public static Completable concat(Publisher sources) @SchedulerSupport(SchedulerSupport.NONE) @BackpressureSupport(BackpressureKind.FULL) public static Completable concat(Publisher sources, int prefetch) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new CompletableConcat(sources, prefetch)); } @@ -311,7 +312,7 @@ public static Completable concat(Publisher sources, @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable create(CompletableOnSubscribe source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return RxJavaPlugins.onAssembly(new CompletableCreate(source)); } @@ -334,7 +335,7 @@ public static Completable create(CompletableOnSubscribe source) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable unsafeCreate(CompletableSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); if (source instanceof Completable) { throw new IllegalArgumentException("Use of unsafeCreate(Completable)!"); } @@ -356,7 +357,7 @@ public static Completable unsafeCreate(CompletableSource source) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable defer(final Supplier completableSupplier) { - ObjectHelper.requireNonNull(completableSupplier, "completableSupplier"); + Objects.requireNonNull(completableSupplier, "completableSupplier"); return RxJavaPlugins.onAssembly(new CompletableDefer(completableSupplier)); } @@ -380,7 +381,7 @@ public static Completable defer(final Supplier comp @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable error(final Supplier errorSupplier) { - ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); + Objects.requireNonNull(errorSupplier, "errorSupplier is null"); return RxJavaPlugins.onAssembly(new CompletableErrorSupplier(errorSupplier)); } @@ -400,7 +401,7 @@ public static Completable error(final Supplier errorSupplie @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable error(final Throwable error) { - ObjectHelper.requireNonNull(error, "error is null"); + Objects.requireNonNull(error, "error is null"); return RxJavaPlugins.onAssembly(new CompletableError(error)); } @@ -428,7 +429,7 @@ public static Completable error(final Throwable error) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromAction(final Action run) { - ObjectHelper.requireNonNull(run, "run is null"); + Objects.requireNonNull(run, "run is null"); return RxJavaPlugins.onAssembly(new CompletableFromAction(run)); } @@ -457,7 +458,7 @@ public static Completable fromAction(final Action run) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromCallable(final Callable callable) { - ObjectHelper.requireNonNull(callable, "callable is null"); + Objects.requireNonNull(callable, "callable is null"); return RxJavaPlugins.onAssembly(new CompletableFromCallable(callable)); } @@ -478,7 +479,7 @@ public static Completable fromCallable(final Callable callable) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromFuture(final Future future) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return fromAction(Functions.futureAction(future)); } @@ -503,7 +504,7 @@ public static Completable fromFuture(final Future future) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromMaybe(final MaybeSource maybe) { - ObjectHelper.requireNonNull(maybe, "maybe is null"); + Objects.requireNonNull(maybe, "maybe is null"); return RxJavaPlugins.onAssembly(new MaybeIgnoreElementCompletable(maybe)); } @@ -531,7 +532,7 @@ public static Completable fromMaybe(final MaybeSource maybe) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromRunnable(final Runnable run) { - ObjectHelper.requireNonNull(run, "run is null"); + Objects.requireNonNull(run, "run is null"); return RxJavaPlugins.onAssembly(new CompletableFromRunnable(run)); } @@ -553,7 +554,7 @@ public static Completable fromRunnable(final Runnable run) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromObservable(final ObservableSource observable) { - ObjectHelper.requireNonNull(observable, "observable is null"); + Objects.requireNonNull(observable, "observable is null"); return RxJavaPlugins.onAssembly(new CompletableFromObservable(observable)); } @@ -591,7 +592,7 @@ public static Completable fromObservable(final ObservableSource observabl @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromPublisher(final Publisher publisher) { - ObjectHelper.requireNonNull(publisher, "publisher is null"); + Objects.requireNonNull(publisher, "publisher is null"); return RxJavaPlugins.onAssembly(new CompletableFromPublisher(publisher)); } @@ -613,7 +614,7 @@ public static Completable fromPublisher(final Publisher publisher) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromSingle(final SingleSource single) { - ObjectHelper.requireNonNull(single, "single is null"); + Objects.requireNonNull(single, "single is null"); return RxJavaPlugins.onAssembly(new CompletableFromSingle(single)); } @@ -643,7 +644,7 @@ public static Completable fromSingle(final SingleSource single) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable fromSupplier(final Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new CompletableFromSupplier(supplier)); } @@ -678,7 +679,7 @@ public static Completable fromSupplier(final Supplier supplier) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable mergeArray(CompletableSource... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return complete(); } else @@ -719,7 +720,7 @@ public static Completable mergeArray(CompletableSource... sources) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable merge(Iterable sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new CompletableMergeIterable(sources)); } @@ -822,7 +823,7 @@ public static Completable merge(Publisher sources, @SchedulerSupport(SchedulerSupport.NONE) @BackpressureSupport(BackpressureKind.FULL) private static Completable merge0(Publisher sources, int maxConcurrency, boolean delayErrors) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return RxJavaPlugins.onAssembly(new CompletableMerge(sources, maxConcurrency, delayErrors)); } @@ -845,7 +846,7 @@ private static Completable merge0(Publisher sources @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable mergeArrayDelayError(CompletableSource... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorArray(sources)); } @@ -867,7 +868,7 @@ public static Completable mergeArrayDelayError(CompletableSource... sources) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable mergeDelayError(Iterable sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorIterable(sources)); } @@ -973,8 +974,8 @@ public static Completable timer(long delay, TimeUnit unit) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public static Completable timer(final long delay, final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new CompletableTimer(delay, unit, scheduler)); } @@ -1047,9 +1048,9 @@ public static Completable using( final Function completableFunction, final Consumer disposer, final boolean eager) { - ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); - ObjectHelper.requireNonNull(completableFunction, "completableFunction is null"); - ObjectHelper.requireNonNull(disposer, "disposer is null"); + Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); + Objects.requireNonNull(completableFunction, "completableFunction is null"); + Objects.requireNonNull(disposer, "disposer is null"); return RxJavaPlugins.onAssembly(new CompletableUsing(resourceSupplier, completableFunction, disposer, eager)); } @@ -1071,7 +1072,7 @@ public static Completable using( @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Completable wrap(CompletableSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); if (source instanceof Completable) { return RxJavaPlugins.onAssembly((Completable)source); } @@ -1096,7 +1097,7 @@ public static Completable wrap(CompletableSource source) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable ambWith(CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return ambArray(this, other); } @@ -1120,7 +1121,7 @@ public final Completable ambWith(CompletableSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Observable andThen(ObservableSource next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return RxJavaPlugins.onAssembly(new CompletableAndThenObservable(this, next)); } @@ -1148,7 +1149,7 @@ public final Observable andThen(ObservableSource next) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable andThen(Publisher next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return RxJavaPlugins.onAssembly(new CompletableAndThenPublisher(this, next)); } @@ -1172,7 +1173,7 @@ public final Flowable andThen(Publisher next) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single andThen(SingleSource next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable(next, this)); } @@ -1196,7 +1197,7 @@ public final Single andThen(SingleSource next) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe andThen(MaybeSource next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return RxJavaPlugins.onAssembly(new MaybeDelayWithCompletable(next, this)); } @@ -1218,7 +1219,7 @@ public final Maybe andThen(MaybeSource next) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Completable andThen(CompletableSource next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return RxJavaPlugins.onAssembly(new CompletableAndThenCompletable(this, next)); } @@ -1267,7 +1268,7 @@ public final void blockingAwait() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final boolean blockingAwait(long timeout, TimeUnit unit) { - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(unit, "unit is null"); BlockingMultiObserver observer = new BlockingMultiObserver(); subscribe(observer); return observer.blockingAwait(timeout, unit); @@ -1312,7 +1313,7 @@ public final Completable cache() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Completable compose(CompletableTransformer transformer) { - return wrap(ObjectHelper.requireNonNull(transformer, "transformer is null").apply(this)); + return wrap(Objects.requireNonNull(transformer, "transformer is null").apply(this)); } /** @@ -1335,7 +1336,7 @@ public final Completable compose(CompletableTransformer transformer) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable concatWith(CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new CompletableAndThenCompletable(this, other)); } @@ -1399,8 +1400,8 @@ public final Completable delay(long delay, TimeUnit unit, Scheduler scheduler) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Completable delay(final long delay, final TimeUnit unit, final Scheduler scheduler, final boolean delayError) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new CompletableDelay(this, delay, unit, scheduler, delayError)); } @@ -1530,7 +1531,7 @@ public final Completable doOnError(Consumer onError) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable doOnEvent(final Consumer onEvent) { - ObjectHelper.requireNonNull(onEvent, "onEvent is null"); + Objects.requireNonNull(onEvent, "onEvent is null"); return RxJavaPlugins.onAssembly(new CompletableDoOnEvent(this, onEvent)); } @@ -1558,12 +1559,12 @@ private Completable doOnLifecycle( final Action onTerminate, final Action onAfterTerminate, final Action onDispose) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - ObjectHelper.requireNonNull(onTerminate, "onTerminate is null"); - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); - ObjectHelper.requireNonNull(onDispose, "onDispose is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onTerminate, "onTerminate is null"); + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); + Objects.requireNonNull(onDispose, "onDispose is null"); return RxJavaPlugins.onAssembly(new CompletablePeek(this, onSubscribe, onError, onComplete, onTerminate, onAfterTerminate, onDispose)); } @@ -1657,7 +1658,7 @@ public final Completable doAfterTerminate(final Action onAfterTerminate) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable doFinally(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "onFinally is null"); + Objects.requireNonNull(onFinally, "onFinally is null"); return RxJavaPlugins.onAssembly(new CompletableDoFinally(this, onFinally)); } @@ -1795,7 +1796,7 @@ public final Completable doFinally(Action onFinally) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable lift(final CompletableOperator onLift) { - ObjectHelper.requireNonNull(onLift, "onLift is null"); + Objects.requireNonNull(onLift, "onLift is null"); return RxJavaPlugins.onAssembly(new CompletableLift(this, onLift)); } @@ -1837,7 +1838,7 @@ public final Single> materialize() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable mergeWith(CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return mergeArray(this, other); } @@ -1857,7 +1858,7 @@ public final Completable mergeWith(CompletableSource other) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Completable observeOn(final Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new CompletableObserveOn(this, scheduler)); } @@ -1895,7 +1896,7 @@ public final Completable onErrorComplete() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable onErrorComplete(final Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new CompletableOnErrorComplete(this, predicate)); } @@ -1918,7 +1919,7 @@ public final Completable onErrorComplete(final Predicate pred @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable onErrorResumeNext(final Function errorMapper) { - ObjectHelper.requireNonNull(errorMapper, "errorMapper is null"); + Objects.requireNonNull(errorMapper, "errorMapper is null"); return RxJavaPlugins.onAssembly(new CompletableResumeNext(this, errorMapper)); } @@ -2177,7 +2178,7 @@ public final Completable retryWhen(Function, ? exten @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Completable startWith(CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return concatArray(other, this); } @@ -2199,7 +2200,7 @@ public final Completable startWith(CompletableSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Observable startWith(Observable other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return other.concatWith(this.toObservable()); } /** @@ -2224,7 +2225,7 @@ public final Observable startWith(Observable other) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable startWith(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return this.toFlowable().startWith(other); } @@ -2269,12 +2270,12 @@ public final Disposable subscribe() { @SchedulerSupport(SchedulerSupport.NONE) @Override public final void subscribe(CompletableObserver observer) { - ObjectHelper.requireNonNull(observer, "observer is null"); + Objects.requireNonNull(observer, "observer is null"); try { observer = RxJavaPlugins.onSubscribe(this, observer); - ObjectHelper.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null CompletableObserver. Please check the handler provided to RxJavaPlugins.setOnCompletableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); + Objects.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null CompletableObserver. Please check the handler provided to RxJavaPlugins.setOnCompletableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); subscribeActual(observer); } catch (NullPointerException ex) { // NOPMD @@ -2346,8 +2347,8 @@ public final E subscribeWith(E observer) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Disposable subscribe(final Action onComplete, final Consumer onError) { - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); CallbackCompletableObserver observer = new CallbackCompletableObserver(onError, onComplete); subscribe(observer); @@ -2374,7 +2375,7 @@ public final Disposable subscribe(final Action onComplete, final Consumer R to(@NonNull CompletableConverter converter) { - return ObjectHelper.requireNonNull(converter, "converter is null").apply(this); + return Objects.requireNonNull(converter, "converter is null").apply(this); } /** @@ -2658,7 +2659,7 @@ public final Observable toObservable() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single toSingle(final Supplier completionValueSupplier) { - ObjectHelper.requireNonNull(completionValueSupplier, "completionValueSupplier is null"); + Objects.requireNonNull(completionValueSupplier, "completionValueSupplier is null"); return RxJavaPlugins.onAssembly(new CompletableToSingle(this, completionValueSupplier, null)); } @@ -2680,7 +2681,7 @@ public final Single toSingle(final Supplier completionValueS @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single toSingleDefault(final T completionValue) { - ObjectHelper.requireNonNull(completionValue, "completionValue is null"); + Objects.requireNonNull(completionValue, "completionValue is null"); return RxJavaPlugins.onAssembly(new CompletableToSingle(this, null, completionValue)); } @@ -2701,7 +2702,7 @@ public final Single toSingleDefault(final T completionValue) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Completable unsubscribeOn(final Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new CompletableDisposeOn(this, scheduler)); } // ------------------------------------------------------------------------- diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java index 3fed4742e2..514845efbc 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java +++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java @@ -184,7 +184,7 @@ public abstract class Flowable implements Publisher { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable amb(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new FlowableAmb(null, sources)); } @@ -215,7 +215,7 @@ public static Flowable amb(Iterable> sou @SchedulerSupport(SchedulerSupport.NONE) @SafeVarargs public static Flowable ambArray(Publisher... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); int len = sources.length; if (len == 0) { return empty(); @@ -324,11 +324,11 @@ public static Flowable combineLatestArray(Publisher[] sou @NonNull @BackpressureSupport(BackpressureKind.FULL) public static Flowable combineLatestArray(Publisher[] sources, Function combiner, int bufferSize) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return empty(); } - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableCombineLatest(sources, combiner, bufferSize, false)); } @@ -423,8 +423,8 @@ public static Flowable combineLatest(Iterable Flowable combineLatest(Iterable> sources, Function combiner, int bufferSize) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableCombineLatest(sources, combiner, bufferSize, false)); } @@ -520,8 +520,8 @@ public static Flowable combineLatestDelayError(Publisher[ @BackpressureSupport(BackpressureKind.FULL) public static Flowable combineLatestDelayError(Publisher[] sources, Function combiner, int bufferSize) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); if (sources.length == 0) { return empty(); @@ -620,8 +620,8 @@ public static Flowable combineLatestDelayError(Iterable Flowable combineLatestDelayError(Iterable> sources, Function combiner, int bufferSize) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableCombineLatest(sources, combiner, bufferSize, true)); } @@ -665,8 +665,8 @@ public static Flowable combineLatestDelayError(Iterable Flowable combineLatest( Publisher source1, Publisher source2, BiFunction combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return combineLatestArray(new Publisher[] { source1, source2 }, Functions.toFunction(combiner), bufferSize()); } @@ -714,9 +714,9 @@ public static Flowable combineLatest( Publisher source1, Publisher source2, Publisher source3, Function3 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return combineLatestArray(new Publisher[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize()); } @@ -767,10 +767,10 @@ public static Flowable combineLatest( Publisher source1, Publisher source2, Publisher source3, Publisher source4, Function4 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return combineLatestArray(new Publisher[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize()); } @@ -825,11 +825,11 @@ public static Flowable combineLatest( Publisher source3, Publisher source4, Publisher source5, Function5 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize()); } @@ -887,12 +887,12 @@ public static Flowable combineLatest( Publisher source3, Publisher source4, Publisher source5, Publisher source6, Function6 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize()); } @@ -954,13 +954,13 @@ public static Flowable combineLatest( Publisher source5, Publisher source6, Publisher source7, Function7 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize()); } @@ -1025,14 +1025,14 @@ public static Flowable combineLatest( Publisher source5, Publisher source6, Publisher source7, Publisher source8, Function8 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize()); } @@ -1101,15 +1101,15 @@ public static Flowable combineLatest( Publisher source7, Publisher source8, Publisher source9, Function9 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); - ObjectHelper.requireNonNull(source9, "source9 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source9, "source9 is null"); return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize()); } @@ -1137,7 +1137,7 @@ public static Flowable combineLatest( @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable concat(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); // unlike general sources, fromIterable can only throw on a boundary because it is consumed only there return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, 2); } @@ -1232,8 +1232,8 @@ public static Flowable concat(Publisher> @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable concat(Publisher source1, Publisher source2) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return concatArray(source1, source2); } @@ -1270,9 +1270,9 @@ public static Flowable concat(Publisher source1, Publisher Flowable concat( Publisher source1, Publisher source2, Publisher source3) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return concatArray(source1, source2, source3); } @@ -1311,10 +1311,10 @@ public static Flowable concat( public static Flowable concat( Publisher source1, Publisher source2, Publisher source3, Publisher source4) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return concatArray(source1, source2, source3, source4); } @@ -1446,7 +1446,7 @@ public static Flowable concatArrayEager(Publisher... sources @SchedulerSupport(SchedulerSupport.NONE) @SuppressWarnings({ "rawtypes", "unchecked" }) public static Flowable concatArrayEager(int maxConcurrency, int prefetch, Publisher... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(new FlowableFromArray(sources), Functions.identity(), maxConcurrency, prefetch, ErrorMode.IMMEDIATE)); @@ -1541,7 +1541,7 @@ public static Flowable concatArrayEagerDelayError(int maxConcurrency, int @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable concatDelayError(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return fromIterable(sources).concatMapDelayError((Function)Functions.identity()); } @@ -1647,7 +1647,7 @@ public static Flowable concatEager(Publisher Flowable concatEager(Publisher> sources, int maxConcurrency, int prefetch) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapEagerPublisher(sources, Functions.identity(), maxConcurrency, prefetch, ErrorMode.IMMEDIATE)); @@ -1707,7 +1707,7 @@ public static Flowable concatEager(Iterable Flowable concatEager(Iterable> sources, int maxConcurrency, int prefetch) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(new FlowableFromIterable(sources), Functions.identity(), maxConcurrency, prefetch, ErrorMode.IMMEDIATE)); @@ -1770,8 +1770,8 @@ public static Flowable concatEager(Iterable Flowable create(FlowableOnSubscribe source, BackpressureStrategy mode) { - ObjectHelper.requireNonNull(source, "source is null"); - ObjectHelper.requireNonNull(mode, "mode is null"); + Objects.requireNonNull(source, "source is null"); + Objects.requireNonNull(mode, "mode is null"); return RxJavaPlugins.onAssembly(new FlowableCreate(source, mode)); } @@ -1807,7 +1807,7 @@ public static Flowable create(FlowableOnSubscribe source, Backpressure @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable defer(Supplier> supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new FlowableDefer(supplier)); } @@ -1862,7 +1862,7 @@ public static Flowable empty() { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable error(Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new FlowableError(supplier)); } @@ -1891,7 +1891,7 @@ public static Flowable error(Supplier supplier) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable error(final Throwable throwable) { - ObjectHelper.requireNonNull(throwable, "throwable is null"); + Objects.requireNonNull(throwable, "throwable is null"); return error(Functions.justSupplier(throwable)); } @@ -1920,7 +1920,7 @@ public static Flowable error(final Throwable throwable) { @SchedulerSupport(SchedulerSupport.NONE) @SafeVarargs public static Flowable fromArray(T... items) { - ObjectHelper.requireNonNull(items, "items is null"); + Objects.requireNonNull(items, "items is null"); if (items.length == 0) { return empty(); } @@ -1967,7 +1967,7 @@ public static Flowable fromArray(T... items) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable fromCallable(Callable supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new FlowableFromCallable(supplier)); } @@ -2009,7 +2009,7 @@ public static Flowable fromCallable(Callable supplier) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable fromFuture(Future future) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return RxJavaPlugins.onAssembly(new FlowableFromFuture(future, 0L, null)); } @@ -2055,8 +2055,8 @@ public static Flowable fromFuture(Future future) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable fromFuture(Future future, long timeout, TimeUnit unit) { - ObjectHelper.requireNonNull(future, "future is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(future, "future is null"); + Objects.requireNonNull(unit, "unit is null"); return RxJavaPlugins.onAssembly(new FlowableFromFuture(future, timeout, unit)); } @@ -2106,7 +2106,7 @@ public static Flowable fromFuture(Future future, long timeou @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public static Flowable fromFuture(Future future, long timeout, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return fromFuture((Future)future, timeout, unit).subscribeOn(scheduler); } @@ -2145,7 +2145,7 @@ public static Flowable fromFuture(Future future, long timeou @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public static Flowable fromFuture(Future future, Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return fromFuture((Future)future).subscribeOn(scheduler); } @@ -2175,7 +2175,7 @@ public static Flowable fromFuture(Future future, Scheduler s @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable fromIterable(Iterable source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return RxJavaPlugins.onAssembly(new FlowableFromIterable(source)); } @@ -2215,7 +2215,7 @@ public static Flowable fromPublisher(final Publisher source) if (source instanceof Flowable) { return RxJavaPlugins.onAssembly((Flowable)source); } - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return RxJavaPlugins.onAssembly(new FlowableFromPublisher(source)); } @@ -2257,7 +2257,7 @@ public static Flowable fromPublisher(final Publisher source) @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable fromSupplier(Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new FlowableFromSupplier(supplier)); } @@ -2287,7 +2287,7 @@ public static Flowable fromSupplier(Supplier supplier) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable generate(final Consumer> generator) { - ObjectHelper.requireNonNull(generator, "generator is null"); + Objects.requireNonNull(generator, "generator is null"); return generate(Functions.nullSupplier(), FlowableInternalHelper.simpleGenerator(generator), Functions.emptyConsumer()); @@ -2321,7 +2321,7 @@ public static Flowable generate(final Consumer> generator) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable generate(Supplier initialState, final BiConsumer> generator) { - ObjectHelper.requireNonNull(generator, "generator is null"); + Objects.requireNonNull(generator, "generator is null"); return generate(initialState, FlowableInternalHelper.simpleBiGenerator(generator), Functions.emptyConsumer()); } @@ -2357,7 +2357,7 @@ public static Flowable generate(Supplier initialState, final BiCons @SchedulerSupport(SchedulerSupport.NONE) public static Flowable generate(Supplier initialState, final BiConsumer> generator, Consumer disposeState) { - ObjectHelper.requireNonNull(generator, "generator is null"); + Objects.requireNonNull(generator, "generator is null"); return generate(initialState, FlowableInternalHelper.simpleBiGenerator(generator), disposeState); } @@ -2423,9 +2423,9 @@ public static Flowable generate(Supplier initialState, BiFunction Flowable generate(Supplier initialState, BiFunction, S> generator, Consumer disposeState) { - ObjectHelper.requireNonNull(initialState, "initialState is null"); - ObjectHelper.requireNonNull(generator, "generator is null"); - ObjectHelper.requireNonNull(disposeState, "disposeState is null"); + Objects.requireNonNull(initialState, "initialState is null"); + Objects.requireNonNull(generator, "generator is null"); + Objects.requireNonNull(disposeState, "disposeState is null"); return RxJavaPlugins.onAssembly(new FlowableGenerate(initialState, generator, disposeState)); } @@ -2493,8 +2493,8 @@ public static Flowable interval(long initialDelay, long period, TimeUnit u @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.CUSTOM) public static Flowable interval(long initialDelay, long period, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableInterval(Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler)); } @@ -2612,8 +2612,8 @@ public static Flowable intervalRange(long start, long count, long initialD if (start > 0 && end < 0) { throw new IllegalArgumentException("Overflow! start + count is bigger than Long.MAX_VALUE"); } - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableIntervalRange(start, end, Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler)); } @@ -2653,7 +2653,7 @@ public static Flowable intervalRange(long start, long count, long initialD @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return RxJavaPlugins.onAssembly(new FlowableJust(item)); } @@ -2682,8 +2682,8 @@ public static Flowable just(T item) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); return fromArray(item1, item2); } @@ -2715,9 +2715,9 @@ public static Flowable just(T item1, T item2) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2, T item3) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); return fromArray(item1, item2, item3); } @@ -2751,10 +2751,10 @@ public static Flowable just(T item1, T item2, T item3) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2, T item3, T item4) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); return fromArray(item1, item2, item3, item4); } @@ -2790,11 +2790,11 @@ public static Flowable just(T item1, T item2, T item3, T item4) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2, T item3, T item4, T item5) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); return fromArray(item1, item2, item3, item4, item5); } @@ -2832,12 +2832,12 @@ public static Flowable just(T item1, T item2, T item3, T item4, T item5) @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2, T item3, T item4, T item5, T item6) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); return fromArray(item1, item2, item3, item4, item5, item6); } @@ -2877,13 +2877,13 @@ public static Flowable just(T item1, T item2, T item3, T item4, T item5, @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); - ObjectHelper.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); return fromArray(item1, item2, item3, item4, item5, item6, item7); } @@ -2925,14 +2925,14 @@ public static Flowable just(T item1, T item2, T item3, T item4, T item5, @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); - ObjectHelper.requireNonNull(item7, "item7 is null"); - ObjectHelper.requireNonNull(item8, "item8 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); return fromArray(item1, item2, item3, item4, item5, item6, item7, item8); } @@ -2976,15 +2976,15 @@ public static Flowable just(T item1, T item2, T item3, T item4, T item5, @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); - ObjectHelper.requireNonNull(item7, "item7 is null"); - ObjectHelper.requireNonNull(item8, "item8 is null"); - ObjectHelper.requireNonNull(item9, "item9 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); + Objects.requireNonNull(item9, "item9 is null"); return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9); } @@ -3030,16 +3030,16 @@ public static Flowable just(T item1, T item2, T item3, T item4, T item5, @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); - ObjectHelper.requireNonNull(item7, "item7 is null"); - ObjectHelper.requireNonNull(item8, "item8 is null"); - ObjectHelper.requireNonNull(item9, "item9 is null"); - ObjectHelper.requireNonNull(item10, "item10 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); + Objects.requireNonNull(item9, "item9 is null"); + Objects.requireNonNull(item10, "item10 is null"); return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9, item10); } @@ -3421,8 +3421,8 @@ public static Flowable mergeArray(Publisher... sources) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable merge(Publisher source1, Publisher source2) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2); } @@ -3471,9 +3471,9 @@ public static Flowable merge(Publisher source1, Publisher Flowable merge(Publisher source1, Publisher source2, Publisher source3) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), false, 3); } @@ -3526,10 +3526,10 @@ public static Flowable merge(Publisher source1, Publisher Flowable merge( Publisher source1, Publisher source2, Publisher source3, Publisher source4) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return fromArray(source1, source2, source3, source4).flatMap((Function)Functions.identity(), false, 4); } @@ -3834,8 +3834,8 @@ public static Flowable mergeArrayDelayError(Publisher... sou @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable mergeDelayError(Publisher source1, Publisher source2) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return fromArray(source1, source2).flatMap((Function)Functions.identity(), true, 2); } @@ -3877,9 +3877,9 @@ public static Flowable mergeDelayError(Publisher source1, Pu @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable mergeDelayError(Publisher source1, Publisher source2, Publisher source3) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), true, 3); } @@ -3925,10 +3925,10 @@ public static Flowable mergeDelayError(Publisher source1, Pu public static Flowable mergeDelayError( Publisher source1, Publisher source2, Publisher source3, Publisher source4) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return fromArray(source1, source2, source3, source4).flatMap((Function)Functions.identity(), true, 4); } @@ -4140,9 +4140,9 @@ public static Single sequenceEqual(Publisher source1, @SchedulerSupport(SchedulerSupport.NONE) public static Single sequenceEqual(Publisher source1, Publisher source2, BiPredicate isEqual, int bufferSize) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(isEqual, "isEqual is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(isEqual, "isEqual is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableSequenceEqualSingle(source1, source2, isEqual, bufferSize)); } @@ -4390,8 +4390,8 @@ public static Flowable timer(long delay, TimeUnit unit) { @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.CUSTOM) public static Flowable timer(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableTimer(Math.max(0L, delay), unit, scheduler)); } @@ -4419,7 +4419,7 @@ public static Flowable timer(long delay, TimeUnit unit, Scheduler schedule @BackpressureSupport(BackpressureKind.NONE) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable unsafeCreate(Publisher onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); if (onSubscribe instanceof Flowable) { throw new IllegalArgumentException("unsafeCreate(Flowable) should be upgraded"); } @@ -4497,9 +4497,9 @@ public static Flowable using(Supplier resourceSupplier, public static Flowable using(Supplier resourceSupplier, Function> sourceSupplier, Consumer resourceDisposer, boolean eager) { - ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); - ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null"); - ObjectHelper.requireNonNull(resourceDisposer, "resourceDisposer is null"); + Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); + Objects.requireNonNull(sourceSupplier, "sourceSupplier is null"); + Objects.requireNonNull(resourceDisposer, "resourceDisposer is null"); return RxJavaPlugins.onAssembly(new FlowableUsing(resourceSupplier, sourceSupplier, resourceDisposer, eager)); } @@ -4552,8 +4552,8 @@ public static Flowable using(Supplier resourceSupplier, @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public static Flowable zip(Iterable> sources, Function zipper) { - ObjectHelper.requireNonNull(zipper, "zipper is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new FlowableZip(null, sources, zipper, bufferSize(), false)); } @@ -4613,8 +4613,8 @@ public static Flowable zip(Iterable> public static Flowable zip(Iterable> sources, Function zipper, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(zipper, "zipper is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableZip(null, sources, zipper, bufferSize, delayError)); } @@ -4674,8 +4674,8 @@ public static Flowable zip(Iterable> public static Flowable zip( Publisher source1, Publisher source2, BiFunction zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2); } @@ -4735,8 +4735,8 @@ public static Flowable zip( public static Flowable zip( Publisher source1, Publisher source2, BiFunction zipper, boolean delayError) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), source1, source2); } @@ -4797,8 +4797,8 @@ public static Flowable zip( public static Flowable zip( Publisher source1, Publisher source2, BiFunction zipper, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return zipArray(Functions.toFunction(zipper), delayError, bufferSize, source1, source2); } @@ -4861,9 +4861,9 @@ public static Flowable zip( public static Flowable zip( Publisher source1, Publisher source2, Publisher source3, Function3 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3); } @@ -4930,10 +4930,10 @@ public static Flowable zip( Publisher source1, Publisher source2, Publisher source3, Publisher source4, Function4 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4); } @@ -5003,11 +5003,11 @@ public static Flowable zip( Publisher source1, Publisher source2, Publisher source3, Publisher source4, Publisher source5, Function5 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5); } @@ -5079,12 +5079,12 @@ public static Flowable zip( Publisher source1, Publisher source2, Publisher source3, Publisher source4, Publisher source5, Publisher source6, Function6 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6); } @@ -5160,13 +5160,13 @@ public static Flowable zip( Publisher source4, Publisher source5, Publisher source6, Publisher source7, Function7 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7); } @@ -5245,14 +5245,14 @@ public static Flowable zip( Publisher source4, Publisher source5, Publisher source6, Publisher source7, Publisher source8, Function8 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8); } @@ -5335,15 +5335,15 @@ public static Flowable zip( Publisher source7, Publisher source8, Publisher source9, Function9 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); - ObjectHelper.requireNonNull(source9, "source9 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source9, "source9 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8, source9); } @@ -5406,7 +5406,7 @@ public static Flowable zipArray(Function(sources, null, zipper, bufferSize, delayError)); } @@ -5439,7 +5439,7 @@ public static Flowable zipArray(Function all(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new FlowableAllSingle(this, predicate)); } @@ -5468,7 +5468,7 @@ public final Single all(Predicate predicate) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable ambWith(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return ambArray(this, other); } @@ -5500,7 +5500,7 @@ public final Flowable ambWith(Publisher other) { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single any(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new FlowableAnySingle(this, predicate)); } @@ -6209,7 +6209,7 @@ public final Flowable> buffer(int count, int skip) { public final > Flowable buffer(int count, int skip, Supplier bufferSupplier) { ObjectHelper.verifyPositive(count, "count"); ObjectHelper.verifyPositive(skip, "skip"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return RxJavaPlugins.onAssembly(new FlowableBuffer(this, count, skip, bufferSupplier)); } @@ -6358,9 +6358,9 @@ public final Flowable> buffer(long timespan, long timeskip, TimeUnit uni @SchedulerSupport(SchedulerSupport.CUSTOM) public final > Flowable buffer(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, Supplier bufferSupplier) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return RxJavaPlugins.onAssembly(new FlowableBufferTimed(this, timespan, timeskip, unit, scheduler, bufferSupplier, Integer.MAX_VALUE, false)); } @@ -6518,9 +6518,9 @@ public final > Flowable buffer( Scheduler scheduler, int count, Supplier bufferSupplier, boolean restartTimerOnMaxSize) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); ObjectHelper.verifyPositive(count, "count"); return RxJavaPlugins.onAssembly(new FlowableBufferTimed(this, timespan, timespan, unit, scheduler, bufferSupplier, count, restartTimerOnMaxSize)); } @@ -6634,9 +6634,9 @@ public final > Flowable b Flowable openingIndicator, Function> closingIndicator, Supplier bufferSupplier) { - ObjectHelper.requireNonNull(openingIndicator, "openingIndicator is null"); - ObjectHelper.requireNonNull(closingIndicator, "closingIndicator is null"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(openingIndicator, "openingIndicator is null"); + Objects.requireNonNull(closingIndicator, "closingIndicator is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return RxJavaPlugins.onAssembly(new FlowableBufferBoundary(this, openingIndicator, closingIndicator, bufferSupplier)); } @@ -6746,8 +6746,8 @@ public final Flowable> buffer(Publisher boundaryIndicator, final @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.NONE) public final > Flowable buffer(Publisher boundaryIndicator, Supplier bufferSupplier) { - ObjectHelper.requireNonNull(boundaryIndicator, "boundaryIndicator is null"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return RxJavaPlugins.onAssembly(new FlowableBufferExactBoundary(this, boundaryIndicator, bufferSupplier)); } @@ -6898,7 +6898,7 @@ public final Flowable cacheWithInitialCapacity(int initialCapacity) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable cast(final Class clazz) { - ObjectHelper.requireNonNull(clazz, "clazz is null"); + Objects.requireNonNull(clazz, "clazz is null"); return map(Functions.castFunction(clazz)); } @@ -6936,8 +6936,8 @@ public final Flowable cast(final Class clazz) { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single collect(Supplier initialItemSupplier, BiConsumer collector) { - ObjectHelper.requireNonNull(initialItemSupplier, "initialItemSupplier is null"); - ObjectHelper.requireNonNull(collector, "collector is null"); + Objects.requireNonNull(initialItemSupplier, "initialItemSupplier is null"); + Objects.requireNonNull(collector, "collector is null"); return RxJavaPlugins.onAssembly(new FlowableCollectSingle(this, initialItemSupplier, collector)); } @@ -6975,7 +6975,7 @@ public final Single collect(Supplier initialItemSupplier, Bi @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single collectInto(final U initialItem, BiConsumer collector) { - ObjectHelper.requireNonNull(initialItem, "initialItem is null"); + Objects.requireNonNull(initialItem, "initialItem is null"); return collect(Functions.justSupplier(initialItem), collector); } @@ -7006,7 +7006,7 @@ public final Single collectInto(final U initialItem, BiConsumer Flowable compose(FlowableTransformer composer) { - return fromPublisher(((FlowableTransformer) ObjectHelper.requireNonNull(composer, "composer is null")).apply(this)); + return fromPublisher(((FlowableTransformer) Objects.requireNonNull(composer, "composer is null")).apply(this)); } /** @@ -7082,7 +7082,7 @@ public final Flowable concatMap(Function Flowable concatMap(Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); if (this instanceof ScalarSupplier) { @SuppressWarnings("unchecked") @@ -7135,9 +7135,9 @@ public final Flowable concatMap(Function Flowable concatMap(Function> mapper, int prefetch, Scheduler scheduler) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); - ObjectHelper.requireNonNull(scheduler, "scheduler"); + Objects.requireNonNull(scheduler, "scheduler"); return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler)); } @@ -7197,7 +7197,7 @@ public final Completable concatMapCompletable(Function mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapCompletable(this, mapper, ErrorMode.IMMEDIATE, prefetch)); } @@ -7300,7 +7300,7 @@ public final Completable concatMapCompletableDelayError(Function mapper, boolean tillTheEnd, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapCompletable(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch)); } @@ -7374,7 +7374,7 @@ public final Flowable concatMapDelayError(Function Flowable concatMapDelayError(Function> mapper, boolean tillTheEnd, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); if (this instanceof ScalarSupplier) { @SuppressWarnings("unchecked") @@ -7426,9 +7426,9 @@ public final Flowable concatMapDelayError(Function Flowable concatMapDelayError(Function> mapper, boolean tillTheEnd, int prefetch, Scheduler scheduler) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler)); } @@ -7487,7 +7487,7 @@ public final Flowable concatMapEager(Function Flowable concatMapEager(Function> mapper, int maxConcurrency, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(this, mapper, maxConcurrency, prefetch, ErrorMode.IMMEDIATE)); @@ -7557,7 +7557,7 @@ public final Flowable concatMapEagerDelayError(Function Flowable concatMapEagerDelayError(Function> mapper, boolean tillTheEnd, int maxConcurrency, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(this, mapper, maxConcurrency, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY)); @@ -7621,7 +7621,7 @@ public final Flowable concatMapIterable(Function Flowable concatMapIterable(final Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableFlattenIterable(this, mapper, prefetch)); } @@ -7690,7 +7690,7 @@ public final Flowable concatMapMaybe(Function Flowable concatMapMaybe(Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe(this, mapper, ErrorMode.IMMEDIATE, prefetch)); } @@ -7801,7 +7801,7 @@ public final Flowable concatMapMaybeDelayError(Function Flowable concatMapMaybeDelayError(Function> mapper, boolean tillTheEnd, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch)); } @@ -7870,7 +7870,7 @@ public final Flowable concatMapSingle(Function Flowable concatMapSingle(Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle(this, mapper, ErrorMode.IMMEDIATE, prefetch)); } @@ -7981,7 +7981,7 @@ public final Flowable concatMapSingleDelayError(Function Flowable concatMapSingleDelayError(Function> mapper, boolean tillTheEnd, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch)); } @@ -8011,7 +8011,7 @@ public final Flowable concatMapSingleDelayError(Function concatWith(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return concat(this, other); } @@ -8036,7 +8036,7 @@ public final Flowable concatWith(Publisher other) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable concatWith(@NonNull SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableConcatWithSingle(this, other)); } @@ -8061,7 +8061,7 @@ public final Flowable concatWith(@NonNull SingleSource other) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable concatWith(@NonNull MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableConcatWithMaybe(this, other)); } @@ -8088,7 +8088,7 @@ public final Flowable concatWith(@NonNull MaybeSource other) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable concatWith(@NonNull CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableConcatWithCompletable(this, other)); } @@ -8116,7 +8116,7 @@ public final Flowable concatWith(@NonNull CompletableSource other) { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single contains(final Object item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return any(Functions.equalsWith(item)); } @@ -8179,7 +8179,7 @@ public final Single count() { @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable debounce(Function> debounceIndicator) { - ObjectHelper.requireNonNull(debounceIndicator, "debounceIndicator is null"); + Objects.requireNonNull(debounceIndicator, "debounceIndicator is null"); return RxJavaPlugins.onAssembly(new FlowableDebounce(this, debounceIndicator)); } @@ -8267,8 +8267,8 @@ public final Flowable debounce(long timeout, TimeUnit unit) { @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable debounce(long timeout, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableDebounceTimed(this, timeout, unit, scheduler)); } @@ -8298,7 +8298,7 @@ public final Flowable debounce(long timeout, TimeUnit unit, Scheduler schedul @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable defaultIfEmpty(T defaultItem) { - ObjectHelper.requireNonNull(defaultItem, "defaultItem is null"); + Objects.requireNonNull(defaultItem, "defaultItem is null"); return switchIfEmpty(just(defaultItem)); } @@ -8334,7 +8334,7 @@ public final Flowable defaultIfEmpty(T defaultItem) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable delay(final Function> itemDelayIndicator) { - ObjectHelper.requireNonNull(itemDelayIndicator, "itemDelayIndicator is null"); + Objects.requireNonNull(itemDelayIndicator, "itemDelayIndicator is null"); return flatMap(FlowableInternalHelper.itemDelay(itemDelayIndicator)); } @@ -8450,8 +8450,8 @@ public final Flowable delay(long delay, TimeUnit unit, Scheduler scheduler) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable delay(long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableDelay(this, Math.max(0L, delay), unit, scheduler, delayError)); } @@ -8519,7 +8519,7 @@ public final Flowable delay(Publisher subscriptionIndicator, @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable delaySubscription(Publisher subscriptionIndicator) { - ObjectHelper.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null"); + Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null"); return RxJavaPlugins.onAssembly(new FlowableDelaySubscriptionOther(this, subscriptionIndicator)); } @@ -8632,7 +8632,7 @@ public final Flowable delaySubscription(long delay, TimeUnit unit, Scheduler @SchedulerSupport(SchedulerSupport.NONE) @BackpressureSupport(BackpressureKind.PASS_THROUGH) public final Flowable dematerialize(Function> selector) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); return RxJavaPlugins.onAssembly(new FlowableDematerialize(this, selector)); } @@ -8752,8 +8752,8 @@ public final Flowable distinct(Function keySelector) { @SchedulerSupport(SchedulerSupport.NONE) public final Flowable distinct(Function keySelector, Supplier> collectionSupplier) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(collectionSupplier, "collectionSupplier is null"); return RxJavaPlugins.onAssembly(new FlowableDistinct(this, keySelector, collectionSupplier)); } @@ -8841,7 +8841,7 @@ public final Flowable distinctUntilChanged() { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable distinctUntilChanged(Function keySelector) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged(this, keySelector, ObjectHelper.equalsPredicate())); } @@ -8879,7 +8879,7 @@ public final Flowable distinctUntilChanged(Function keySele @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable distinctUntilChanged(BiPredicate comparer) { - ObjectHelper.requireNonNull(comparer, "comparer is null"); + Objects.requireNonNull(comparer, "comparer is null"); return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged(this, Functions.identity(), comparer)); } @@ -8909,7 +8909,7 @@ public final Flowable distinctUntilChanged(BiPredicate @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable doFinally(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "onFinally is null"); + Objects.requireNonNull(onFinally, "onFinally is null"); return RxJavaPlugins.onAssembly(new FlowableDoFinally(this, onFinally)); } @@ -8936,7 +8936,7 @@ public final Flowable doFinally(Action onFinally) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable doAfterNext(Consumer onAfterNext) { - ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null"); + Objects.requireNonNull(onAfterNext, "onAfterNext is null"); return RxJavaPlugins.onAssembly(new FlowableDoAfterNext(this, onAfterNext)); } @@ -9047,10 +9047,10 @@ public final Flowable doOnComplete(Action onComplete) { @SchedulerSupport(SchedulerSupport.NONE) private Flowable doOnEach(Consumer onNext, Consumer onError, Action onComplete, Action onAfterTerminate) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); return RxJavaPlugins.onAssembly(new FlowableDoOnEach(this, onNext, onError, onComplete, onAfterTerminate)); } @@ -9076,7 +9076,7 @@ private Flowable doOnEach(Consumer onNext, Consumer doOnEach(final Consumer> onNotification) { - ObjectHelper.requireNonNull(onNotification, "onNotification is null"); + Objects.requireNonNull(onNotification, "onNotification is null"); return doOnEach( Functions.notificationOnNext(onNotification), Functions.notificationOnError(onNotification), @@ -9113,7 +9113,7 @@ public final Flowable doOnEach(final Consumer> onNoti @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable doOnEach(final Subscriber subscriber) { - ObjectHelper.requireNonNull(subscriber, "subscriber is null"); + Objects.requireNonNull(subscriber, "subscriber is null"); return doOnEach( FlowableInternalHelper.subscriberOnNext(subscriber), FlowableInternalHelper.subscriberOnError(subscriber), @@ -9177,9 +9177,9 @@ public final Flowable doOnError(Consumer onError) { @SchedulerSupport(SchedulerSupport.NONE) public final Flowable doOnLifecycle(final Consumer onSubscribe, final LongConsumer onRequest, final Action onCancel) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); - ObjectHelper.requireNonNull(onRequest, "onRequest is null"); - ObjectHelper.requireNonNull(onCancel, "onCancel is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onRequest, "onRequest is null"); + Objects.requireNonNull(onCancel, "onCancel is null"); return RxJavaPlugins.onAssembly(new FlowableDoOnLifecycle(this, onSubscribe, onRequest, onCancel)); } @@ -9352,7 +9352,7 @@ public final Single elementAt(long index, T defaultItem) { if (index < 0) { throw new IndexOutOfBoundsException("index >= 0 required but it was " + index); } - ObjectHelper.requireNonNull(defaultItem, "defaultItem is null"); + Objects.requireNonNull(defaultItem, "defaultItem is null"); return RxJavaPlugins.onAssembly(new FlowableElementAtSingle(this, index, defaultItem)); } @@ -9410,7 +9410,7 @@ public final Single elementAtOrError(long index) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable filter(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new FlowableFilter(this, predicate)); } @@ -9665,7 +9665,7 @@ public final Flowable flatMap(Function Flowable flatMap(Function> mapper, boolean delayErrors, int maxConcurrency, int bufferSize) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); if (this instanceof ScalarSupplier) { @@ -9716,9 +9716,9 @@ public final Flowable flatMap( Function> onNextMapper, Function> onErrorMapper, Supplier> onCompleteSupplier) { - ObjectHelper.requireNonNull(onNextMapper, "onNextMapper is null"); - ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); - ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); + Objects.requireNonNull(onNextMapper, "onNextMapper is null"); + Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); + Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); return merge(new FlowableMapNotification>(this, onNextMapper, onErrorMapper, onCompleteSupplier)); } @@ -9764,9 +9764,9 @@ public final Flowable flatMap( Function> onErrorMapper, Supplier> onCompleteSupplier, int maxConcurrency) { - ObjectHelper.requireNonNull(onNextMapper, "onNextMapper is null"); - ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); - ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); + Objects.requireNonNull(onNextMapper, "onNextMapper is null"); + Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); + Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); return merge(new FlowableMapNotification>( this, onNextMapper, onErrorMapper, onCompleteSupplier), maxConcurrency); } @@ -9932,8 +9932,8 @@ public final Flowable flatMap(Function Flowable flatMap(final Function> mapper, final BiFunction combiner, boolean delayErrors, int maxConcurrency, int bufferSize) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return flatMap(FlowableInternalHelper.flatMapWithCombiner(mapper, combiner), delayErrors, maxConcurrency, bufferSize); @@ -10020,7 +10020,7 @@ public final Completable flatMapCompletable(Function mapper, boolean delayErrors, int maxConcurrency) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return RxJavaPlugins.onAssembly(new FlowableFlatMapCompletableCompletable(this, mapper, delayErrors, maxConcurrency)); } @@ -10085,7 +10085,7 @@ public final Flowable flatMapIterable(final Function Flowable flatMapIterable(final Function> mapper, int bufferSize) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableFlattenIterable(this, mapper, bufferSize)); } @@ -10123,8 +10123,8 @@ public final Flowable flatMapIterable(final Function Flowable flatMapIterable(final Function> mapper, final BiFunction resultSelector) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - ObjectHelper.requireNonNull(resultSelector, "resultSelector is null"); + Objects.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(resultSelector, "resultSelector is null"); return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), bufferSize()); } @@ -10166,8 +10166,8 @@ public final Flowable flatMapIterable(final Function Flowable flatMapIterable(final Function> mapper, final BiFunction resultSelector, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - ObjectHelper.requireNonNull(resultSelector, "resultSelector is null"); + Objects.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(resultSelector, "resultSelector is null"); return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), prefetch); } @@ -10215,7 +10215,7 @@ public final Flowable flatMapMaybe(Function Flowable flatMapMaybe(Function> mapper, boolean delayErrors, int maxConcurrency) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybe(this, mapper, delayErrors, maxConcurrency)); } @@ -10264,7 +10264,7 @@ public final Flowable flatMapSingle(Function Flowable flatMapSingle(Function> mapper, boolean delayErrors, int maxConcurrency) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return RxJavaPlugins.onAssembly(new FlowableFlatMapSingle(this, mapper, delayErrors, maxConcurrency)); } @@ -10386,9 +10386,9 @@ public final Disposable forEachWhile(Predicate onNext, Consumer onNext, final Consumer onError, final Action onComplete) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); ForEachWhileSubscriber s = new ForEachWhileSubscriber(onNext, onError, onComplete); subscribe(s); @@ -10706,8 +10706,8 @@ public final Flowable> groupBy(Function Flowable> groupBy(Function keySelector, Function valueSelector, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableGroupBy(this, keySelector, valueSelector, bufferSize, delayError, null)); @@ -10828,10 +10828,10 @@ public final Flowable> groupBy(Function valueSelector, boolean delayError, int bufferSize, Function, ? extends Map> evictingMapFactory) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(evictingMapFactory, "evictingMapFactory is null"); + Objects.requireNonNull(evictingMapFactory, "evictingMapFactory is null"); return RxJavaPlugins.onAssembly(new FlowableGroupBy(this, keySelector, valueSelector, bufferSize, delayError, evictingMapFactory)); } @@ -10879,10 +10879,10 @@ public final Flowable groupJoin( Function> leftEnd, Function> rightEnd, BiFunction, ? extends R> resultSelector) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(leftEnd, "leftEnd is null"); - ObjectHelper.requireNonNull(rightEnd, "rightEnd is null"); - ObjectHelper.requireNonNull(resultSelector, "resultSelector is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(leftEnd, "leftEnd is null"); + Objects.requireNonNull(rightEnd, "rightEnd is null"); + Objects.requireNonNull(resultSelector, "resultSelector is null"); return RxJavaPlugins.onAssembly(new FlowableGroupJoin( this, other, leftEnd, rightEnd, resultSelector)); } @@ -11001,10 +11001,10 @@ public final Flowable join( Function> leftEnd, Function> rightEnd, BiFunction resultSelector) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(leftEnd, "leftEnd is null"); - ObjectHelper.requireNonNull(rightEnd, "rightEnd is null"); - ObjectHelper.requireNonNull(resultSelector, "resultSelector is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(leftEnd, "leftEnd is null"); + Objects.requireNonNull(rightEnd, "rightEnd is null"); + Objects.requireNonNull(resultSelector, "resultSelector is null"); return RxJavaPlugins.onAssembly(new FlowableJoin( this, other, leftEnd, rightEnd, resultSelector)); } @@ -11055,7 +11055,7 @@ public final Maybe lastElement() { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single last(T defaultItem) { - ObjectHelper.requireNonNull(defaultItem, "defaultItem"); + Objects.requireNonNull(defaultItem, "defaultItem"); return RxJavaPlugins.onAssembly(new FlowableLastSingle(this, defaultItem)); } @@ -11233,7 +11233,7 @@ public final Single lastOrError() { @BackpressureSupport(BackpressureKind.SPECIAL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable lift(FlowableOperator lifter) { - ObjectHelper.requireNonNull(lifter, "lifter is null"); + Objects.requireNonNull(lifter, "lifter is null"); return RxJavaPlugins.onAssembly(new FlowableLift(this, lifter)); } @@ -11262,7 +11262,7 @@ public final Flowable lift(FlowableOperator lifte @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable map(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new FlowableMap(this, mapper)); } @@ -11316,7 +11316,7 @@ public final Flowable> materialize() { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable mergeWith(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return merge(this, other); } @@ -11344,7 +11344,7 @@ public final Flowable mergeWith(Publisher other) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable mergeWith(@NonNull SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableMergeWithSingle(this, other)); } @@ -11373,7 +11373,7 @@ public final Flowable mergeWith(@NonNull SingleSource other) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable mergeWith(@NonNull MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableMergeWithMaybe(this, other)); } @@ -11399,7 +11399,7 @@ public final Flowable mergeWith(@NonNull MaybeSource other) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable mergeWith(@NonNull CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableMergeWithCompletable(this, other)); } @@ -11554,7 +11554,7 @@ public final Flowable observeOn(Scheduler scheduler, boolean delayError) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable observeOn(Scheduler scheduler, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableObserveOn(this, scheduler, delayError, bufferSize)); } @@ -11582,7 +11582,7 @@ public final Flowable observeOn(Scheduler scheduler, boolean delayError, int @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable ofType(final Class clazz) { - ObjectHelper.requireNonNull(clazz, "clazz is null"); + Objects.requireNonNull(clazz, "clazz is null"); return filter(Functions.isInstanceOf(clazz)).cast(clazz); } @@ -11760,7 +11760,7 @@ public final Flowable onBackpressureBuffer(int capacity, boolean delayError, @SchedulerSupport(SchedulerSupport.NONE) public final Flowable onBackpressureBuffer(int capacity, boolean delayError, boolean unbounded, Action onOverflow) { - ObjectHelper.requireNonNull(onOverflow, "onOverflow is null"); + Objects.requireNonNull(onOverflow, "onOverflow is null"); ObjectHelper.verifyPositive(capacity, "capacity"); return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer(this, capacity, unbounded, delayError, onOverflow)); } @@ -11831,7 +11831,7 @@ public final Flowable onBackpressureBuffer(int capacity, Action onOverflow) { @BackpressureSupport(BackpressureKind.SPECIAL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable onBackpressureBuffer(long capacity, Action onOverflow, BackpressureOverflowStrategy overflowStrategy) { - ObjectHelper.requireNonNull(overflowStrategy, "overflowStrategy is null"); + Objects.requireNonNull(overflowStrategy, "overflowStrategy is null"); ObjectHelper.verifyPositive(capacity, "capacity"); return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy(this, capacity, onOverflow, overflowStrategy)); } @@ -11888,7 +11888,7 @@ public final Flowable onBackpressureDrop() { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable onBackpressureDrop(Consumer onDrop) { - ObjectHelper.requireNonNull(onDrop, "onDrop is null"); + Objects.requireNonNull(onDrop, "onDrop is null"); return RxJavaPlugins.onAssembly(new FlowableOnBackpressureDrop(this, onDrop)); } @@ -11964,7 +11964,7 @@ public final Flowable onBackpressureLatest() { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable onErrorResumeNext(Function> resumeFunction) { - ObjectHelper.requireNonNull(resumeFunction, "resumeFunction is null"); + Objects.requireNonNull(resumeFunction, "resumeFunction is null"); return RxJavaPlugins.onAssembly(new FlowableOnErrorNext(this, resumeFunction)); } @@ -12008,7 +12008,7 @@ public final Flowable onErrorResumeNext(Function onErrorResumeWith(final Publisher next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return onErrorResumeNext(Functions.justFunction(next)); } @@ -12048,7 +12048,7 @@ public final Flowable onErrorResumeWith(final Publisher next) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable onErrorReturn(Function valueSupplier) { - ObjectHelper.requireNonNull(valueSupplier, "valueSupplier is null"); + Objects.requireNonNull(valueSupplier, "valueSupplier is null"); return RxJavaPlugins.onAssembly(new FlowableOnErrorReturn(this, valueSupplier)); } @@ -12088,7 +12088,7 @@ public final Flowable onErrorReturn(Function @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable onErrorReturnItem(final T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return onErrorReturn(Functions.justFunction(item)); } @@ -12297,7 +12297,7 @@ public final Flowable publish(Function, ? extends Pub @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable publish(Function, ? extends Publisher> selector, int prefetch) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowablePublishMulticast(this, selector, prefetch, false)); } @@ -12392,7 +12392,7 @@ public final Flowable rebatchRequests(int n) { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Maybe reduce(BiFunction reducer) { - ObjectHelper.requireNonNull(reducer, "reducer is null"); + Objects.requireNonNull(reducer, "reducer is null"); return RxJavaPlugins.onAssembly(new FlowableReduceMaybe(this, reducer)); } @@ -12454,8 +12454,8 @@ public final Maybe reduce(BiFunction reducer) { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single reduce(R seed, BiFunction reducer) { - ObjectHelper.requireNonNull(seed, "seed is null"); - ObjectHelper.requireNonNull(reducer, "reducer is null"); + Objects.requireNonNull(seed, "seed is null"); + Objects.requireNonNull(reducer, "reducer is null"); return RxJavaPlugins.onAssembly(new FlowableReduceSeedSingle(this, seed, reducer)); } @@ -12499,8 +12499,8 @@ public final Single reduce(R seed, BiFunction reducer) { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single reduceWith(Supplier seedSupplier, BiFunction reducer) { - ObjectHelper.requireNonNull(seedSupplier, "seedSupplier is null"); - ObjectHelper.requireNonNull(reducer, "reducer is null"); + Objects.requireNonNull(seedSupplier, "seedSupplier is null"); + Objects.requireNonNull(reducer, "reducer is null"); return RxJavaPlugins.onAssembly(new FlowableReduceWithSingle(this, seedSupplier, reducer)); } @@ -12587,7 +12587,7 @@ public final Flowable repeat(long times) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable repeatUntil(BooleanSupplier stop) { - ObjectHelper.requireNonNull(stop, "stop is null"); + Objects.requireNonNull(stop, "stop is null"); return RxJavaPlugins.onAssembly(new FlowableRepeatUntil(this, stop)); } @@ -12618,7 +12618,7 @@ public final Flowable repeatUntil(BooleanSupplier stop) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable repeatWhen(final Function, ? extends Publisher> handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); + Objects.requireNonNull(handler, "handler is null"); return RxJavaPlugins.onAssembly(new FlowableRepeatWhen(this, handler)); } @@ -12677,7 +12677,7 @@ public final ConnectableFlowable replay() { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable replay(Function, ? extends Publisher> selector) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this), selector); } @@ -12717,7 +12717,7 @@ public final Flowable replay(Function, ? extends Publ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable replay(Function, ? extends Publisher> selector, final int bufferSize) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, false), selector); } @@ -12760,7 +12760,7 @@ public final Flowable replay(Function, ? extends Publ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable replay(Function, ? extends Publisher> selector, final int bufferSize, boolean eagerTruncate) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector); } @@ -12852,10 +12852,10 @@ public final Flowable replay(Function, ? extends Publ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable replay(Function, ? extends Publisher> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(selector, "selector is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(unit, "unit is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return FlowableReplay.multicastSelector( FlowableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, false), selector); } @@ -12907,10 +12907,10 @@ public final Flowable replay(Function, ? extends Publ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable replay(Function, ? extends Publisher> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) { - ObjectHelper.requireNonNull(selector, "selector is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(unit, "unit is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return FlowableReplay.multicastSelector( FlowableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, eagerTruncate), selector); } @@ -12988,9 +12988,9 @@ public final Flowable replay(Function, ? extends Publ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable replay(Function, ? extends Publisher> selector, final long time, final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(selector, "selector is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, time, unit, scheduler, false), selector); } @@ -13033,9 +13033,9 @@ public final Flowable replay(Function, ? extends Publ @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable replay(Function, ? extends Publisher> selector, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) { - ObjectHelper.requireNonNull(selector, "selector is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, time, unit, scheduler, eagerTruncate), selector); } @@ -13194,8 +13194,8 @@ public final ConnectableFlowable replay(int bufferSize, long time, TimeUnit u @SchedulerSupport(SchedulerSupport.CUSTOM) public final ConnectableFlowable replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) { ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return FlowableReplay.create(this, time, unit, scheduler, bufferSize, false); } @@ -13244,8 +13244,8 @@ public final ConnectableFlowable replay(final int bufferSize, final long time @SchedulerSupport(SchedulerSupport.CUSTOM) public final ConnectableFlowable replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) { ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return FlowableReplay.create(this, time, unit, scheduler, bufferSize, eagerTruncate); } @@ -13318,8 +13318,8 @@ public final ConnectableFlowable replay(long time, TimeUnit unit) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final ConnectableFlowable replay(final long time, final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return FlowableReplay.create(this, time, unit, scheduler, false); } @@ -13359,8 +13359,8 @@ public final ConnectableFlowable replay(final long time, final TimeUnit unit, @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final ConnectableFlowable replay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return FlowableReplay.create(this, time, unit, scheduler, eagerTruncate); } @@ -13420,7 +13420,7 @@ public final Flowable retry() { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable retry(BiPredicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new FlowableRetryBiPredicate(this, predicate)); } @@ -13481,7 +13481,7 @@ public final Flowable retry(long times, Predicate predicat if (times < 0) { throw new IllegalArgumentException("times >= 0 required but it was " + times); } - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new FlowableRetryPredicate(this, times, predicate)); } @@ -13523,7 +13523,7 @@ public final Flowable retry(Predicate predicate) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable retryUntil(final BooleanSupplier stop) { - ObjectHelper.requireNonNull(stop, "stop is null"); + Objects.requireNonNull(stop, "stop is null"); return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop)); } @@ -13610,7 +13610,7 @@ public final Flowable retryUntil(final BooleanSupplier stop) { @SchedulerSupport(SchedulerSupport.NONE) public final Flowable retryWhen( final Function, ? extends Publisher> handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); + Objects.requireNonNull(handler, "handler is null"); return RxJavaPlugins.onAssembly(new FlowableRetryWhen(this, handler)); } @@ -13632,7 +13632,7 @@ public final Flowable retryWhen( @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final void safeSubscribe(Subscriber s) { - ObjectHelper.requireNonNull(s, "s is null"); + Objects.requireNonNull(s, "s is null"); if (s instanceof SafeSubscriber) { subscribe((SafeSubscriber)s); } else { @@ -13733,8 +13733,8 @@ public final Flowable sample(long period, TimeUnit unit, boolean emitLast) { @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable sample(long period, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableSampleTimed(this, period, unit, scheduler, false)); } @@ -13774,8 +13774,8 @@ public final Flowable sample(long period, TimeUnit unit, Scheduler scheduler) @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable sample(long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableSampleTimed(this, period, unit, scheduler, emitLast)); } @@ -13806,7 +13806,7 @@ public final Flowable sample(long period, TimeUnit unit, Scheduler scheduler, @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable sample(Publisher sampler) { - ObjectHelper.requireNonNull(sampler, "sampler is null"); + Objects.requireNonNull(sampler, "sampler is null"); return RxJavaPlugins.onAssembly(new FlowableSamplePublisher(this, sampler, false)); } @@ -13844,7 +13844,7 @@ public final Flowable sample(Publisher sampler) { @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable sample(Publisher sampler, boolean emitLast) { - ObjectHelper.requireNonNull(sampler, "sampler is null"); + Objects.requireNonNull(sampler, "sampler is null"); return RxJavaPlugins.onAssembly(new FlowableSamplePublisher(this, sampler, emitLast)); } @@ -13877,7 +13877,7 @@ public final Flowable sample(Publisher sampler, boolean emitLast) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable scan(BiFunction accumulator) { - ObjectHelper.requireNonNull(accumulator, "accumulator is null"); + Objects.requireNonNull(accumulator, "accumulator is null"); return RxJavaPlugins.onAssembly(new FlowableScan(this, accumulator)); } @@ -13931,7 +13931,7 @@ public final Flowable scan(BiFunction accumulator) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable scan(final R initialValue, BiFunction accumulator) { - ObjectHelper.requireNonNull(initialValue, "initialValue is null"); + Objects.requireNonNull(initialValue, "initialValue is null"); return scanWith(Functions.justSupplier(initialValue), accumulator); } @@ -13971,8 +13971,8 @@ public final Flowable scan(final R initialValue, BiFunction Flowable scanWith(Supplier seedSupplier, BiFunction accumulator) { - ObjectHelper.requireNonNull(seedSupplier, "seedSupplier is null"); - ObjectHelper.requireNonNull(accumulator, "accumulator is null"); + Objects.requireNonNull(seedSupplier, "seedSupplier is null"); + Objects.requireNonNull(accumulator, "accumulator is null"); return RxJavaPlugins.onAssembly(new FlowableScanSeed(this, seedSupplier, accumulator)); } @@ -14083,7 +14083,7 @@ public final Maybe singleElement() { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single single(T defaultItem) { - ObjectHelper.requireNonNull(defaultItem, "defaultItem is null"); + Objects.requireNonNull(defaultItem, "defaultItem is null"); return RxJavaPlugins.onAssembly(new FlowableSingleSingle(this, defaultItem)); } @@ -14405,8 +14405,8 @@ public final Flowable skipLast(long time, TimeUnit unit, Scheduler scheduler, @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable skipLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); // the internal buffer holds pairs of (timestamp, value) so double the default buffer size int s = bufferSize << 1; @@ -14439,7 +14439,7 @@ public final Flowable skipLast(long time, TimeUnit unit, Scheduler scheduler, @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable skipUntil(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableSkipUntil(this, other)); } @@ -14467,7 +14467,7 @@ public final Flowable skipUntil(Publisher other) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable skipWhile(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new FlowableSkipWhile(this, predicate)); } /** @@ -14523,7 +14523,7 @@ public final Flowable sorted() { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable sorted(Comparator sortFunction) { - ObjectHelper.requireNonNull(sortFunction, "sortFunction"); + Objects.requireNonNull(sortFunction, "sortFunction"); return toList().toFlowable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.>identity()); } @@ -14582,7 +14582,7 @@ public final Flowable startWithIterable(Iterable items) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable startWith(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return concatArray(other, this); } @@ -14614,7 +14614,7 @@ public final Flowable startWith(Publisher other) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable startWithItem(T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return concatArray(just(item), this); } @@ -14767,9 +14767,9 @@ public final Disposable subscribe(Consumer onNext, Consumer onNext, Consumer onError, Action onComplete) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); LambdaSubscriber ls = new LambdaSubscriber(onNext, onError, onComplete, FlowableInternalHelper.RequestMax.INSTANCE); @@ -14785,7 +14785,7 @@ public final void subscribe(Subscriber s) { if (s instanceof FlowableSubscriber) { subscribe((FlowableSubscriber)s); } else { - ObjectHelper.requireNonNull(s, "s is null"); + Objects.requireNonNull(s, "s is null"); subscribe(new StrictSubscriber(s)); } } @@ -14830,11 +14830,11 @@ public final void subscribe(Subscriber s) { @BackpressureSupport(BackpressureKind.SPECIAL) @SchedulerSupport(SchedulerSupport.NONE) public final void subscribe(FlowableSubscriber s) { - ObjectHelper.requireNonNull(s, "s is null"); + Objects.requireNonNull(s, "s is null"); try { Subscriber z = RxJavaPlugins.onSubscribe(this, s); - ObjectHelper.requireNonNull(z, "The RxJavaPlugins.onSubscribe hook returned a null FlowableSubscriber. Please check the handler provided to RxJavaPlugins.setOnFlowableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); + Objects.requireNonNull(z, "The RxJavaPlugins.onSubscribe hook returned a null FlowableSubscriber. Please check the handler provided to RxJavaPlugins.setOnFlowableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); subscribeActual(z); } catch (NullPointerException e) { // NOPMD @@ -14926,7 +14926,7 @@ public final > E subscribeWith(E subscriber) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable subscribeOn(@NonNull Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return subscribeOn(scheduler, !(this instanceof FlowableCreate)); } @@ -14964,7 +14964,7 @@ public final Flowable subscribeOn(@NonNull Scheduler scheduler) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable subscribeOn(@NonNull Scheduler scheduler, boolean requestOn) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableSubscribeOn(this, scheduler, requestOn)); } @@ -14995,7 +14995,7 @@ public final Flowable subscribeOn(@NonNull Scheduler scheduler, boolean reque @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable switchIfEmpty(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableSwitchIfEmpty(this, other)); } @@ -15111,7 +15111,7 @@ public final Flowable switchMap(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletable(this, mapper, false)); } @@ -15158,7 +15158,7 @@ public final Completable switchMapCompletable(@NonNull Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletable(this, mapper, true)); } @@ -15237,7 +15237,7 @@ public final Flowable switchMapDelayError(Function Flowable switchMap0(Function> mapper, int bufferSize, boolean delayError) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); if (this instanceof ScalarSupplier) { @SuppressWarnings("unchecked") @@ -15287,7 +15287,7 @@ Flowable switchMap0(Function> @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable switchMapMaybe(@NonNull Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe(this, mapper, false)); } @@ -15318,7 +15318,7 @@ public final Flowable switchMapMaybe(@NonNull Function Flowable switchMapMaybeDelayError(@NonNull Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe(this, mapper, true)); } @@ -15359,7 +15359,7 @@ public final Flowable switchMapMaybeDelayError(@NonNull Function Flowable switchMapSingle(@NonNull Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle(this, mapper, false)); } @@ -15390,7 +15390,7 @@ public final Flowable switchMapSingle(@NonNull Function Flowable switchMapSingleDelayError(@NonNull Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle(this, mapper, true)); } @@ -15650,8 +15650,8 @@ public final Flowable takeLast(long count, long time, TimeUnit unit, Schedule @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable takeLast(long count, long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); if (count < 0) { throw new IndexOutOfBoundsException("count >= 0 required but it was " + count); @@ -15862,7 +15862,7 @@ public final Flowable takeLast(long time, TimeUnit unit, Scheduler scheduler, @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable takeUntil(Predicate stopPredicate) { - ObjectHelper.requireNonNull(stopPredicate, "stopPredicate is null"); + Objects.requireNonNull(stopPredicate, "stopPredicate is null"); return RxJavaPlugins.onAssembly(new FlowableTakeUntilPredicate(this, stopPredicate)); } @@ -15892,7 +15892,7 @@ public final Flowable takeUntil(Predicate stopPredicate) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable takeUntil(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new FlowableTakeUntil(this, other)); } @@ -15921,7 +15921,7 @@ public final Flowable takeUntil(Publisher other) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable takeWhile(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new FlowableTakeWhile(this, predicate)); } @@ -15986,8 +15986,8 @@ public final Flowable throttleFirst(long windowDuration, TimeUnit unit) { @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable throttleFirst(long skipDuration, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableThrottleFirstTimed(this, skipDuration, unit, scheduler)); } @@ -16206,8 +16206,8 @@ public final Flowable throttleLatest(long timeout, TimeUnit unit, Scheduler s @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler, boolean emitLast) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableThrottleLatest(this, timeout, unit, scheduler, emitLast)); } @@ -16383,8 +16383,8 @@ public final Flowable> timeInterval(TimeUnit unit) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps. public final Flowable> timeInterval(TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableTimeInterval(this, unit, scheduler)); } @@ -16460,7 +16460,7 @@ public final Flowable timeout(Function> @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable timeout(Function> itemTimeoutIndicator, Flowable other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(null, itemTimeoutIndicator, other); } @@ -16523,7 +16523,7 @@ public final Flowable timeout(long timeout, TimeUnit timeUnit) { @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.COMPUTATION) public final Flowable timeout(long timeout, TimeUnit timeUnit, Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(timeout, timeUnit, other, Schedulers.computation()); } @@ -16561,7 +16561,7 @@ public final Flowable timeout(long timeout, TimeUnit timeUnit, Publisher timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(timeout, timeUnit, other, scheduler); } @@ -16634,7 +16634,7 @@ public final Flowable timeout(long timeout, TimeUnit timeUnit, Scheduler sche @SchedulerSupport(SchedulerSupport.NONE) public final Flowable timeout(Publisher firstTimeoutIndicator, Function> itemTimeoutIndicator) { - ObjectHelper.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null"); + Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null"); return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, null); } @@ -16682,15 +16682,15 @@ public final Flowable timeout( Publisher firstTimeoutIndicator, Function> itemTimeoutIndicator, Publisher other) { - ObjectHelper.requireNonNull(firstTimeoutIndicator, "firstTimeoutSelector is null"); - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutSelector is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other); } private Flowable timeout0(long timeout, TimeUnit timeUnit, Publisher other, Scheduler scheduler) { - ObjectHelper.requireNonNull(timeUnit, "timeUnit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(timeUnit, "timeUnit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed(this, timeout, timeUnit, scheduler, other)); } @@ -16698,7 +16698,7 @@ private Flowable timeout0( Publisher firstTimeoutIndicator, Function> itemTimeoutIndicator, Publisher other) { - ObjectHelper.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null"); + Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null"); return RxJavaPlugins.onAssembly(new FlowableTimeout(this, firstTimeoutIndicator, itemTimeoutIndicator, other)); } @@ -16804,8 +16804,8 @@ public final Flowable> timestamp(TimeUnit unit) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps. public final Flowable> timestamp(final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return map(Functions.timestampWith(unit, scheduler)); } @@ -16830,7 +16830,7 @@ public final Flowable> timestamp(final TimeUnit unit, final Scheduler s @BackpressureSupport(BackpressureKind.SPECIAL) @SchedulerSupport(SchedulerSupport.NONE) public final R to(@NonNull FlowableConverter converter) { - return ObjectHelper.requireNonNull(converter, "converter is null").apply(this); + return Objects.requireNonNull(converter, "converter is null").apply(this); } /** @@ -16938,7 +16938,7 @@ public final Single> toList(final int capacityHint) { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final > Single toList(Supplier collectionSupplier) { - ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null"); + Objects.requireNonNull(collectionSupplier, "collectionSupplier is null"); return RxJavaPlugins.onAssembly(new FlowableToListSingle(this, collectionSupplier)); } @@ -16973,7 +16973,7 @@ public final > Single toList(Supplier coll @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single> toMap(final Function keySelector) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); return collect(HashMapSupplier.asSupplier(), Functions.toMapKeySelector(keySelector)); } @@ -17012,8 +17012,8 @@ public final Single> toMap(final Function @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single> toMap(final Function keySelector, final Function valueSelector) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); return collect(HashMapSupplier.asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector)); } @@ -17053,8 +17053,8 @@ public final Single> toMap(final Function Single> toMap(final Function keySelector, final Function valueSelector, final Supplier> mapSupplier) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); return collect(mapSupplier, Functions.toMapKeyValueSelector(keySelector, valueSelector)); } @@ -17169,10 +17169,10 @@ public final Single>> toMultimap( final Function valueSelector, final Supplier>> mapSupplier, final Function> collectionFactory) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); - ObjectHelper.requireNonNull(mapSupplier, "mapSupplier is null"); - ObjectHelper.requireNonNull(collectionFactory, "collectionFactory is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(mapSupplier, "mapSupplier is null"); + Objects.requireNonNull(collectionFactory, "collectionFactory is null"); return collect(mapSupplier, Functions.toMultimapKeyValueSelector(keySelector, valueSelector, collectionFactory)); } @@ -17297,7 +17297,7 @@ public final Single> toSortedList() { @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single> toSortedList(final Comparator comparator) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(comparator, "comparator is null"); return toList().map(Functions.listSorter(comparator)); } @@ -17333,7 +17333,7 @@ public final Single> toSortedList(final Comparator comparator @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) @SchedulerSupport(SchedulerSupport.NONE) public final Single> toSortedList(final Comparator comparator, int capacityHint) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(comparator, "comparator is null"); return toList(capacityHint).map(Functions.listSorter(comparator)); } @@ -17395,7 +17395,7 @@ public final Single> toSortedList(int capacityHint) { @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.CUSTOM) public final Flowable unsubscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableUnsubscribeOn(this, scheduler)); } @@ -17638,8 +17638,8 @@ public final Flowable> window(long timespan, long timeskip, TimeUnit ObjectHelper.verifyPositive(bufferSize, "bufferSize"); ObjectHelper.verifyPositive(timespan, "timespan"); ObjectHelper.verifyPositive(timeskip, "timeskip"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); return RxJavaPlugins.onAssembly(new FlowableWindowTimed(this, timespan, timeskip, unit, scheduler, Long.MAX_VALUE, bufferSize, false)); } @@ -17952,8 +17952,8 @@ public final Flowable> window( long timespan, TimeUnit unit, Scheduler scheduler, long count, boolean restart, int bufferSize) { ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); ObjectHelper.verifyPositive(count, "count"); return RxJavaPlugins.onAssembly(new FlowableWindowTimed(this, timespan, timespan, unit, scheduler, count, bufferSize, restart)); } @@ -18028,7 +18028,7 @@ public final Flowable> window(Publisher boundaryIndicator) { @BackpressureSupport(BackpressureKind.ERROR) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable> window(Publisher boundaryIndicator, int bufferSize) { - ObjectHelper.requireNonNull(boundaryIndicator, "boundaryIndicator is null"); + Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableWindowBoundary(this, boundaryIndicator, bufferSize)); } @@ -18117,8 +18117,8 @@ public final Flowable> window( public final Flowable> window( Publisher openingIndicator, Function> closingIndicator, int bufferSize) { - ObjectHelper.requireNonNull(openingIndicator, "openingIndicator is null"); - ObjectHelper.requireNonNull(closingIndicator, "closingIndicator is null"); + Objects.requireNonNull(openingIndicator, "openingIndicator is null"); + Objects.requireNonNull(closingIndicator, "closingIndicator is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new FlowableWindowBoundarySelector(this, openingIndicator, closingIndicator, bufferSize)); } @@ -18157,8 +18157,8 @@ public final Flowable> window( @SchedulerSupport(SchedulerSupport.NONE) public final Flowable withLatestFrom(Publisher other, BiFunction combiner) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(combiner, "combiner is null"); return RxJavaPlugins.onAssembly(new FlowableWithLatestFrom(this, combiner, other)); } @@ -18195,8 +18195,8 @@ public final Flowable withLatestFrom(Publisher other, @SchedulerSupport(SchedulerSupport.NONE) public final Flowable withLatestFrom(Publisher source1, Publisher source2, Function3 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); Function f = Functions.toFunction(combiner); return withLatestFrom(new Publisher[] { source1, source2 }, f); } @@ -18237,9 +18237,9 @@ public final Flowable withLatestFrom( Publisher source1, Publisher source2, Publisher source3, Function4 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); Function f = Functions.toFunction(combiner); return withLatestFrom(new Publisher[] { source1, source2, source3 }, f); } @@ -18282,10 +18282,10 @@ public final Flowable withLatestFrom( Publisher source1, Publisher source2, Publisher source3, Publisher source4, Function5 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); Function f = Functions.toFunction(combiner); return withLatestFrom(new Publisher[] { source1, source2, source3, source4 }, f); } @@ -18318,8 +18318,8 @@ public final Flowable withLatestFrom( @BackpressureSupport(BackpressureKind.PASS_THROUGH) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable withLatestFrom(Publisher[] others, Function combiner) { - ObjectHelper.requireNonNull(others, "others is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(others, "others is null"); + Objects.requireNonNull(combiner, "combiner is null"); return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany(this, others, combiner)); } @@ -18351,8 +18351,8 @@ public final Flowable withLatestFrom(Publisher[] others, Function Flowable withLatestFrom(Iterable> others, Function combiner) { - ObjectHelper.requireNonNull(others, "others is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(others, "others is null"); + Objects.requireNonNull(combiner, "combiner is null"); return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany(this, others, combiner)); } @@ -18391,8 +18391,8 @@ public final Flowable withLatestFrom(Iterable> oth @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.NONE) public final Flowable zipWith(Iterable other, BiFunction zipper) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(zipper, "zipper is null"); return RxJavaPlugins.onAssembly(new FlowableZipIterable(this, other, zipper)); } @@ -18440,7 +18440,7 @@ public final Flowable zipWith(Iterable other, BiFunction Flowable zipWith(Publisher other, BiFunction zipper) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return zip(this, other, zipper); } @@ -18653,7 +18653,7 @@ public final TestSubscriber test(long initialRequest, boolean cancel) { // No @SchedulerSupport(SchedulerSupport.NONE) @NonNull public static Flowable<@NonNull T> fromOptional(@NonNull Optional optional) { - ObjectHelper.requireNonNull(optional, "optional is null"); + Objects.requireNonNull(optional, "optional is null"); return optional.map(Flowable::just).orElseGet(Flowable::empty); } @@ -18690,7 +18690,7 @@ public final TestSubscriber test(long initialRequest, boolean cancel) { // No @SchedulerSupport(SchedulerSupport.NONE) @NonNull public static Flowable<@NonNull T> fromCompletionStage(@NonNull CompletionStage stage) { - ObjectHelper.requireNonNull(stage, "stage is null"); + Objects.requireNonNull(stage, "stage is null"); return RxJavaPlugins.onAssembly(new FlowableFromCompletionStage<>(stage)); } @@ -18736,7 +18736,7 @@ public final TestSubscriber test(long initialRequest, boolean cancel) { // No @SchedulerSupport(SchedulerSupport.NONE) @NonNull public static Flowable<@NonNull T> fromStream(@NonNull Stream stream) { - ObjectHelper.requireNonNull(stream, "stream is null"); + Objects.requireNonNull(stream, "stream is null"); return RxJavaPlugins.onAssembly(new FlowableFromStream<>(stream)); } } diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java index 9bcf753e85..e3f4641ad3 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java +++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.core; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.concurrent.*; import org.reactivestreams.*; @@ -127,7 +128,7 @@ public abstract class Maybe implements MaybeSource { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe amb(final Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new MaybeAmb(null, sources)); } @@ -178,7 +179,7 @@ public static Maybe ambArray(final MaybeSource... sources) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Flowable concat(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new MaybeConcatIterable(sources)); } @@ -207,8 +208,8 @@ public static Flowable concat(Iterable @SchedulerSupport(SchedulerSupport.NONE) @SuppressWarnings("unchecked") public static Flowable concat(MaybeSource source1, MaybeSource source2) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return concatArray(source1, source2); } @@ -240,9 +241,9 @@ public static Flowable concat(MaybeSource source1, MaybeSour @SuppressWarnings("unchecked") public static Flowable concat( MaybeSource source1, MaybeSource source2, MaybeSource source3) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return concatArray(source1, source2, source3); } @@ -276,10 +277,10 @@ public static Flowable concat( @SuppressWarnings("unchecked") public static Flowable concat( MaybeSource source1, MaybeSource source2, MaybeSource source3, MaybeSource source4) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return concatArray(source1, source2, source3, source4); } @@ -331,7 +332,7 @@ public static Flowable concat(Publisher Flowable concat(Publisher> sources, int prefetch) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, MaybeToPublisher.instance(), prefetch, ErrorMode.IMMEDIATE)); } @@ -356,7 +357,7 @@ public static Flowable concat(Publisher Flowable concatArray(MaybeSource... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return Flowable.empty(); } @@ -444,7 +445,7 @@ public static Flowable concatArrayEager(MaybeSource... sourc @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Flowable concatDelayError(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return Flowable.fromIterable(sources).concatMapDelayError((Function)MaybeToPublisher.instance()); } @@ -574,7 +575,7 @@ public static Flowable concatEager(Publisher Maybe create(MaybeOnSubscribe onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); return RxJavaPlugins.onAssembly(new MaybeCreate(onSubscribe)); } @@ -594,7 +595,7 @@ public static Maybe create(MaybeOnSubscribe onSubscribe) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe defer(final Supplier> maybeSupplier) { - ObjectHelper.requireNonNull(maybeSupplier, "maybeSupplier is null"); + Objects.requireNonNull(maybeSupplier, "maybeSupplier is null"); return RxJavaPlugins.onAssembly(new MaybeDefer(maybeSupplier)); } @@ -639,7 +640,7 @@ public static Maybe empty() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe error(Throwable exception) { - ObjectHelper.requireNonNull(exception, "exception is null"); + Objects.requireNonNull(exception, "exception is null"); return RxJavaPlugins.onAssembly(new MaybeError(exception)); } @@ -665,7 +666,7 @@ public static Maybe error(Throwable exception) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe error(Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "errorSupplier is null"); + Objects.requireNonNull(supplier, "errorSupplier is null"); return RxJavaPlugins.onAssembly(new MaybeErrorCallable(supplier)); } @@ -692,7 +693,7 @@ public static Maybe error(Supplier supplier) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe fromAction(final Action run) { - ObjectHelper.requireNonNull(run, "run is null"); + Objects.requireNonNull(run, "run is null"); return RxJavaPlugins.onAssembly(new MaybeFromAction(run)); } @@ -712,7 +713,7 @@ public static Maybe fromAction(final Action run) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe fromCompletable(CompletableSource completableSource) { - ObjectHelper.requireNonNull(completableSource, "completableSource is null"); + Objects.requireNonNull(completableSource, "completableSource is null"); return RxJavaPlugins.onAssembly(new MaybeFromCompletable(completableSource)); } @@ -732,7 +733,7 @@ public static Maybe fromCompletable(CompletableSource completableSource) @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe fromSingle(SingleSource singleSource) { - ObjectHelper.requireNonNull(singleSource, "singleSource is null"); + Objects.requireNonNull(singleSource, "singleSource is null"); return RxJavaPlugins.onAssembly(new MaybeFromSingle(singleSource)); } @@ -776,7 +777,7 @@ public static Maybe fromSingle(SingleSource singleSource) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe fromCallable(@NonNull final Callable callable) { - ObjectHelper.requireNonNull(callable, "callable is null"); + Objects.requireNonNull(callable, "callable is null"); return RxJavaPlugins.onAssembly(new MaybeFromCallable(callable)); } @@ -810,7 +811,7 @@ public static Maybe fromCallable(@NonNull final Callable cal @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe fromFuture(Future future) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return RxJavaPlugins.onAssembly(new MaybeFromFuture(future, 0L, null)); } @@ -848,8 +849,8 @@ public static Maybe fromFuture(Future future) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe fromFuture(Future future, long timeout, TimeUnit unit) { - ObjectHelper.requireNonNull(future, "future is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(future, "future is null"); + Objects.requireNonNull(unit, "unit is null"); return RxJavaPlugins.onAssembly(new MaybeFromFuture(future, timeout, unit)); } @@ -869,7 +870,7 @@ public static Maybe fromFuture(Future future, long timeout, @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe fromRunnable(final Runnable run) { - ObjectHelper.requireNonNull(run, "run is null"); + Objects.requireNonNull(run, "run is null"); return RxJavaPlugins.onAssembly(new MaybeFromRunnable(run)); } @@ -916,7 +917,7 @@ public static Maybe fromRunnable(final Runnable run) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe fromSupplier(@NonNull final Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new MaybeFromSupplier(supplier)); } @@ -943,7 +944,7 @@ public static Maybe fromSupplier(@NonNull final Supplier sup @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe just(T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return RxJavaPlugins.onAssembly(new MaybeJust(item)); } @@ -1049,7 +1050,7 @@ public static Flowable merge(Publisher @SchedulerSupport(SchedulerSupport.NONE) @SuppressWarnings({ "unchecked", "rawtypes" }) public static Flowable merge(Publisher> sources, int maxConcurrency) { - ObjectHelper.requireNonNull(sources, "source is null"); + Objects.requireNonNull(sources, "source is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), false, maxConcurrency, 1)); } @@ -1082,7 +1083,7 @@ public static Flowable merge(Publisher @SchedulerSupport(SchedulerSupport.NONE) @SuppressWarnings({ "unchecked", "rawtypes" }) public static Maybe merge(MaybeSource> source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return RxJavaPlugins.onAssembly(new MaybeFlatten(source, Functions.identity())); } @@ -1130,8 +1131,8 @@ public static Maybe merge(MaybeSource> public static Flowable merge( MaybeSource source1, MaybeSource source2 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return mergeArray(source1, source2); } @@ -1182,9 +1183,9 @@ public static Flowable merge( MaybeSource source1, MaybeSource source2, MaybeSource source3 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return mergeArray(source1, source2, source3); } @@ -1237,10 +1238,10 @@ public static Flowable merge( MaybeSource source1, MaybeSource source2, MaybeSource source3, MaybeSource source4 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return mergeArray(source1, source2, source3, source4); } @@ -1277,7 +1278,7 @@ public static Flowable merge( @SchedulerSupport(SchedulerSupport.NONE) @SuppressWarnings("unchecked") public static Flowable mergeArray(MaybeSource... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return Flowable.empty(); } @@ -1431,7 +1432,7 @@ public static Flowable mergeDelayError(Publisher Flowable mergeDelayError(Publisher> sources, int maxConcurrency) { - ObjectHelper.requireNonNull(sources, "source is null"); + Objects.requireNonNull(sources, "source is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), true, maxConcurrency, 1)); } @@ -1470,8 +1471,8 @@ public static Flowable mergeDelayError(Publisher Flowable mergeDelayError(MaybeSource source1, MaybeSource source2) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return mergeArrayDelayError(source1, source2); } @@ -1513,9 +1514,9 @@ public static Flowable mergeDelayError(MaybeSource source1, @SchedulerSupport(SchedulerSupport.NONE) public static Flowable mergeDelayError(MaybeSource source1, MaybeSource source2, MaybeSource source3) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return mergeArrayDelayError(source1, source2, source3); } @@ -1560,10 +1561,10 @@ public static Flowable mergeDelayError(MaybeSource source1, public static Flowable mergeDelayError( MaybeSource source1, MaybeSource source2, MaybeSource source3, MaybeSource source4) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return mergeArrayDelayError(source1, source2, source3, source4); } @@ -1643,9 +1644,9 @@ public static Single sequenceEqual(MaybeSource source1 @SchedulerSupport(SchedulerSupport.NONE) public static Single sequenceEqual(MaybeSource source1, MaybeSource source2, BiPredicate isEqual) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(isEqual, "isEqual is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(isEqual, "isEqual is null"); return RxJavaPlugins.onAssembly(new MaybeEqualSingle(source1, source2, isEqual)); } @@ -1693,8 +1694,8 @@ public static Maybe timer(long delay, TimeUnit unit) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public static Maybe timer(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new MaybeTimer(Math.max(0L, delay), unit, scheduler)); } @@ -1717,7 +1718,7 @@ public static Maybe unsafeCreate(MaybeSource onSubscribe) { if (onSubscribe instanceof Maybe) { throw new IllegalArgumentException("unsafeCreate(Maybe) should be upgraded"); } - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate(onSubscribe)); } @@ -1785,9 +1786,9 @@ public static Maybe using(Supplier resourceSupplier, public static Maybe using(Supplier resourceSupplier, Function> sourceSupplier, Consumer resourceDisposer, boolean eager) { - ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); - ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null"); - ObjectHelper.requireNonNull(resourceDisposer, "disposer is null"); + Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); + Objects.requireNonNull(sourceSupplier, "sourceSupplier is null"); + Objects.requireNonNull(resourceDisposer, "disposer is null"); return RxJavaPlugins.onAssembly(new MaybeUsing(resourceSupplier, sourceSupplier, resourceDisposer, eager)); } @@ -1809,7 +1810,7 @@ public static Maybe wrap(MaybeSource source) { if (source instanceof Maybe) { return RxJavaPlugins.onAssembly((Maybe)source); } - ObjectHelper.requireNonNull(source, "onSubscribe is null"); + Objects.requireNonNull(source, "onSubscribe is null"); return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate(source)); } @@ -1844,8 +1845,8 @@ public static Maybe wrap(MaybeSource source) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Maybe zip(Iterable> sources, Function zipper) { - ObjectHelper.requireNonNull(zipper, "zipper is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new MaybeZipIterable(sources, zipper)); } @@ -1882,8 +1883,8 @@ public static Maybe zip(Iterable> s public static Maybe zip( MaybeSource source1, MaybeSource source2, BiFunction zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return zipArray(Functions.toFunction(zipper), source1, source2); } @@ -1923,9 +1924,9 @@ public static Maybe zip( public static Maybe zip( MaybeSource source1, MaybeSource source2, MaybeSource source3, Function3 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3); } @@ -1969,10 +1970,10 @@ public static Maybe zip( MaybeSource source1, MaybeSource source2, MaybeSource source3, MaybeSource source4, Function4 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4); } @@ -2019,11 +2020,11 @@ public static Maybe zip( MaybeSource source1, MaybeSource source2, MaybeSource source3, MaybeSource source4, MaybeSource source5, Function5 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5); } @@ -2073,12 +2074,12 @@ public static Maybe zip( MaybeSource source1, MaybeSource source2, MaybeSource source3, MaybeSource source4, MaybeSource source5, MaybeSource source6, Function6 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6); } @@ -2132,13 +2133,13 @@ public static Maybe zip( MaybeSource source4, MaybeSource source5, MaybeSource source6, MaybeSource source7, Function7 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7); } @@ -2195,14 +2196,14 @@ public static Maybe zip( MaybeSource source4, MaybeSource source5, MaybeSource source6, MaybeSource source7, MaybeSource source8, Function8 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8); } @@ -2262,15 +2263,15 @@ public static Maybe zip( MaybeSource source7, MaybeSource source8, MaybeSource source9, Function9 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); - ObjectHelper.requireNonNull(source9, "source9 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source9, "source9 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8, source9); } @@ -2306,11 +2307,11 @@ public static Maybe zip( @SchedulerSupport(SchedulerSupport.NONE) public static Maybe zipArray(Function zipper, MaybeSource... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return empty(); } - ObjectHelper.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(zipper, "zipper is null"); return RxJavaPlugins.onAssembly(new MaybeZipArray(sources, zipper)); } @@ -2339,7 +2340,7 @@ public static Maybe zipArray(Function z @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe ambWith(MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return ambArray(this, other); } @@ -2381,7 +2382,7 @@ public final T blockingGet() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final T blockingGet(T defaultValue) { - ObjectHelper.requireNonNull(defaultValue, "defaultValue is null"); + Objects.requireNonNull(defaultValue, "defaultValue is null"); BlockingMultiObserver observer = new BlockingMultiObserver(); subscribe(observer); return observer.blockingGet(defaultValue); @@ -2429,7 +2430,7 @@ public final Maybe cache() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe cast(final Class clazz) { - ObjectHelper.requireNonNull(clazz, "clazz is null"); + Objects.requireNonNull(clazz, "clazz is null"); return map(Functions.castFunction(clazz)); } @@ -2455,7 +2456,7 @@ public final Maybe cast(final Class clazz) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Maybe compose(MaybeTransformer transformer) { - return wrap(((MaybeTransformer) ObjectHelper.requireNonNull(transformer, "transformer is null")).apply(this)); + return wrap(((MaybeTransformer) Objects.requireNonNull(transformer, "transformer is null")).apply(this)); } /** @@ -2478,7 +2479,7 @@ public final Maybe compose(MaybeTransformer trans @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe concatMap(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatten(this, mapper)); } @@ -2505,7 +2506,7 @@ public final Maybe concatMap(Function concatWith(MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return concat(this, other); } @@ -2529,7 +2530,7 @@ public final Flowable concatWith(MaybeSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single contains(final Object item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return RxJavaPlugins.onAssembly(new MaybeContains(this, item)); } @@ -2573,7 +2574,7 @@ public final Single count() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single defaultIfEmpty(T defaultItem) { - ObjectHelper.requireNonNull(defaultItem, "defaultItem is null"); + Objects.requireNonNull(defaultItem, "defaultItem is null"); return RxJavaPlugins.onAssembly(new MaybeToSingle(this, defaultItem)); } @@ -2624,8 +2625,8 @@ public final Maybe delay(long delay, TimeUnit unit) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Maybe delay(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new MaybeDelay(this, Math.max(0L, delay), unit, scheduler)); } @@ -2656,7 +2657,7 @@ public final Maybe delay(long delay, TimeUnit unit, Scheduler scheduler) { @SchedulerSupport(SchedulerSupport.NONE) @BackpressureSupport(BackpressureKind.UNBOUNDED_IN) public final Maybe delay(Publisher delayIndicator) { - ObjectHelper.requireNonNull(delayIndicator, "delayIndicator is null"); + Objects.requireNonNull(delayIndicator, "delayIndicator is null"); return RxJavaPlugins.onAssembly(new MaybeDelayOtherPublisher(this, delayIndicator)); } @@ -2683,7 +2684,7 @@ public final Maybe delay(Publisher delayIndicator) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe delaySubscription(Publisher subscriptionIndicator) { - ObjectHelper.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null"); + Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null"); return RxJavaPlugins.onAssembly(new MaybeDelaySubscriptionOtherPublisher(this, subscriptionIndicator)); } @@ -2753,7 +2754,7 @@ public final Maybe delaySubscription(long delay, TimeUnit unit, Scheduler sch @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe doAfterSuccess(Consumer onAfterSuccess) { - ObjectHelper.requireNonNull(onAfterSuccess, "onAfterSuccess is null"); + Objects.requireNonNull(onAfterSuccess, "onAfterSuccess is null"); return RxJavaPlugins.onAssembly(new MaybeDoAfterSuccess(this, onAfterSuccess)); } @@ -2783,7 +2784,7 @@ public final Maybe doAfterTerminate(Action onAfterTerminate) { Functions.emptyConsumer(), // onSuccess Functions.emptyConsumer(), // onError Functions.EMPTY_ACTION, // onComplete - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"), + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"), Functions.EMPTY_ACTION // dispose )); } @@ -2808,7 +2809,7 @@ public final Maybe doAfterTerminate(Action onAfterTerminate) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe doFinally(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "onFinally is null"); + Objects.requireNonNull(onFinally, "onFinally is null"); return RxJavaPlugins.onAssembly(new MaybeDoFinally(this, onFinally)); } @@ -2833,7 +2834,7 @@ public final Maybe doOnDispose(Action onDispose) { Functions.emptyConsumer(), // onError Functions.EMPTY_ACTION, // onComplete Functions.EMPTY_ACTION, // (onSuccess | onError | onComplete) after - ObjectHelper.requireNonNull(onDispose, "onDispose is null") + Objects.requireNonNull(onDispose, "onDispose is null") )); } @@ -2859,7 +2860,7 @@ public final Maybe doOnComplete(Action onComplete) { Functions.emptyConsumer(), // onSubscribe Functions.emptyConsumer(), // onSuccess Functions.emptyConsumer(), // onError - ObjectHelper.requireNonNull(onComplete, "onComplete is null"), + Objects.requireNonNull(onComplete, "onComplete is null"), Functions.EMPTY_ACTION, // (onSuccess | onError | onComplete) Functions.EMPTY_ACTION // dispose )); @@ -2884,7 +2885,7 @@ public final Maybe doOnError(Consumer onError) { return RxJavaPlugins.onAssembly(new MaybePeek(this, Functions.emptyConsumer(), // onSubscribe Functions.emptyConsumer(), // onSuccess - ObjectHelper.requireNonNull(onError, "onError is null"), + Objects.requireNonNull(onError, "onError is null"), Functions.EMPTY_ACTION, // onComplete Functions.EMPTY_ACTION, // (onSuccess | onError | onComplete) Functions.EMPTY_ACTION // dispose @@ -2910,7 +2911,7 @@ public final Maybe doOnError(Consumer onError) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Maybe doOnEvent(BiConsumer onEvent) { - ObjectHelper.requireNonNull(onEvent, "onEvent is null"); + Objects.requireNonNull(onEvent, "onEvent is null"); return RxJavaPlugins.onAssembly(new MaybeDoOnEvent(this, onEvent)); } @@ -2929,7 +2930,7 @@ public final Maybe doOnEvent(BiConsumer onEvent @SchedulerSupport(SchedulerSupport.NONE) public final Maybe doOnSubscribe(Consumer onSubscribe) { return RxJavaPlugins.onAssembly(new MaybePeek(this, - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"), + Objects.requireNonNull(onSubscribe, "onSubscribe is null"), Functions.emptyConsumer(), // onSuccess Functions.emptyConsumer(), // onError Functions.EMPTY_ACTION, // onComplete @@ -2961,7 +2962,7 @@ public final Maybe doOnSubscribe(Consumer onSubscribe) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe doOnTerminate(final Action onTerminate) { - ObjectHelper.requireNonNull(onTerminate, "onTerminate is null"); + Objects.requireNonNull(onTerminate, "onTerminate is null"); return RxJavaPlugins.onAssembly(new MaybeDoOnTerminate(this, onTerminate)); } @@ -2983,7 +2984,7 @@ public final Maybe doOnTerminate(final Action onTerminate) { public final Maybe doOnSuccess(Consumer onSuccess) { return RxJavaPlugins.onAssembly(new MaybePeek(this, Functions.emptyConsumer(), // onSubscribe - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"), + Objects.requireNonNull(onSuccess, "onSuccess is null"), Functions.emptyConsumer(), // onError Functions.EMPTY_ACTION, // onComplete Functions.EMPTY_ACTION, // (onSuccess | onError | onComplete) @@ -3012,7 +3013,7 @@ public final Maybe doOnSuccess(Consumer onSuccess) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe filter(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new MaybeFilter(this, predicate)); } @@ -3037,7 +3038,7 @@ public final Maybe filter(Predicate predicate) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe flatMap(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatten(this, mapper)); } @@ -3069,9 +3070,9 @@ public final Maybe flatMap( Function> onSuccessMapper, Function> onErrorMapper, Supplier> onCompleteSupplier) { - ObjectHelper.requireNonNull(onSuccessMapper, "onSuccessMapper is null"); - ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); - ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); + Objects.requireNonNull(onSuccessMapper, "onSuccessMapper is null"); + Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); + Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapNotification(this, onSuccessMapper, onErrorMapper, onCompleteSupplier)); } @@ -3102,8 +3103,8 @@ public final Maybe flatMap( @SchedulerSupport(SchedulerSupport.NONE) public final Maybe flatMap(Function> mapper, BiFunction resultSelector) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - ObjectHelper.requireNonNull(resultSelector, "resultSelector is null"); + Objects.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(resultSelector, "resultSelector is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapBiSelector(this, mapper, resultSelector)); } @@ -3132,7 +3133,7 @@ public final Maybe flatMap(Function Flowable flattenAsFlowable(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableFlowable(this, mapper)); } @@ -3158,7 +3159,7 @@ public final Flowable flattenAsFlowable(final Function Observable flattenAsObservable(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableObservable(this, mapper)); } @@ -3182,7 +3183,7 @@ public final Observable flattenAsObservable(final Function Observable flatMapObservable(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapObservable(this, mapper)); } @@ -3210,7 +3211,7 @@ public final Observable flatMapObservable(Function Flowable flatMapPublisher(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapPublisher(this, mapper)); } @@ -3236,7 +3237,7 @@ public final Flowable flatMapPublisher(Function Single flatMapSingle(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapSingle(this, mapper)); } @@ -3264,7 +3265,7 @@ public final Single flatMapSingle(final Function Maybe flatMapSingleElement(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapSingleElement(this, mapper)); } @@ -3288,7 +3289,7 @@ public final Maybe flatMapSingleElement(final Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeFlatMapCompletable(this, mapper)); } @@ -3500,7 +3501,7 @@ public final Single isEmpty() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe lift(final MaybeOperator lift) { - ObjectHelper.requireNonNull(lift, "lift is null"); + Objects.requireNonNull(lift, "lift is null"); return RxJavaPlugins.onAssembly(new MaybeLift(this, lift)); } @@ -3524,7 +3525,7 @@ public final Maybe lift(final MaybeOperator lift) @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe map(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new MaybeMap(this, mapper)); } @@ -3572,7 +3573,7 @@ public final Single> materialize() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Flowable mergeWith(MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return merge(this, other); } @@ -3598,7 +3599,7 @@ public final Flowable mergeWith(MaybeSource other) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Maybe observeOn(final Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new MaybeObserveOn(this, scheduler)); } @@ -3622,7 +3623,7 @@ public final Maybe observeOn(final Scheduler scheduler) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe ofType(final Class clazz) { - ObjectHelper.requireNonNull(clazz, "clazz is null"); + Objects.requireNonNull(clazz, "clazz is null"); return filter(Functions.isInstanceOf(clazz)).cast(clazz); } @@ -3644,7 +3645,7 @@ public final Maybe ofType(final Class clazz) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final R to(@NonNull MaybeConverter converter) { - return ObjectHelper.requireNonNull(converter, "converter is null").apply(this); + return Objects.requireNonNull(converter, "converter is null").apply(this); } /** @@ -3733,7 +3734,7 @@ public final Maybe onErrorComplete() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe onErrorComplete(final Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new MaybeOnErrorComplete(this, predicate)); } @@ -3761,7 +3762,7 @@ public final Maybe onErrorComplete(final Predicate predica @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe onErrorResumeWith(final MaybeSource next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return onErrorResumeNext(Functions.justFunction(next)); } @@ -3788,7 +3789,7 @@ public final Maybe onErrorResumeWith(final MaybeSource next) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe onErrorResumeNext(Function> resumeFunction) { - ObjectHelper.requireNonNull(resumeFunction, "resumeFunction is null"); + Objects.requireNonNull(resumeFunction, "resumeFunction is null"); return RxJavaPlugins.onAssembly(new MaybeOnErrorNext(this, resumeFunction, true)); } @@ -3815,7 +3816,7 @@ public final Maybe onErrorResumeNext(Function onErrorReturn(Function valueSupplier) { - ObjectHelper.requireNonNull(valueSupplier, "valueSupplier is null"); + Objects.requireNonNull(valueSupplier, "valueSupplier is null"); return RxJavaPlugins.onAssembly(new MaybeOnErrorReturn(this, valueSupplier)); } @@ -3841,7 +3842,7 @@ public final Maybe onErrorReturn(Function val @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe onErrorReturnItem(final T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return onErrorReturn(Functions.justFunction(item)); } @@ -3871,7 +3872,7 @@ public final Maybe onErrorReturnItem(final T item) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe onExceptionResumeNext(final MaybeSource next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return RxJavaPlugins.onAssembly(new MaybeOnErrorNext(this, Functions.justFunction(next), false)); } @@ -4114,7 +4115,7 @@ public final Maybe retry(Predicate predicate) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe retryUntil(final BooleanSupplier stop) { - ObjectHelper.requireNonNull(stop, "stop is null"); + Objects.requireNonNull(stop, "stop is null"); return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop)); } @@ -4298,20 +4299,20 @@ public final Disposable subscribe(Consumer onSuccess, Consumer onSuccess, Consumer onError, Action onComplete) { - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onSuccess, "onSuccess is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); return subscribeWith(new MaybeCallbackObserver(onSuccess, onError, onComplete)); } @SchedulerSupport(SchedulerSupport.NONE) @Override public final void subscribe(MaybeObserver observer) { - ObjectHelper.requireNonNull(observer, "observer is null"); + Objects.requireNonNull(observer, "observer is null"); observer = RxJavaPlugins.onSubscribe(this, observer); - ObjectHelper.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null MaybeObserver. Please check the handler provided to RxJavaPlugins.setOnMaybeSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); + Objects.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null MaybeObserver. Please check the handler provided to RxJavaPlugins.setOnMaybeSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); try { subscribeActual(observer); @@ -4354,7 +4355,7 @@ public final void subscribe(MaybeObserver observer) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Maybe subscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new MaybeSubscribeOn(this, scheduler)); } @@ -4407,7 +4408,7 @@ public final > E subscribeWith(E observer) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe switchIfEmpty(MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new MaybeSwitchIfEmpty(this, other)); } @@ -4431,7 +4432,7 @@ public final Maybe switchIfEmpty(MaybeSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single switchIfEmpty(SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new MaybeSwitchIfEmptySingle(this, other)); } @@ -4457,7 +4458,7 @@ public final Single switchIfEmpty(SingleSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe takeUntil(MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new MaybeTakeUntilMaybe(this, other)); } @@ -4487,7 +4488,7 @@ public final Maybe takeUntil(MaybeSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe takeUntil(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new MaybeTakeUntilPublisher(this, other)); } @@ -4539,7 +4540,7 @@ public final Maybe timeout(long timeout, TimeUnit timeUnit) { @NonNull @SchedulerSupport(SchedulerSupport.COMPUTATION) public final Maybe timeout(long timeout, TimeUnit timeUnit, MaybeSource fallback) { - ObjectHelper.requireNonNull(fallback, "fallback is null"); + Objects.requireNonNull(fallback, "fallback is null"); return timeout(timeout, timeUnit, Schedulers.computation(), fallback); } @@ -4570,7 +4571,7 @@ public final Maybe timeout(long timeout, TimeUnit timeUnit, MaybeSource timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, MaybeSource fallback) { - ObjectHelper.requireNonNull(fallback, "fallback is null"); + Objects.requireNonNull(fallback, "fallback is null"); return timeout(timer(timeout, timeUnit, scheduler), fallback); } @@ -4617,7 +4618,7 @@ public final Maybe timeout(long timeout, TimeUnit timeUnit, Scheduler schedul @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe timeout(MaybeSource timeoutIndicator) { - ObjectHelper.requireNonNull(timeoutIndicator, "timeoutIndicator is null"); + Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null"); return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe(this, timeoutIndicator, null)); } @@ -4639,8 +4640,8 @@ public final Maybe timeout(MaybeSource timeoutIndicator) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe timeout(MaybeSource timeoutIndicator, MaybeSource fallback) { - ObjectHelper.requireNonNull(timeoutIndicator, "timeoutIndicator is null"); - ObjectHelper.requireNonNull(fallback, "fallback is null"); + Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null"); + Objects.requireNonNull(fallback, "fallback is null"); return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe(this, timeoutIndicator, fallback)); } @@ -4664,7 +4665,7 @@ public final Maybe timeout(MaybeSource timeoutIndicator, MaybeSource Maybe timeout(Publisher timeoutIndicator) { - ObjectHelper.requireNonNull(timeoutIndicator, "timeoutIndicator is null"); + Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null"); return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher(this, timeoutIndicator, null)); } @@ -4690,8 +4691,8 @@ public final Maybe timeout(Publisher timeoutIndicator) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe timeout(Publisher timeoutIndicator, MaybeSource fallback) { - ObjectHelper.requireNonNull(timeoutIndicator, "timeoutIndicator is null"); - ObjectHelper.requireNonNull(fallback, "fallback is null"); + Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null"); + Objects.requireNonNull(fallback, "fallback is null"); return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher(this, timeoutIndicator, fallback)); } @@ -4712,7 +4713,7 @@ public final Maybe timeout(Publisher timeoutIndicator, MaybeSource unsubscribeOn(final Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new MaybeUnsubscribeOn(this, scheduler)); } @@ -4746,7 +4747,7 @@ public final Maybe unsubscribeOn(final Scheduler scheduler) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe zipWith(MaybeSource other, BiFunction zipper) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return zip(this, other, zipper); } diff --git a/src/main/java/io/reactivex/rxjava3/core/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java index b3270483a7..8f8ae5c4d8 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Notification.java +++ b/src/main/java/io/reactivex/rxjava3/core/Notification.java @@ -14,7 +14,6 @@ package io.reactivex.rxjava3.core; import io.reactivex.rxjava3.annotations.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.NotificationLite; import java.util.Objects; @@ -128,7 +127,7 @@ public String toString() { */ @NonNull public static Notification createOnNext(@NonNull T value) { - ObjectHelper.requireNonNull(value, "value is null"); + Objects.requireNonNull(value, "value is null"); return new Notification(value); } @@ -141,7 +140,7 @@ public static Notification createOnNext(@NonNull T value) { */ @NonNull public static Notification createOnError(@NonNull Throwable error) { - ObjectHelper.requireNonNull(error, "error is null"); + Objects.requireNonNull(error, "error is null"); return new Notification(NotificationLite.error(error)); } diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java index ce0815477f..63406824ba 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Observable.java +++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java @@ -119,7 +119,7 @@ public abstract class Observable implements ObservableSource { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable amb(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new ObservableAmb(null, sources)); } @@ -146,7 +146,7 @@ public static Observable amb(Iterable Observable ambArray(ObservableSource... sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); int len = sources.length; if (len == 0) { return empty(); @@ -252,8 +252,8 @@ public static Observable combineLatest(Iterable Observable combineLatest(Iterable> sources, Function combiner, int bufferSize) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); // the queue holds a pair of values so we need to double the capacity @@ -345,11 +345,11 @@ public static Observable combineLatestArray(ObservableSource Observable combineLatestArray(ObservableSource[] sources, Function combiner, int bufferSize) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return empty(); } - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); // the queue holds a pair of values so we need to double the capacity @@ -392,8 +392,8 @@ public static Observable combineLatestArray(ObservableSource Observable combineLatest( ObservableSource source1, ObservableSource source2, BiFunction combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return combineLatestArray(new ObservableSource[] { source1, source2 }, Functions.toFunction(combiner), bufferSize()); } @@ -436,9 +436,9 @@ public static Observable combineLatest( ObservableSource source1, ObservableSource source2, ObservableSource source3, Function3 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return combineLatestArray(new ObservableSource[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize()); } @@ -484,10 +484,10 @@ public static Observable combineLatest( ObservableSource source1, ObservableSource source2, ObservableSource source3, ObservableSource source4, Function4 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize()); } @@ -537,11 +537,11 @@ public static Observable combineLatest( ObservableSource source3, ObservableSource source4, ObservableSource source5, Function5 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize()); } @@ -594,12 +594,12 @@ public static Observable combineLatest( ObservableSource source3, ObservableSource source4, ObservableSource source5, ObservableSource source6, Function6 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize()); } @@ -656,13 +656,13 @@ public static Observable combineLatest( ObservableSource source5, ObservableSource source6, ObservableSource source7, Function7 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize()); } @@ -722,14 +722,14 @@ public static Observable combineLatest( ObservableSource source5, ObservableSource source6, ObservableSource source7, ObservableSource source8, Function8 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize()); } @@ -793,15 +793,15 @@ public static Observable combineLates ObservableSource source7, ObservableSource source8, ObservableSource source9, Function9 combiner) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); - ObjectHelper.requireNonNull(source9, "source9 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source9, "source9 is null"); return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize()); } @@ -891,7 +891,7 @@ public static Observable combineLatestDelayError(ObservableSource Observable combineLatestDelayError(ObservableSource[] sources, Function combiner, int bufferSize) { ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(combiner, "combiner is null"); if (sources.length == 0) { return empty(); } @@ -986,8 +986,8 @@ public static Observable combineLatestDelayError(Iterable Observable combineLatestDelayError(Iterable> sources, Function combiner, int bufferSize) { - ObjectHelper.requireNonNull(sources, "sources is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(combiner, "combiner is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); // the queue holds a pair of values so we need to double the capacity @@ -1013,7 +1013,7 @@ public static Observable combineLatestDelayError(Iterable Observable concat(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, bufferSize()); } @@ -1064,7 +1064,7 @@ public static Observable concat(ObservableSource Observable concat(ObservableSource> sources, int prefetch) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), prefetch, ErrorMode.IMMEDIATE)); } @@ -1093,8 +1093,8 @@ public static Observable concat(ObservableSource Observable concat(ObservableSource source1, ObservableSource source2) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return concatArray(source1, source2); } @@ -1126,9 +1126,9 @@ public static Observable concat(ObservableSource source1, Ob public static Observable concat( ObservableSource source1, ObservableSource source2, ObservableSource source3) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return concatArray(source1, source2, source3); } @@ -1162,10 +1162,10 @@ public static Observable concat( public static Observable concat( ObservableSource source1, ObservableSource source2, ObservableSource source3, ObservableSource source4) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return concatArray(source1, source2, source3, source4); } @@ -1344,7 +1344,7 @@ public static Observable concatArrayEagerDelayError(int maxConcurrency, i @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable concatDelayError(Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return concatDelayError(fromIterable(sources)); } @@ -1390,7 +1390,7 @@ public static Observable concatDelayError(ObservableSource Observable concatDelayError(ObservableSource> sources, int prefetch, boolean tillTheEnd) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch is null"); return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY)); } @@ -1549,7 +1549,7 @@ public static Observable concatEager(Iterable Observable create(ObservableOnSubscribe source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return RxJavaPlugins.onAssembly(new ObservableCreate(source)); } @@ -1581,7 +1581,7 @@ public static Observable create(ObservableOnSubscribe source) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable defer(Supplier> supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new ObservableDefer(supplier)); } @@ -1630,7 +1630,7 @@ public static Observable empty() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable error(Supplier errorSupplier) { - ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); + Objects.requireNonNull(errorSupplier, "errorSupplier is null"); return RxJavaPlugins.onAssembly(new ObservableError(errorSupplier)); } @@ -1656,7 +1656,7 @@ public static Observable error(Supplier errorSupplie @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable error(final Throwable exception) { - ObjectHelper.requireNonNull(exception, "exception is null"); + Objects.requireNonNull(exception, "exception is null"); return error(Functions.justSupplier(exception)); } @@ -1680,7 +1680,7 @@ public static Observable error(final Throwable exception) { @SchedulerSupport(SchedulerSupport.NONE) @NonNull public static Observable fromArray(T... items) { - ObjectHelper.requireNonNull(items, "items is null"); + Objects.requireNonNull(items, "items is null"); if (items.length == 0) { return empty(); } @@ -1723,7 +1723,7 @@ public static Observable fromArray(T... items) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable fromCallable(Callable supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new ObservableFromCallable(supplier)); } @@ -1757,7 +1757,7 @@ public static Observable fromCallable(Callable supplier) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable fromFuture(Future future) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return RxJavaPlugins.onAssembly(new ObservableFromFuture(future, 0L, null)); } @@ -1795,8 +1795,8 @@ public static Observable fromFuture(Future future) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable fromFuture(Future future, long timeout, TimeUnit unit) { - ObjectHelper.requireNonNull(future, "future is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(future, "future is null"); + Objects.requireNonNull(unit, "unit is null"); return RxJavaPlugins.onAssembly(new ObservableFromFuture(future, timeout, unit)); } @@ -1837,7 +1837,7 @@ public static Observable fromFuture(Future future, long time @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public static Observable fromFuture(Future future, long timeout, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); Observable o = fromFuture(future, timeout, unit); return o.subscribeOn(scheduler); } @@ -1873,7 +1873,7 @@ public static Observable fromFuture(Future future, long time @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public static Observable fromFuture(Future future, Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); Observable o = fromFuture(future); return o.subscribeOn(scheduler); } @@ -1899,7 +1899,7 @@ public static Observable fromFuture(Future future, Scheduler @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable fromIterable(Iterable source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return RxJavaPlugins.onAssembly(new ObservableFromIterable(source)); } @@ -1936,7 +1936,7 @@ public static Observable fromIterable(Iterable source) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable fromPublisher(Publisher publisher) { - ObjectHelper.requireNonNull(publisher, "publisher is null"); + Objects.requireNonNull(publisher, "publisher is null"); return RxJavaPlugins.onAssembly(new ObservableFromPublisher(publisher)); } @@ -1973,7 +1973,7 @@ public static Observable fromPublisher(Publisher publisher) @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable fromSupplier(Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new ObservableFromSupplier(supplier)); } @@ -2002,7 +2002,7 @@ public static Observable fromSupplier(Supplier supplier) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable generate(final Consumer> generator) { - ObjectHelper.requireNonNull(generator, "generator is null"); + Objects.requireNonNull(generator, "generator is null"); return generate(Functions.nullSupplier(), ObservableInternalHelper.simpleGenerator(generator), Functions.emptyConsumer()); } @@ -2034,7 +2034,7 @@ public static Observable generate(final Consumer> generator) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable generate(Supplier initialState, final BiConsumer> generator) { - ObjectHelper.requireNonNull(generator, "generator is null"); + Objects.requireNonNull(generator, "generator is null"); return generate(initialState, ObservableInternalHelper.simpleBiGenerator(generator), Functions.emptyConsumer()); } @@ -2070,7 +2070,7 @@ public static Observable generate( final Supplier initialState, final BiConsumer> generator, Consumer disposeState) { - ObjectHelper.requireNonNull(generator, "generator is null"); + Objects.requireNonNull(generator, "generator is null"); return generate(initialState, ObservableInternalHelper.simpleBiGenerator(generator), disposeState); } @@ -2135,9 +2135,9 @@ public static Observable generate(Supplier initialState, BiFunction @SchedulerSupport(SchedulerSupport.NONE) public static Observable generate(Supplier initialState, BiFunction, S> generator, Consumer disposeState) { - ObjectHelper.requireNonNull(initialState, "initialState is null"); - ObjectHelper.requireNonNull(generator, "generator is null"); - ObjectHelper.requireNonNull(disposeState, "disposeState is null"); + Objects.requireNonNull(initialState, "initialState is null"); + Objects.requireNonNull(generator, "generator is null"); + Objects.requireNonNull(disposeState, "disposeState is null"); return RxJavaPlugins.onAssembly(new ObservableGenerate(initialState, generator, disposeState)); } @@ -2195,8 +2195,8 @@ public static Observable interval(long initialDelay, long period, TimeUnit @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public static Observable interval(long initialDelay, long period, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableInterval(Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler)); } @@ -2304,8 +2304,8 @@ public static Observable intervalRange(long start, long count, long initia if (start > 0 && end < 0) { throw new IllegalArgumentException("Overflow! start + count is bigger than Long.MAX_VALUE"); } - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableIntervalRange(start, end, Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler)); } @@ -2342,7 +2342,7 @@ public static Observable intervalRange(long start, long count, long initia @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return RxJavaPlugins.onAssembly(new ObservableJust(item)); } @@ -2369,8 +2369,8 @@ public static Observable just(T item) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); return fromArray(item1, item2); } @@ -2400,9 +2400,9 @@ public static Observable just(T item1, T item2) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2, T item3) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); return fromArray(item1, item2, item3); } @@ -2434,10 +2434,10 @@ public static Observable just(T item1, T item2, T item3) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2, T item3, T item4) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); return fromArray(item1, item2, item3, item4); } @@ -2471,11 +2471,11 @@ public static Observable just(T item1, T item2, T item3, T item4) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2, T item3, T item4, T item5) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); return fromArray(item1, item2, item3, item4, item5); } @@ -2511,12 +2511,12 @@ public static Observable just(T item1, T item2, T item3, T item4, T item5 @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2, T item3, T item4, T item5, T item6) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); return fromArray(item1, item2, item3, item4, item5, item6); } @@ -2554,13 +2554,13 @@ public static Observable just(T item1, T item2, T item3, T item4, T item5 @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); - ObjectHelper.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); return fromArray(item1, item2, item3, item4, item5, item6, item7); } @@ -2600,14 +2600,14 @@ public static Observable just(T item1, T item2, T item3, T item4, T item5 @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); - ObjectHelper.requireNonNull(item7, "item7 is null"); - ObjectHelper.requireNonNull(item8, "item8 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); return fromArray(item1, item2, item3, item4, item5, item6, item7, item8); } @@ -2649,15 +2649,15 @@ public static Observable just(T item1, T item2, T item3, T item4, T item5 @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); - ObjectHelper.requireNonNull(item7, "item7 is null"); - ObjectHelper.requireNonNull(item8, "item8 is null"); - ObjectHelper.requireNonNull(item9, "item9 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); + Objects.requireNonNull(item9, "item9 is null"); return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9); } @@ -2701,16 +2701,16 @@ public static Observable just(T item1, T item2, T item3, T item4, T item5 @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Observable just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) { - ObjectHelper.requireNonNull(item1, "item1 is null"); - ObjectHelper.requireNonNull(item2, "item2 is null"); - ObjectHelper.requireNonNull(item3, "item3 is null"); - ObjectHelper.requireNonNull(item4, "item4 is null"); - ObjectHelper.requireNonNull(item5, "item5 is null"); - ObjectHelper.requireNonNull(item6, "item6 is null"); - ObjectHelper.requireNonNull(item7, "item7 is null"); - ObjectHelper.requireNonNull(item8, "item8 is null"); - ObjectHelper.requireNonNull(item9, "item9 is null"); - ObjectHelper.requireNonNull(item10, "item10 is null"); + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); + Objects.requireNonNull(item9, "item9 is null"); + Objects.requireNonNull(item10, "item10 is null"); return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9, item10); } @@ -2932,7 +2932,7 @@ public static Observable merge(Iterable Observable merge(ObservableSource> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), false, Integer.MAX_VALUE, bufferSize())); } @@ -2980,7 +2980,7 @@ public static Observable merge(ObservableSource Observable merge(ObservableSource> sources, int maxConcurrency) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), false, maxConcurrency, bufferSize())); } @@ -3023,8 +3023,8 @@ public static Observable merge(ObservableSource Observable merge(ObservableSource source1, ObservableSource source2) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2); } @@ -3068,9 +3068,9 @@ public static Observable merge(ObservableSource source1, Obs @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public static Observable merge(ObservableSource source1, ObservableSource source2, ObservableSource source3) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), false, 3); } @@ -3118,10 +3118,10 @@ public static Observable merge(ObservableSource source1, Obs public static Observable merge( ObservableSource source1, ObservableSource source2, ObservableSource source3, ObservableSource source4) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return fromArray(source1, source2, source3, source4).flatMap((Function)Functions.identity(), false, 4); } @@ -3331,7 +3331,7 @@ public static Observable mergeDelayError(Iterable Observable mergeDelayError(ObservableSource> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), true, Integer.MAX_VALUE, bufferSize())); } @@ -3368,7 +3368,7 @@ public static Observable mergeDelayError(ObservableSource Observable mergeDelayError(ObservableSource> sources, int maxConcurrency) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), true, maxConcurrency, bufferSize())); } @@ -3403,8 +3403,8 @@ public static Observable mergeDelayError(ObservableSource Observable mergeDelayError(ObservableSource source1, ObservableSource source2) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return fromArray(source1, source2).flatMap((Function)Functions.identity(), true, 2); } @@ -3441,9 +3441,9 @@ public static Observable mergeDelayError(ObservableSource so @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public static Observable mergeDelayError(ObservableSource source1, ObservableSource source2, ObservableSource source3) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), true, 3); } @@ -3484,10 +3484,10 @@ public static Observable mergeDelayError(ObservableSource so public static Observable mergeDelayError( ObservableSource source1, ObservableSource source2, ObservableSource source3, ObservableSource source4) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return fromArray(source1, source2, source3, source4).flatMap((Function)Functions.identity(), true, 4); } @@ -3709,9 +3709,9 @@ public static Single sequenceEqual(ObservableSource so @SchedulerSupport(SchedulerSupport.NONE) public static Single sequenceEqual(ObservableSource source1, ObservableSource source2, BiPredicate isEqual, int bufferSize) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(isEqual, "isEqual is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(isEqual, "isEqual is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new ObservableSequenceEqualSingle(source1, source2, isEqual, bufferSize)); } @@ -3775,7 +3775,7 @@ public static Single sequenceEqual(ObservableSource so @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public static Observable switchOnNext(ObservableSource> sources, int bufferSize) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), bufferSize, false)); } @@ -3877,7 +3877,7 @@ public static Observable switchOnNextDelayError(ObservableSource Observable switchOnNextDelayError(ObservableSource> sources, int prefetch) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), prefetch, true)); } @@ -3930,8 +3930,8 @@ public static Observable timer(long delay, TimeUnit unit) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public static Observable timer(long delay, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableTimer(Math.max(delay, 0L), unit, scheduler)); } @@ -3951,7 +3951,7 @@ public static Observable timer(long delay, TimeUnit unit, Scheduler schedu @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public static Observable unsafeCreate(ObservableSource onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); if (onSubscribe instanceof Observable) { throw new IllegalArgumentException("unsafeCreate(Observable) should be upgraded"); } @@ -4018,9 +4018,9 @@ public static Observable using(Supplier resourceSupplier, @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public static Observable using(Supplier resourceSupplier, Function> sourceSupplier, Consumer disposer, boolean eager) { - ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); - ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null"); - ObjectHelper.requireNonNull(disposer, "disposer is null"); + Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); + Objects.requireNonNull(sourceSupplier, "sourceSupplier is null"); + Objects.requireNonNull(disposer, "disposer is null"); return RxJavaPlugins.onAssembly(new ObservableUsing(resourceSupplier, sourceSupplier, disposer, eager)); } @@ -4040,7 +4040,7 @@ public static Observable using(Supplier resourceSupplier, @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public static Observable wrap(ObservableSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); if (source instanceof Observable) { return RxJavaPlugins.onAssembly((Observable)source); } @@ -4095,8 +4095,8 @@ public static Observable wrap(ObservableSource source) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public static Observable zip(Iterable> sources, Function zipper) { - ObjectHelper.requireNonNull(zipper, "zipper is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new ObservableZip(null, sources, zipper, bufferSize(), false)); } @@ -4155,8 +4155,8 @@ public static Observable zip(Iterable Observable zip(Iterable> sources, Function zipper, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(zipper, "zipper is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new ObservableZip(null, sources, zipper, bufferSize, delayError)); } @@ -4211,8 +4211,8 @@ public static Observable zip(Iterable Observable zip( ObservableSource source1, ObservableSource source2, BiFunction zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2); } @@ -4267,8 +4267,8 @@ public static Observable zip( public static Observable zip( ObservableSource source1, ObservableSource source2, BiFunction zipper, boolean delayError) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), source1, source2); } @@ -4324,8 +4324,8 @@ public static Observable zip( public static Observable zip( ObservableSource source1, ObservableSource source2, BiFunction zipper, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return zipArray(Functions.toFunction(zipper), delayError, bufferSize, source1, source2); } @@ -4383,9 +4383,9 @@ public static Observable zip( public static Observable zip( ObservableSource source1, ObservableSource source2, ObservableSource source3, Function3 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3); } @@ -4447,10 +4447,10 @@ public static Observable zip( ObservableSource source1, ObservableSource source2, ObservableSource source3, ObservableSource source4, Function4 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4); } @@ -4515,11 +4515,11 @@ public static Observable zip( ObservableSource source1, ObservableSource source2, ObservableSource source3, ObservableSource source4, ObservableSource source5, Function5 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5); } @@ -4586,12 +4586,12 @@ public static Observable zip( ObservableSource source1, ObservableSource source2, ObservableSource source3, ObservableSource source4, ObservableSource source5, ObservableSource source6, Function6 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6); } @@ -4662,13 +4662,13 @@ public static Observable zip( ObservableSource source4, ObservableSource source5, ObservableSource source6, ObservableSource source7, Function7 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7); } @@ -4742,14 +4742,14 @@ public static Observable zip( ObservableSource source4, ObservableSource source5, ObservableSource source6, ObservableSource source7, ObservableSource source8, Function8 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8); } @@ -4826,15 +4826,15 @@ public static Observable zip( ObservableSource source4, ObservableSource source5, ObservableSource source6, ObservableSource source7, ObservableSource source8, ObservableSource source9, Function9 zipper) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); - ObjectHelper.requireNonNull(source9, "source9 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source9, "source9 is null"); return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8, source9); } @@ -4895,7 +4895,7 @@ public static Observable zipArray(Function(sources, null, zipper, bufferSize, delayError)); } @@ -4923,7 +4923,7 @@ public static Observable zipArray(Function all(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new ObservableAllSingle(this, predicate)); } @@ -4948,7 +4948,7 @@ public final Single all(Predicate predicate) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable ambWith(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return ambArray(this, other); } @@ -4975,7 +4975,7 @@ public final Observable ambWith(ObservableSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single any(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new ObservableAnySingle(this, predicate)); } @@ -5520,7 +5520,7 @@ public final Observable> buffer(int count, int skip) { public final > Observable buffer(int count, int skip, Supplier bufferSupplier) { ObjectHelper.verifyPositive(count, "count"); ObjectHelper.verifyPositive(skip, "skip"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return RxJavaPlugins.onAssembly(new ObservableBuffer(this, count, skip, bufferSupplier)); } @@ -5650,9 +5650,9 @@ public final Observable> buffer(long timespan, long timeskip, TimeUnit u @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final > Observable buffer(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, Supplier bufferSupplier) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return RxJavaPlugins.onAssembly(new ObservableBufferTimed(this, timespan, timeskip, unit, scheduler, bufferSupplier, Integer.MAX_VALUE, false)); } @@ -5795,9 +5795,9 @@ public final > Observable buffer( Scheduler scheduler, int count, Supplier bufferSupplier, boolean restartTimerOnMaxSize) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); ObjectHelper.verifyPositive(count, "count"); return RxJavaPlugins.onAssembly(new ObservableBufferTimed(this, timespan, timespan, unit, scheduler, bufferSupplier, count, restartTimerOnMaxSize)); } @@ -5899,9 +5899,9 @@ public final > Observable ObservableSource openingIndicator, Function> closingIndicator, Supplier bufferSupplier) { - ObjectHelper.requireNonNull(openingIndicator, "openingIndicator is null"); - ObjectHelper.requireNonNull(closingIndicator, "closingIndicator is null"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(openingIndicator, "openingIndicator is null"); + Objects.requireNonNull(closingIndicator, "closingIndicator is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return RxJavaPlugins.onAssembly(new ObservableBufferBoundary(this, openingIndicator, closingIndicator, bufferSupplier)); } @@ -5999,8 +5999,8 @@ public final Observable> buffer(ObservableSource boundary, final @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final > Observable buffer(ObservableSource boundary, Supplier bufferSupplier) { - ObjectHelper.requireNonNull(boundary, "boundary is null"); - ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null"); + Objects.requireNonNull(boundary, "boundary is null"); + Objects.requireNonNull(bufferSupplier, "bufferSupplier is null"); return RxJavaPlugins.onAssembly(new ObservableBufferExactBoundary(this, boundary, bufferSupplier)); } @@ -6138,7 +6138,7 @@ public final Observable cacheWithInitialCapacity(int initialCapacity) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable cast(final Class clazz) { - ObjectHelper.requireNonNull(clazz, "clazz is null"); + Objects.requireNonNull(clazz, "clazz is null"); return map(Functions.castFunction(clazz)); } @@ -6171,8 +6171,8 @@ public final Observable cast(final Class clazz) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single collect(Supplier initialValueSupplier, BiConsumer collector) { - ObjectHelper.requireNonNull(initialValueSupplier, "initialValueSupplier is null"); - ObjectHelper.requireNonNull(collector, "collector is null"); + Objects.requireNonNull(initialValueSupplier, "initialValueSupplier is null"); + Objects.requireNonNull(collector, "collector is null"); return RxJavaPlugins.onAssembly(new ObservableCollectSingle(this, initialValueSupplier, collector)); } @@ -6205,7 +6205,7 @@ public final Single collect(Supplier initialValueSupplier, B @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single collectInto(final U initialValue, BiConsumer collector) { - ObjectHelper.requireNonNull(initialValue, "initialValue is null"); + Objects.requireNonNull(initialValue, "initialValue is null"); return collect(Functions.justSupplier(initialValue), collector); } @@ -6232,7 +6232,7 @@ public final Single collectInto(final U initialValue, BiConsumer Observable compose(ObservableTransformer composer) { - return wrap(((ObservableTransformer) ObjectHelper.requireNonNull(composer, "composer is null")).apply(this)); + return wrap(((ObservableTransformer) Objects.requireNonNull(composer, "composer is null")).apply(this)); } /** @@ -6294,7 +6294,7 @@ public final Observable concatMap(Function Observable concatMap(Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); if (this instanceof ScalarSupplier) { @SuppressWarnings("unchecked") @@ -6336,9 +6336,9 @@ public final Observable concatMap(Function Observable concatMap(Function> mapper, int prefetch, Scheduler scheduler) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler)); } @@ -6399,7 +6399,7 @@ public final Observable concatMapDelayError(Function Observable concatMapDelayError(Function> mapper, boolean tillTheEnd, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); if (this instanceof ScalarSupplier) { @SuppressWarnings("unchecked") @@ -6441,9 +6441,9 @@ public final Observable concatMapDelayError(Function Observable concatMapDelayError(Function> mapper, boolean tillTheEnd, int prefetch, Scheduler scheduler) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler)); } @@ -6497,7 +6497,7 @@ public final Observable concatMapEager(Function Observable concatMapEager(Function> mapper, int maxConcurrency, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableConcatMapEager(this, mapper, ErrorMode.IMMEDIATE, maxConcurrency, prefetch)); @@ -6562,7 +6562,7 @@ public final Observable concatMapEagerDelayError(Function Observable concatMapEagerDelayError(Function> mapper, boolean tillTheEnd, int maxConcurrency, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableConcatMapEager(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, maxConcurrency, prefetch)); @@ -6611,7 +6611,7 @@ public final Completable concatMapCompletable(Function mapper, int capacityHint) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(capacityHint, "capacityHint"); return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable(this, mapper, ErrorMode.IMMEDIATE, capacityHint)); } @@ -6701,7 +6701,7 @@ public final Completable concatMapCompletableDelayError(Function mapper, boolean tillTheEnd, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch)); } @@ -6729,7 +6729,7 @@ public final Completable concatMapCompletableDelayError(Function Observable concatMapIterable(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableFlattenIterable(this, mapper)); } @@ -6758,7 +6758,7 @@ public final Observable concatMapIterable(final Function Observable concatMapIterable(final Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return concatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), prefetch); } @@ -6816,7 +6816,7 @@ public final Observable concatMapMaybe(Function Observable concatMapMaybe(Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe(this, mapper, ErrorMode.IMMEDIATE, prefetch)); } @@ -6911,7 +6911,7 @@ public final Observable concatMapMaybeDelayError(Function Observable concatMapMaybeDelayError(Function> mapper, boolean tillTheEnd, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch)); } @@ -6969,7 +6969,7 @@ public final Observable concatMapSingle(Function Observable concatMapSingle(Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle(this, mapper, ErrorMode.IMMEDIATE, prefetch)); } @@ -7064,7 +7064,7 @@ public final Observable concatMapSingleDelayError(Function Observable concatMapSingleDelayError(Function> mapper, boolean tillTheEnd, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch)); } @@ -7088,7 +7088,7 @@ public final Observable concatMapSingleDelayError(Function concatWith(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return concat(this, other); } @@ -7109,7 +7109,7 @@ public final Observable concatWith(ObservableSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable concatWith(@NonNull SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableConcatWithSingle(this, other)); } @@ -7130,7 +7130,7 @@ public final Observable concatWith(@NonNull SingleSource other) @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable concatWith(@NonNull MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableConcatWithMaybe(this, other)); } @@ -7151,7 +7151,7 @@ public final Observable concatWith(@NonNull MaybeSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable concatWith(@NonNull CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableConcatWithCompletable(this, other)); } @@ -7174,7 +7174,7 @@ public final Observable concatWith(@NonNull CompletableSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single contains(final Object element) { - ObjectHelper.requireNonNull(element, "element is null"); + Objects.requireNonNull(element, "element is null"); return any(Functions.equalsWith(element)); } @@ -7227,7 +7227,7 @@ public final Single count() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable debounce(Function> debounceSelector) { - ObjectHelper.requireNonNull(debounceSelector, "debounceSelector is null"); + Objects.requireNonNull(debounceSelector, "debounceSelector is null"); return RxJavaPlugins.onAssembly(new ObservableDebounce(this, debounceSelector)); } @@ -7306,8 +7306,8 @@ public final Observable debounce(long timeout, TimeUnit unit) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable debounce(long timeout, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableDebounceTimed(this, timeout, unit, scheduler)); } @@ -7330,7 +7330,7 @@ public final Observable debounce(long timeout, TimeUnit unit, Scheduler sched @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable defaultIfEmpty(T defaultItem) { - ObjectHelper.requireNonNull(defaultItem, "defaultItem is null"); + Objects.requireNonNull(defaultItem, "defaultItem is null"); return switchIfEmpty(just(defaultItem)); } @@ -7360,7 +7360,7 @@ public final Observable defaultIfEmpty(T defaultItem) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable delay(final Function> itemDelay) { - ObjectHelper.requireNonNull(itemDelay, "itemDelay is null"); + Objects.requireNonNull(itemDelay, "itemDelay is null"); return flatMap(ObservableInternalHelper.itemDelay(itemDelay)); } @@ -7463,8 +7463,8 @@ public final Observable delay(long delay, TimeUnit unit, Scheduler scheduler) @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable delay(long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableDelay(this, delay, unit, scheduler, delayError)); } @@ -7524,7 +7524,7 @@ public final Observable delay(ObservableSource subscriptionDelay, @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable delaySubscription(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableDelaySubscriptionOther(this, other)); } @@ -7626,7 +7626,7 @@ public final Observable delaySubscription(long delay, TimeUnit unit, Schedule @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable dematerialize(Function> selector) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); return RxJavaPlugins.onAssembly(new ObservableDematerialize(this, selector)); } @@ -7735,8 +7735,8 @@ public final Observable distinct(Function keySelector) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable distinct(Function keySelector, Supplier> collectionSupplier) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(collectionSupplier, "collectionSupplier is null"); return RxJavaPlugins.onAssembly(new ObservableDistinct(this, keySelector, collectionSupplier)); } @@ -7816,7 +7816,7 @@ public final Observable distinctUntilChanged() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable distinctUntilChanged(Function keySelector) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged(this, keySelector, ObjectHelper.equalsPredicate())); } @@ -7850,7 +7850,7 @@ public final Observable distinctUntilChanged(Function keySe @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable distinctUntilChanged(BiPredicate comparer) { - ObjectHelper.requireNonNull(comparer, "comparer is null"); + Objects.requireNonNull(comparer, "comparer is null"); return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged(this, Functions.identity(), comparer)); } @@ -7874,7 +7874,7 @@ public final Observable distinctUntilChanged(BiPredicate doAfterNext(Consumer onAfterNext) { - ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null"); + Objects.requireNonNull(onAfterNext, "onAfterNext is null"); return RxJavaPlugins.onAssembly(new ObservableDoAfterNext(this, onAfterNext)); } @@ -7898,7 +7898,7 @@ public final Observable doAfterNext(Consumer onAfterNext) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable doAfterTerminate(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "onFinally is null"); + Objects.requireNonNull(onFinally, "onFinally is null"); return doOnEach(Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.EMPTY_ACTION, onFinally); } @@ -7925,7 +7925,7 @@ public final Observable doAfterTerminate(Action onFinally) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable doFinally(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "onFinally is null"); + Objects.requireNonNull(onFinally, "onFinally is null"); return RxJavaPlugins.onAssembly(new ObservableDoFinally(this, onFinally)); } @@ -7992,10 +7992,10 @@ public final Observable doOnComplete(Action onComplete) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) private Observable doOnEach(Consumer onNext, Consumer onError, Action onComplete, Action onAfterTerminate) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); return RxJavaPlugins.onAssembly(new ObservableDoOnEach(this, onNext, onError, onComplete, onAfterTerminate)); } @@ -8016,7 +8016,7 @@ private Observable doOnEach(Consumer onNext, Consumer doOnEach(final Consumer> onNotification) { - ObjectHelper.requireNonNull(onNotification, "onNotification is null"); + Objects.requireNonNull(onNotification, "onNotification is null"); return doOnEach( Functions.notificationOnNext(onNotification), Functions.notificationOnError(onNotification), @@ -8048,7 +8048,7 @@ public final Observable doOnEach(final Consumer> onNo @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable doOnEach(final Observer observer) { - ObjectHelper.requireNonNull(observer, "observer is null"); + Objects.requireNonNull(observer, "observer is null"); return doOnEach( ObservableInternalHelper.observerOnNext(observer), ObservableInternalHelper.observerOnError(observer), @@ -8099,8 +8099,8 @@ public final Observable doOnError(Consumer onError) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable doOnLifecycle(final Consumer onSubscribe, final Action onDispose) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); - ObjectHelper.requireNonNull(onDispose, "onDispose is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onDispose, "onDispose is null"); return RxJavaPlugins.onAssembly(new ObservableDoOnLifecycle(this, onSubscribe, onDispose)); } @@ -8169,7 +8169,7 @@ public final Observable doOnSubscribe(Consumer onSubscrib @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable doOnTerminate(final Action onTerminate) { - ObjectHelper.requireNonNull(onTerminate, "onTerminate is null"); + Objects.requireNonNull(onTerminate, "onTerminate is null"); return doOnEach(Functions.emptyConsumer(), Functions.actionConsumer(onTerminate), onTerminate, Functions.EMPTY_ACTION); @@ -8228,7 +8228,7 @@ public final Single elementAt(long index, T defaultItem) { if (index < 0) { throw new IndexOutOfBoundsException("index >= 0 required but it was " + index); } - ObjectHelper.requireNonNull(defaultItem, "defaultItem is null"); + Objects.requireNonNull(defaultItem, "defaultItem is null"); return RxJavaPlugins.onAssembly(new ObservableElementAtSingle(this, index, defaultItem)); } @@ -8278,7 +8278,7 @@ public final Single elementAtOrError(long index) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable filter(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new ObservableFilter(this, predicate)); } @@ -8462,7 +8462,7 @@ public final Observable flatMap(Function Observable flatMap(Function> mapper, boolean delayErrors, int maxConcurrency, int bufferSize) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); if (this instanceof ScalarSupplier) { @@ -8506,9 +8506,9 @@ public final Observable flatMap( Function> onNextMapper, Function> onErrorMapper, Supplier> onCompleteSupplier) { - ObjectHelper.requireNonNull(onNextMapper, "onNextMapper is null"); - ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); - ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); + Objects.requireNonNull(onNextMapper, "onNextMapper is null"); + Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); + Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); return merge(new ObservableMapNotification(this, onNextMapper, onErrorMapper, onCompleteSupplier)); } @@ -8547,9 +8547,9 @@ public final Observable flatMap( Function> onErrorMapper, Supplier> onCompleteSupplier, int maxConcurrency) { - ObjectHelper.requireNonNull(onNextMapper, "onNextMapper is null"); - ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null"); - ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); + Objects.requireNonNull(onNextMapper, "onNextMapper is null"); + Objects.requireNonNull(onErrorMapper, "onErrorMapper is null"); + Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null"); return merge(new ObservableMapNotification(this, onNextMapper, onErrorMapper, onCompleteSupplier), maxConcurrency); } @@ -8719,8 +8719,8 @@ public final Observable flatMap(Function Observable flatMap(final Function> mapper, final BiFunction combiner, boolean delayErrors, int maxConcurrency, int bufferSize) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(combiner, "combiner is null"); return flatMap(ObservableInternalHelper.flatMapWithCombiner(mapper, combiner), delayErrors, maxConcurrency, bufferSize); } @@ -8793,7 +8793,7 @@ public final Completable flatMapCompletable(Function mapper, boolean delayErrors) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableFlatMapCompletableCompletable(this, mapper, delayErrors)); } @@ -8819,7 +8819,7 @@ public final Completable flatMapCompletable(Function Observable flatMapIterable(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableFlattenIterable(this, mapper)); } @@ -8851,8 +8851,8 @@ public final Observable flatMapIterable(final Function Observable flatMapIterable(final Function> mapper, BiFunction resultSelector) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); - ObjectHelper.requireNonNull(resultSelector, "resultSelector is null"); + Objects.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(resultSelector, "resultSelector is null"); return flatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), bufferSize()); } @@ -8894,7 +8894,7 @@ public final Observable flatMapMaybe(Function Observable flatMapMaybe(Function> mapper, boolean delayErrors) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableFlatMapMaybe(this, mapper, delayErrors)); } @@ -8936,7 +8936,7 @@ public final Observable flatMapSingle(Function Observable flatMapSingle(Function> mapper, boolean delayErrors) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableFlatMapSingle(this, mapper, delayErrors)); } @@ -9044,9 +9044,9 @@ public final Disposable forEachWhile(Predicate onNext, Consumer onNext, Consumer onError, final Action onComplete) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); ForEachWhileObserver o = new ForEachWhileObserver(onNext, onError, onComplete); subscribe(o); @@ -9274,8 +9274,8 @@ public final Observable> groupBy(Function Observable> groupBy(Function keySelector, Function valueSelector, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new ObservableGroupBy(this, keySelector, valueSelector, bufferSize, delayError)); @@ -9320,10 +9320,10 @@ public final Observable groupJoin( Function> rightEnd, BiFunction, ? extends R> resultSelector ) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(leftEnd, "leftEnd is null"); - ObjectHelper.requireNonNull(rightEnd, "rightEnd is null"); - ObjectHelper.requireNonNull(resultSelector, "resultSelector is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(leftEnd, "leftEnd is null"); + Objects.requireNonNull(rightEnd, "rightEnd is null"); + Objects.requireNonNull(resultSelector, "resultSelector is null"); return RxJavaPlugins.onAssembly(new ObservableGroupJoin( this, other, leftEnd, rightEnd, resultSelector)); } @@ -9427,10 +9427,10 @@ public final Observable join( Function> rightEnd, BiFunction resultSelector ) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(leftEnd, "leftEnd is null"); - ObjectHelper.requireNonNull(rightEnd, "rightEnd is null"); - ObjectHelper.requireNonNull(resultSelector, "resultSelector is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(leftEnd, "leftEnd is null"); + Objects.requireNonNull(rightEnd, "rightEnd is null"); + Objects.requireNonNull(resultSelector, "resultSelector is null"); return RxJavaPlugins.onAssembly(new ObservableJoin( this, other, leftEnd, rightEnd, resultSelector)); } @@ -9474,7 +9474,7 @@ public final Maybe lastElement() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single last(T defaultItem) { - ObjectHelper.requireNonNull(defaultItem, "defaultItem is null"); + Objects.requireNonNull(defaultItem, "defaultItem is null"); return RxJavaPlugins.onAssembly(new ObservableLastSingle(this, defaultItem)); } @@ -9643,7 +9643,7 @@ public final Single lastOrError() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable lift(ObservableOperator lifter) { - ObjectHelper.requireNonNull(lifter, "lifter is null"); + Objects.requireNonNull(lifter, "lifter is null"); return RxJavaPlugins.onAssembly(new ObservableLift(this, lifter)); } @@ -9667,7 +9667,7 @@ public final Observable lift(ObservableOperator l @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable map(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableMap(this, mapper)); } @@ -9712,7 +9712,7 @@ public final Observable> materialize() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable mergeWith(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return merge(this, other); } @@ -9735,7 +9735,7 @@ public final Observable mergeWith(ObservableSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable mergeWith(@NonNull SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableMergeWithSingle(this, other)); } @@ -9759,7 +9759,7 @@ public final Observable mergeWith(@NonNull SingleSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable mergeWith(@NonNull MaybeSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableMergeWithMaybe(this, other)); } @@ -9780,7 +9780,7 @@ public final Observable mergeWith(@NonNull MaybeSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable mergeWith(@NonNull CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableMergeWithCompletable(this, other)); } @@ -9895,7 +9895,7 @@ public final Observable observeOn(Scheduler scheduler, boolean delayError) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable observeOn(Scheduler scheduler, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new ObservableObserveOn(this, scheduler, delayError, bufferSize)); } @@ -9918,7 +9918,7 @@ public final Observable observeOn(Scheduler scheduler, boolean delayError, in @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable ofType(final Class clazz) { - ObjectHelper.requireNonNull(clazz, "clazz is null"); + Objects.requireNonNull(clazz, "clazz is null"); return filter(Functions.isInstanceOf(clazz)).cast(clazz); } @@ -9954,7 +9954,7 @@ public final Observable ofType(final Class clazz) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable onErrorResumeNext(Function> resumeFunction) { - ObjectHelper.requireNonNull(resumeFunction, "resumeFunction is null"); + Objects.requireNonNull(resumeFunction, "resumeFunction is null"); return RxJavaPlugins.onAssembly(new ObservableOnErrorNext(this, resumeFunction)); } @@ -9990,7 +9990,7 @@ public final Observable onErrorResumeNext(Function onErrorResumeWith(final ObservableSource next) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); return onErrorResumeNext(Functions.justFunction(next)); } @@ -10023,7 +10023,7 @@ public final Observable onErrorResumeWith(final ObservableSource @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable onErrorReturn(Function valueSupplier) { - ObjectHelper.requireNonNull(valueSupplier, "valueSupplier is null"); + Objects.requireNonNull(valueSupplier, "valueSupplier is null"); return RxJavaPlugins.onAssembly(new ObservableOnErrorReturn(this, valueSupplier)); } @@ -10056,7 +10056,7 @@ public final Observable onErrorReturn(Function onErrorReturnItem(final T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return onErrorReturn(Functions.justFunction(item)); } @@ -10122,7 +10122,7 @@ public final ConnectableObservable publish() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable publish(Function, ? extends ObservableSource> selector) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); return RxJavaPlugins.onAssembly(new ObservablePublishSelector(this, selector)); } @@ -10157,7 +10157,7 @@ public final Observable publish(Function, ? extends @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Maybe reduce(BiFunction reducer) { - ObjectHelper.requireNonNull(reducer, "reducer is null"); + Objects.requireNonNull(reducer, "reducer is null"); return RxJavaPlugins.onAssembly(new ObservableReduceMaybe(this, reducer)); } @@ -10214,8 +10214,8 @@ public final Maybe reduce(BiFunction reducer) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single reduce(R seed, BiFunction reducer) { - ObjectHelper.requireNonNull(seed, "seed is null"); - ObjectHelper.requireNonNull(reducer, "reducer is null"); + Objects.requireNonNull(seed, "seed is null"); + Objects.requireNonNull(reducer, "reducer is null"); return RxJavaPlugins.onAssembly(new ObservableReduceSeedSingle(this, seed, reducer)); } @@ -10254,8 +10254,8 @@ public final Single reduce(R seed, BiFunction reducer) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single reduceWith(Supplier seedSupplier, BiFunction reducer) { - ObjectHelper.requireNonNull(seedSupplier, "seedSupplier is null"); - ObjectHelper.requireNonNull(reducer, "reducer is null"); + Objects.requireNonNull(seedSupplier, "seedSupplier is null"); + Objects.requireNonNull(reducer, "reducer is null"); return RxJavaPlugins.onAssembly(new ObservableReduceWithSingle(this, seedSupplier, reducer)); } @@ -10330,7 +10330,7 @@ public final Observable repeat(long times) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable repeatUntil(BooleanSupplier stop) { - ObjectHelper.requireNonNull(stop, "stop is null"); + Objects.requireNonNull(stop, "stop is null"); return RxJavaPlugins.onAssembly(new ObservableRepeatUntil(this, stop)); } @@ -10356,7 +10356,7 @@ public final Observable repeatUntil(BooleanSupplier stop) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable repeatWhen(final Function, ? extends ObservableSource> handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); + Objects.requireNonNull(handler, "handler is null"); return RxJavaPlugins.onAssembly(new ObservableRepeatWhen(this, handler)); } @@ -10404,7 +10404,7 @@ public final ConnectableObservable replay() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable replay(Function, ? extends ObservableSource> selector) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this), selector); } @@ -10438,7 +10438,7 @@ public final Observable replay(Function, ? extends @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable replay(Function, ? extends ObservableSource> selector, final int bufferSize) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, bufferSize, false), selector); } @@ -10475,7 +10475,7 @@ public final Observable replay(Function, ? extends @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable replay(Function, ? extends ObservableSource> selector, final int bufferSize, boolean eagerTruncate) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector); } @@ -10556,10 +10556,10 @@ public final Observable replay(Function, ? extends @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable replay(Function, ? extends ObservableSource> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.multicastSelector( ObservableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, false), selector); } @@ -10604,10 +10604,10 @@ public final Observable replay(Function, ? extends @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable replay(Function, ? extends ObservableSource> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.multicastSelector( ObservableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, eagerTruncate), selector); } @@ -10674,9 +10674,9 @@ public final Observable replay(Function, ? extends @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable replay(Function, ? extends ObservableSource> selector, final long time, final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(selector, "selector is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, time, unit, scheduler, false), selector); } @@ -10713,9 +10713,9 @@ public final Observable replay(Function, ? extends @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable replay(Function, ? extends ObservableSource> selector, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) { - ObjectHelper.requireNonNull(selector, "selector is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, time, unit, scheduler, eagerTruncate), selector); } @@ -10854,8 +10854,8 @@ public final ConnectableObservable replay(int bufferSize, long time, TimeUnit @SchedulerSupport(SchedulerSupport.CUSTOM) public final ConnectableObservable replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) { ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.create(this, time, unit, scheduler, bufferSize, false); } @@ -10898,8 +10898,8 @@ public final ConnectableObservable replay(final int bufferSize, final long ti @SchedulerSupport(SchedulerSupport.CUSTOM) public final ConnectableObservable replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) { ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.create(this, time, unit, scheduler, bufferSize, eagerTruncate); } @@ -10958,8 +10958,8 @@ public final ConnectableObservable replay(long time, TimeUnit unit) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final ConnectableObservable replay(final long time, final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.create(this, time, unit, scheduler, false); } @@ -10994,8 +10994,8 @@ public final ConnectableObservable replay(final long time, final TimeUnit uni @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final ConnectableObservable replay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return ObservableReplay.create(this, time, unit, scheduler, eagerTruncate); } @@ -11046,7 +11046,7 @@ public final Observable retry() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable retry(BiPredicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new ObservableRetryBiPredicate(this, predicate)); } @@ -11099,7 +11099,7 @@ public final Observable retry(long times, Predicate predic if (times < 0) { throw new IllegalArgumentException("times >= 0 required but it was " + times); } - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new ObservableRetryPredicate(this, times, predicate)); } @@ -11136,7 +11136,7 @@ public final Observable retry(Predicate predicate) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable retryUntil(final BooleanSupplier stop) { - ObjectHelper.requireNonNull(stop, "stop is null"); + Objects.requireNonNull(stop, "stop is null"); return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop)); } @@ -11217,7 +11217,7 @@ public final Observable retryUntil(final BooleanSupplier stop) { @SchedulerSupport(SchedulerSupport.NONE) public final Observable retryWhen( final Function, ? extends ObservableSource> handler) { - ObjectHelper.requireNonNull(handler, "handler is null"); + Objects.requireNonNull(handler, "handler is null"); return RxJavaPlugins.onAssembly(new ObservableRetryWhen(this, handler)); } @@ -11235,7 +11235,7 @@ public final Observable retryWhen( */ @SchedulerSupport(SchedulerSupport.NONE) public final void safeSubscribe(Observer observer) { - ObjectHelper.requireNonNull(observer, "observer is null"); + Objects.requireNonNull(observer, "observer is null"); if (observer instanceof SafeObserver) { subscribe(observer); } else { @@ -11323,8 +11323,8 @@ public final Observable sample(long period, TimeUnit unit, boolean emitLast) @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable sample(long period, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableSampleTimed(this, period, unit, scheduler, false)); } @@ -11359,8 +11359,8 @@ public final Observable sample(long period, TimeUnit unit, Scheduler schedule @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable sample(long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableSampleTimed(this, period, unit, scheduler, emitLast)); } @@ -11385,7 +11385,7 @@ public final Observable sample(long period, TimeUnit unit, Scheduler schedule @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable sample(ObservableSource sampler) { - ObjectHelper.requireNonNull(sampler, "sampler is null"); + Objects.requireNonNull(sampler, "sampler is null"); return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable(this, sampler, false)); } @@ -11417,7 +11417,7 @@ public final Observable sample(ObservableSource sampler) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable sample(ObservableSource sampler, boolean emitLast) { - ObjectHelper.requireNonNull(sampler, "sampler is null"); + Objects.requireNonNull(sampler, "sampler is null"); return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable(this, sampler, emitLast)); } @@ -11445,7 +11445,7 @@ public final Observable sample(ObservableSource sampler, boolean emitL @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable scan(BiFunction accumulator) { - ObjectHelper.requireNonNull(accumulator, "accumulator is null"); + Objects.requireNonNull(accumulator, "accumulator is null"); return RxJavaPlugins.onAssembly(new ObservableScan(this, accumulator)); } @@ -11494,7 +11494,7 @@ public final Observable scan(BiFunction accumulator) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable scan(final R initialValue, BiFunction accumulator) { - ObjectHelper.requireNonNull(initialValue, "initialValue is null"); + Objects.requireNonNull(initialValue, "initialValue is null"); return scanWith(Functions.justSupplier(initialValue), accumulator); } @@ -11529,8 +11529,8 @@ public final Observable scan(final R initialValue, BiFunction Observable scanWith(Supplier seedSupplier, BiFunction accumulator) { - ObjectHelper.requireNonNull(seedSupplier, "seedSupplier is null"); - ObjectHelper.requireNonNull(accumulator, "accumulator is null"); + Objects.requireNonNull(seedSupplier, "seedSupplier is null"); + Objects.requireNonNull(accumulator, "accumulator is null"); return RxJavaPlugins.onAssembly(new ObservableScanSeed(this, seedSupplier, accumulator)); } @@ -11621,7 +11621,7 @@ public final Maybe singleElement() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single single(T defaultItem) { - ObjectHelper.requireNonNull(defaultItem, "defaultItem is null"); + Objects.requireNonNull(defaultItem, "defaultItem is null"); return RxJavaPlugins.onAssembly(new ObservableSingleSingle(this, defaultItem)); } @@ -11902,8 +11902,8 @@ public final Observable skipLast(long time, TimeUnit unit, Scheduler schedule @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable skipLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); // the internal buffer holds pairs of (timestamp, value) so double the default buffer size int s = bufferSize << 1; @@ -11931,7 +11931,7 @@ public final Observable skipLast(long time, TimeUnit unit, Scheduler schedule @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable skipUntil(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableSkipUntil(this, other)); } @@ -11954,7 +11954,7 @@ public final Observable skipUntil(ObservableSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable skipWhile(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new ObservableSkipWhile(this, predicate)); } @@ -12004,7 +12004,7 @@ public final Observable sorted() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable sorted(Comparator sortFunction) { - ObjectHelper.requireNonNull(sortFunction, "sortFunction is null"); + Objects.requireNonNull(sortFunction, "sortFunction is null"); return toList().toObservable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.>identity()); } @@ -12054,7 +12054,7 @@ public final Observable startWithIterable(Iterable items) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable startWith(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return concatArray(other, this); } @@ -12081,7 +12081,7 @@ public final Observable startWith(ObservableSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable startWithItem(T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return concatArray(just(item), this); } @@ -12213,9 +12213,9 @@ public final Disposable subscribe(Consumer onNext, Consumer onNext, Consumer onError, Action onComplete) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); LambdaObserver ls = new LambdaObserver(onNext, onError, onComplete, Functions.emptyConsumer()); @@ -12227,11 +12227,11 @@ public final Disposable subscribe(Consumer onNext, Consumer observer) { - ObjectHelper.requireNonNull(observer, "observer is null"); + Objects.requireNonNull(observer, "observer is null"); try { observer = RxJavaPlugins.onSubscribe(this, observer); - ObjectHelper.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null Observer. Please change the handler provided to RxJavaPlugins.setOnObservableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); + Objects.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null Observer. Please change the handler provided to RxJavaPlugins.setOnObservableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); subscribeActual(observer); } catch (NullPointerException e) { // NOPMD @@ -12309,7 +12309,7 @@ public final > E subscribeWith(E observer) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable subscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableSubscribeOn(this, scheduler)); } @@ -12332,7 +12332,7 @@ public final Observable subscribeOn(Scheduler scheduler) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable switchIfEmpty(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableSwitchIfEmpty(this, other)); } @@ -12391,7 +12391,7 @@ public final Observable switchMap(Function Observable switchMap(Function> mapper, int bufferSize) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); if (this instanceof ScalarSupplier) { @SuppressWarnings("unchecked") @@ -12441,7 +12441,7 @@ public final Observable switchMap(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable(this, mapper, false)); } @@ -12483,7 +12483,7 @@ public final Completable switchMapCompletable(@NonNull Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable(this, mapper, true)); } @@ -12519,7 +12519,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function Observable switchMapMaybe(@NonNull Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe(this, mapper, false)); } @@ -12545,7 +12545,7 @@ public final Observable switchMapMaybe(@NonNull Function Observable switchMapMaybeDelayError(@NonNull Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe(this, mapper, true)); } @@ -12576,7 +12576,7 @@ public final Observable switchMapMaybeDelayError(@NonNull Function Observable switchMapSingle(@NonNull Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle(this, mapper, false)); } @@ -12608,7 +12608,7 @@ public final Observable switchMapSingle(@NonNull Function Observable switchMapSingleDelayError(@NonNull Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle(this, mapper, true)); } @@ -12671,7 +12671,7 @@ public final Observable switchMapDelayError(Function Observable switchMapDelayError(Function> mapper, int bufferSize) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); if (this instanceof ScalarSupplier) { @SuppressWarnings("unchecked") @@ -12894,8 +12894,8 @@ public final Observable takeLast(long count, long time, TimeUnit unit, Schedu @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable takeLast(long count, long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); if (count < 0) { throw new IndexOutOfBoundsException("count >= 0 required but it was " + count); @@ -13067,7 +13067,7 @@ public final Observable takeLast(long time, TimeUnit unit, Scheduler schedule @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable takeUntil(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new ObservableTakeUntil(this, other)); } @@ -13096,7 +13096,7 @@ public final Observable takeUntil(ObservableSource other) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable takeUntil(Predicate stopPredicate) { - ObjectHelper.requireNonNull(stopPredicate, "stopPredicate is null"); + Objects.requireNonNull(stopPredicate, "stopPredicate is null"); return RxJavaPlugins.onAssembly(new ObservableTakeUntilPredicate(this, stopPredicate)); } @@ -13120,7 +13120,7 @@ public final Observable takeUntil(Predicate stopPredicate) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable takeWhile(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new ObservableTakeWhile(this, predicate)); } @@ -13176,8 +13176,8 @@ public final Observable throttleFirst(long windowDuration, TimeUnit unit) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable throttleFirst(long skipDuration, TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableThrottleFirstTimed(this, skipDuration, unit, scheduler)); } @@ -13363,8 +13363,8 @@ public final Observable throttleLatest(long timeout, TimeUnit unit, Scheduler @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler, boolean emitLast) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableThrottleLatest(this, timeout, unit, scheduler, emitLast)); } @@ -13516,8 +13516,8 @@ public final Observable> timeInterval(TimeUnit unit) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps. public final Observable> timeInterval(TimeUnit unit, Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableTimeInterval(this, unit, scheduler)); } @@ -13581,7 +13581,7 @@ public final Observable timeout(Function Observable timeout(Function> itemTimeoutIndicator, ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(null, itemTimeoutIndicator, other); } @@ -13634,7 +13634,7 @@ public final Observable timeout(long timeout, TimeUnit timeUnit) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.COMPUTATION) public final Observable timeout(long timeout, TimeUnit timeUnit, ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(timeout, timeUnit, other, Schedulers.computation()); } @@ -13665,7 +13665,7 @@ public final Observable timeout(long timeout, TimeUnit timeUnit, ObservableSo @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(timeout, timeUnit, other, scheduler); } @@ -13728,7 +13728,7 @@ public final Observable timeout(long timeout, TimeUnit timeUnit, Scheduler sc @SchedulerSupport(SchedulerSupport.NONE) public final Observable timeout(ObservableSource firstTimeoutIndicator, Function> itemTimeoutIndicator) { - ObjectHelper.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null"); + Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null"); return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, null); } @@ -13770,15 +13770,15 @@ public final Observable timeout( ObservableSource firstTimeoutIndicator, Function> itemTimeoutIndicator, ObservableSource other) { - ObjectHelper.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null"); - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other); } private Observable timeout0(long timeout, TimeUnit timeUnit, ObservableSource other, Scheduler scheduler) { - ObjectHelper.requireNonNull(timeUnit, "timeUnit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(timeUnit, "timeUnit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed(this, timeout, timeUnit, scheduler, other)); } @@ -13786,7 +13786,7 @@ private Observable timeout0( ObservableSource firstTimeoutIndicator, Function> itemTimeoutIndicator, ObservableSource other) { - ObjectHelper.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null"); + Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null"); return RxJavaPlugins.onAssembly(new ObservableTimeout(this, firstTimeoutIndicator, itemTimeoutIndicator, other)); } @@ -13875,8 +13875,8 @@ public final Observable> timestamp(TimeUnit unit) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps. public final Observable> timestamp(final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return map(Functions.timestampWith(unit, scheduler)); } @@ -13898,7 +13898,7 @@ public final Observable> timestamp(final TimeUnit unit, final Scheduler @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final R to(@NonNull ObservableConverter converter) { - return ObjectHelper.requireNonNull(converter, "converter is null").apply(this); + return Objects.requireNonNull(converter, "converter is null").apply(this); } /** @@ -13994,7 +13994,7 @@ public final Single> toList(final int capacityHint) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final > Single toList(Supplier collectionSupplier) { - ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null"); + Objects.requireNonNull(collectionSupplier, "collectionSupplier is null"); return RxJavaPlugins.onAssembly(new ObservableToListSingle(this, collectionSupplier)); } @@ -14025,7 +14025,7 @@ public final > Single toList(Supplier coll @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single> toMap(final Function keySelector) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); return collect(HashMapSupplier.asSupplier(), Functions.toMapKeySelector(keySelector)); } @@ -14061,8 +14061,8 @@ public final Single> toMap(final Function public final Single> toMap( final Function keySelector, final Function valueSelector) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); return collect(HashMapSupplier.asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector)); } @@ -14098,9 +14098,9 @@ public final Single> toMap( final Function keySelector, final Function valueSelector, Supplier> mapSupplier) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); - ObjectHelper.requireNonNull(mapSupplier, "mapSupplier is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(mapSupplier, "mapSupplier is null"); return collect(mapSupplier, Functions.toMapKeyValueSelector(keySelector, valueSelector)); } @@ -14200,10 +14200,10 @@ public final Single>> toMultimap( final Function valueSelector, final Supplier>> mapSupplier, final Function> collectionFactory) { - ObjectHelper.requireNonNull(keySelector, "keySelector is null"); - ObjectHelper.requireNonNull(valueSelector, "valueSelector is null"); - ObjectHelper.requireNonNull(mapSupplier, "mapSupplier is null"); - ObjectHelper.requireNonNull(collectionFactory, "collectionFactory is null"); + Objects.requireNonNull(keySelector, "keySelector is null"); + Objects.requireNonNull(valueSelector, "valueSelector is null"); + Objects.requireNonNull(mapSupplier, "mapSupplier is null"); + Objects.requireNonNull(collectionFactory, "collectionFactory is null"); return collect(mapSupplier, Functions.toMultimapKeyValueSelector(keySelector, valueSelector, collectionFactory)); } @@ -14352,7 +14352,7 @@ public final Single> toSortedList() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single> toSortedList(final Comparator comparator) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(comparator, "comparator is null"); return toList().map(Functions.listSorter(comparator)); } @@ -14383,7 +14383,7 @@ public final Single> toSortedList(final Comparator comparator @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single> toSortedList(final Comparator comparator, int capacityHint) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(comparator, "comparator is null"); return toList(capacityHint).map(Functions.listSorter(comparator)); } @@ -14438,7 +14438,7 @@ public final Single> toSortedList(int capacityHint) { @CheckReturnValue @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable unsubscribeOn(Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableUnsubscribeOn(this, scheduler)); } @@ -14633,8 +14633,8 @@ public final Observable> window(long timespan, long timeskip, Time ObjectHelper.verifyPositive(timespan, "timespan"); ObjectHelper.verifyPositive(timeskip, "timeskip"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); return RxJavaPlugins.onAssembly(new ObservableWindowTimed(this, timespan, timeskip, unit, scheduler, Long.MAX_VALUE, bufferSize, false)); } @@ -14903,8 +14903,8 @@ public final Observable> window( long timespan, TimeUnit unit, Scheduler scheduler, long count, boolean restart, int bufferSize) { ObjectHelper.verifyPositive(bufferSize, "bufferSize"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); - ObjectHelper.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); ObjectHelper.verifyPositive(count, "count"); return RxJavaPlugins.onAssembly(new ObservableWindowTimed(this, timespan, timespan, unit, scheduler, count, bufferSize, restart)); } @@ -14970,7 +14970,7 @@ public final Observable> window(ObservableSource boundary) @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable> window(ObservableSource boundary, int bufferSize) { - ObjectHelper.requireNonNull(boundary, "boundary is null"); + Objects.requireNonNull(boundary, "boundary is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new ObservableWindowBoundary(this, boundary, bufferSize)); } @@ -15046,8 +15046,8 @@ public final Observable> window( public final Observable> window( ObservableSource openingIndicator, Function> closingIndicator, int bufferSize) { - ObjectHelper.requireNonNull(openingIndicator, "openingIndicator is null"); - ObjectHelper.requireNonNull(closingIndicator, "closingIndicator is null"); + Objects.requireNonNull(openingIndicator, "openingIndicator is null"); + Objects.requireNonNull(closingIndicator, "closingIndicator is null"); ObjectHelper.verifyPositive(bufferSize, "bufferSize"); return RxJavaPlugins.onAssembly(new ObservableWindowBoundarySelector(this, openingIndicator, closingIndicator, bufferSize)); } @@ -15079,8 +15079,8 @@ public final Observable> window( @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable withLatestFrom(ObservableSource other, BiFunction combiner) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(combiner, "combiner is null"); return RxJavaPlugins.onAssembly(new ObservableWithLatestFrom(this, combiner, other)); } @@ -15114,9 +15114,9 @@ public final Observable withLatestFrom(ObservableSource o public final Observable withLatestFrom( ObservableSource o1, ObservableSource o2, Function3 combiner) { - ObjectHelper.requireNonNull(o1, "o1 is null"); - ObjectHelper.requireNonNull(o2, "o2 is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(o1, "o1 is null"); + Objects.requireNonNull(o2, "o2 is null"); + Objects.requireNonNull(combiner, "combiner is null"); Function f = Functions.toFunction(combiner); return withLatestFrom(new ObservableSource[] { o1, o2 }, f); } @@ -15153,10 +15153,10 @@ public final Observable withLatestFrom( ObservableSource o1, ObservableSource o2, ObservableSource o3, Function4 combiner) { - ObjectHelper.requireNonNull(o1, "o1 is null"); - ObjectHelper.requireNonNull(o2, "o2 is null"); - ObjectHelper.requireNonNull(o3, "o3 is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(o1, "o1 is null"); + Objects.requireNonNull(o2, "o2 is null"); + Objects.requireNonNull(o3, "o3 is null"); + Objects.requireNonNull(combiner, "combiner is null"); Function f = Functions.toFunction(combiner); return withLatestFrom(new ObservableSource[] { o1, o2, o3 }, f); } @@ -15195,11 +15195,11 @@ public final Observable withLatestFrom( ObservableSource o1, ObservableSource o2, ObservableSource o3, ObservableSource o4, Function5 combiner) { - ObjectHelper.requireNonNull(o1, "o1 is null"); - ObjectHelper.requireNonNull(o2, "o2 is null"); - ObjectHelper.requireNonNull(o3, "o3 is null"); - ObjectHelper.requireNonNull(o4, "o4 is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(o1, "o1 is null"); + Objects.requireNonNull(o2, "o2 is null"); + Objects.requireNonNull(o3, "o3 is null"); + Objects.requireNonNull(o4, "o4 is null"); + Objects.requireNonNull(combiner, "combiner is null"); Function f = Functions.toFunction(combiner); return withLatestFrom(new ObservableSource[] { o1, o2, o3, o4 }, f); } @@ -15228,8 +15228,8 @@ public final Observable withLatestFrom( @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable withLatestFrom(ObservableSource[] others, Function combiner) { - ObjectHelper.requireNonNull(others, "others is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(others, "others is null"); + Objects.requireNonNull(combiner, "combiner is null"); return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany(this, others, combiner)); } @@ -15257,8 +15257,8 @@ public final Observable withLatestFrom(ObservableSource[] others, Func @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Observable withLatestFrom(Iterable> others, Function combiner) { - ObjectHelper.requireNonNull(others, "others is null"); - ObjectHelper.requireNonNull(combiner, "combiner is null"); + Objects.requireNonNull(others, "others is null"); + Objects.requireNonNull(combiner, "combiner is null"); return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany(this, others, combiner)); } @@ -15291,8 +15291,8 @@ public final Observable withLatestFrom(Iterable Observable zipWith(Iterable other, BiFunction zipper) { - ObjectHelper.requireNonNull(other, "other is null"); - ObjectHelper.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(other, "other is null"); + Objects.requireNonNull(zipper, "zipper is null"); return RxJavaPlugins.onAssembly(new ObservableZipIterable(this, other, zipper)); } @@ -15335,7 +15335,7 @@ public final Observable zipWith(Iterable other, BiFunction Observable zipWith(ObservableSource other, BiFunction zipper) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return zip(this, other, zipper); } diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java index 3cffa8dfad..27fad6d53e 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Single.java +++ b/src/main/java/io/reactivex/rxjava3/core/Single.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.core; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.concurrent.*; import org.reactivestreams.Publisher; @@ -132,7 +133,7 @@ public abstract class Single implements SingleSource { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single amb(final Iterable> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new SingleAmb(null, sources)); } @@ -207,7 +208,7 @@ public static Flowable concat(Iterable Observable concat(ObservableSource> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, SingleInternalHelper.toObservable(), 2, ErrorMode.IMMEDIATE)); } @@ -260,7 +261,7 @@ public static Flowable concat(Publisher Flowable concat(Publisher> sources, int prefetch) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, SingleInternalHelper.toFlowable(), prefetch, ErrorMode.IMMEDIATE)); } @@ -292,8 +293,8 @@ public static Flowable concat(Publisher Flowable concat( SingleSource source1, SingleSource source2 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return concat(Flowable.fromArray(source1, source2)); } @@ -327,9 +328,9 @@ public static Flowable concat( SingleSource source1, SingleSource source2, SingleSource source3 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return concat(Flowable.fromArray(source1, source2, source3)); } @@ -365,10 +366,10 @@ public static Flowable concat( SingleSource source1, SingleSource source2, SingleSource source3, SingleSource source4 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return concat(Flowable.fromArray(source1, source2, source3, source4)); } @@ -523,7 +524,7 @@ public static Flowable concatEager(Iterable Single create(SingleOnSubscribe source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return RxJavaPlugins.onAssembly(new SingleCreate(source)); } @@ -545,7 +546,7 @@ public static Single create(SingleOnSubscribe source) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single defer(final Supplier> singleSupplier) { - ObjectHelper.requireNonNull(singleSupplier, "singleSupplier is null"); + Objects.requireNonNull(singleSupplier, "singleSupplier is null"); return RxJavaPlugins.onAssembly(new SingleDefer(singleSupplier)); } @@ -566,7 +567,7 @@ public static Single defer(final Supplier Single error(final Supplier errorSupplier) { - ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null"); + Objects.requireNonNull(errorSupplier, "errorSupplier is null"); return RxJavaPlugins.onAssembly(new SingleError(errorSupplier)); } @@ -592,7 +593,7 @@ public static Single error(final Supplier errorSuppl @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single error(final Throwable exception) { - ObjectHelper.requireNonNull(exception, "exception is null"); + Objects.requireNonNull(exception, "exception is null"); return error(Functions.justSupplier(exception)); } @@ -628,7 +629,7 @@ public static Single error(final Throwable exception) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single fromCallable(final Callable callable) { - ObjectHelper.requireNonNull(callable, "callable is null"); + Objects.requireNonNull(callable, "callable is null"); return RxJavaPlugins.onAssembly(new SingleFromCallable(callable)); } @@ -793,7 +794,7 @@ public static Single fromFuture(Future future, Scheduler sch @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single fromPublisher(final Publisher publisher) { - ObjectHelper.requireNonNull(publisher, "publisher is null"); + Objects.requireNonNull(publisher, "publisher is null"); return RxJavaPlugins.onAssembly(new SingleFromPublisher(publisher)); } @@ -817,7 +818,7 @@ public static Single fromPublisher(final Publisher publisher @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single fromObservable(ObservableSource observableSource) { - ObjectHelper.requireNonNull(observableSource, "observableSource is null"); + Objects.requireNonNull(observableSource, "observableSource is null"); return RxJavaPlugins.onAssembly(new ObservableSingleSingle(observableSource, null)); } @@ -855,7 +856,7 @@ public static Single fromObservable(ObservableSource observa @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single fromSupplier(final Supplier supplier) { - ObjectHelper.requireNonNull(supplier, "supplier is null"); + Objects.requireNonNull(supplier, "supplier is null"); return RxJavaPlugins.onAssembly(new SingleFromSupplier(supplier)); } @@ -882,7 +883,7 @@ public static Single fromSupplier(final Supplier supplier) { @SchedulerSupport(SchedulerSupport.NONE) @NonNull public static Single just(final T item) { - ObjectHelper.requireNonNull(item, "item is null"); + Objects.requireNonNull(item, "item is null"); return RxJavaPlugins.onAssembly(new SingleJust(item)); } @@ -960,7 +961,7 @@ public static Flowable merge(Iterable @SchedulerSupport(SchedulerSupport.NONE) @SuppressWarnings({ "unchecked", "rawtypes" }) public static Flowable merge(Publisher> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), false, Integer.MAX_VALUE, Flowable.bufferSize())); } @@ -991,7 +992,7 @@ public static Flowable merge(Publisher Single merge(SingleSource> source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); return RxJavaPlugins.onAssembly(new SingleFlatMap, T>(source, (Function)Functions.identity())); } @@ -1039,8 +1040,8 @@ public static Single merge(SingleSource Flowable merge( SingleSource source1, SingleSource source2 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return merge(Flowable.fromArray(source1, source2)); } @@ -1091,9 +1092,9 @@ public static Flowable merge( SingleSource source1, SingleSource source2, SingleSource source3 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return merge(Flowable.fromArray(source1, source2, source3)); } @@ -1146,10 +1147,10 @@ public static Flowable merge( SingleSource source1, SingleSource source2, SingleSource source3, SingleSource source4 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return merge(Flowable.fromArray(source1, source2, source3, source4)); } @@ -1203,7 +1204,7 @@ public static Flowable mergeDelayError(Iterable Flowable mergeDelayError(Publisher> sources) { - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), true, Integer.MAX_VALUE, Flowable.bufferSize())); } @@ -1240,8 +1241,8 @@ public static Flowable mergeDelayError(Publisher Flowable mergeDelayError( SingleSource source1, SingleSource source2 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return mergeDelayError(Flowable.fromArray(source1, source2)); } @@ -1281,9 +1282,9 @@ public static Flowable mergeDelayError( SingleSource source1, SingleSource source2, SingleSource source3 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return mergeDelayError(Flowable.fromArray(source1, source2, source3)); } @@ -1325,10 +1326,10 @@ public static Flowable mergeDelayError( SingleSource source1, SingleSource source2, SingleSource source3, SingleSource source4 ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return mergeDelayError(Flowable.fromArray(source1, source2, source3, source4)); } @@ -1391,8 +1392,8 @@ public static Single timer(long delay, TimeUnit unit) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public static Single timer(final long delay, final TimeUnit unit, final Scheduler scheduler) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new SingleTimer(delay, unit, scheduler)); } @@ -1414,8 +1415,8 @@ public static Single timer(final long delay, final TimeUnit unit, final Sc @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single equals(final SingleSource first, final SingleSource second) { // NOPMD - ObjectHelper.requireNonNull(first, "first is null"); - ObjectHelper.requireNonNull(second, "second is null"); + Objects.requireNonNull(first, "first is null"); + Objects.requireNonNull(second, "second is null"); return RxJavaPlugins.onAssembly(new SingleEquals(first, second)); } @@ -1440,7 +1441,7 @@ public static Single equals(final SingleSource first, @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single unsafeCreate(SingleSource onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); if (onSubscribe instanceof Single) { throw new IllegalArgumentException("unsafeCreate(Single) should be upgraded"); } @@ -1510,9 +1511,9 @@ public static Single using( final Function> singleFunction, final Consumer disposer, final boolean eager) { - ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null"); - ObjectHelper.requireNonNull(singleFunction, "singleFunction is null"); - ObjectHelper.requireNonNull(disposer, "disposer is null"); + Objects.requireNonNull(resourceSupplier, "resourceSupplier is null"); + Objects.requireNonNull(singleFunction, "singleFunction is null"); + Objects.requireNonNull(disposer, "disposer is null"); return RxJavaPlugins.onAssembly(new SingleUsing(resourceSupplier, singleFunction, disposer, eager)); } @@ -1534,7 +1535,7 @@ public static Single using( @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single wrap(SingleSource source) { - ObjectHelper.requireNonNull(source, "source is null"); + Objects.requireNonNull(source, "source is null"); if (source instanceof Single) { return RxJavaPlugins.onAssembly((Single)source); } @@ -1574,8 +1575,8 @@ public static Single wrap(SingleSource source) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single zip(final Iterable> sources, Function zipper) { - ObjectHelper.requireNonNull(zipper, "zipper is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); return RxJavaPlugins.onAssembly(new SingleZipIterable(sources, zipper)); } @@ -1610,8 +1611,8 @@ public static Single zip( SingleSource source1, SingleSource source2, BiFunction zipper ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); return zipArray(Functions.toFunction(zipper), source1, source2); } @@ -1650,9 +1651,9 @@ public static Single zip( SingleSource source3, Function3 zipper ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3); } @@ -1694,10 +1695,10 @@ public static Single zip( SingleSource source3, SingleSource source4, Function4 zipper ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4); } @@ -1743,11 +1744,11 @@ public static Single zip( SingleSource source5, Function5 zipper ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5); } @@ -1796,12 +1797,12 @@ public static Single zip( SingleSource source5, SingleSource source6, Function6 zipper ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6); } @@ -1854,13 +1855,13 @@ public static Single zip( SingleSource source7, Function7 zipper ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7); } @@ -1916,14 +1917,14 @@ public static Single zip( SingleSource source7, SingleSource source8, Function8 zipper ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8); } @@ -1983,15 +1984,15 @@ public static Single zip( SingleSource source9, Function9 zipper ) { - ObjectHelper.requireNonNull(source1, "source1 is null"); - ObjectHelper.requireNonNull(source2, "source2 is null"); - ObjectHelper.requireNonNull(source3, "source3 is null"); - ObjectHelper.requireNonNull(source4, "source4 is null"); - ObjectHelper.requireNonNull(source5, "source5 is null"); - ObjectHelper.requireNonNull(source6, "source6 is null"); - ObjectHelper.requireNonNull(source7, "source7 is null"); - ObjectHelper.requireNonNull(source8, "source8 is null"); - ObjectHelper.requireNonNull(source9, "source9 is null"); + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + Objects.requireNonNull(source3, "source3 is null"); + Objects.requireNonNull(source4, "source4 is null"); + Objects.requireNonNull(source5, "source5 is null"); + Objects.requireNonNull(source6, "source6 is null"); + Objects.requireNonNull(source7, "source7 is null"); + Objects.requireNonNull(source8, "source8 is null"); + Objects.requireNonNull(source9, "source9 is null"); return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8, source9); } @@ -2027,8 +2028,8 @@ public static Single zip( @NonNull @SchedulerSupport(SchedulerSupport.NONE) public static Single zipArray(Function zipper, SingleSource... sources) { - ObjectHelper.requireNonNull(zipper, "zipper is null"); - ObjectHelper.requireNonNull(sources, "sources is null"); + Objects.requireNonNull(zipper, "zipper is null"); + Objects.requireNonNull(sources, "sources is null"); if (sources.length == 0) { return error(new NoSuchElementException()); } @@ -2053,7 +2054,7 @@ public static Single zipArray(Function @SchedulerSupport(SchedulerSupport.NONE) @SuppressWarnings("unchecked") public final Single ambWith(SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return ambArray(this, other); } @@ -2099,7 +2100,7 @@ public final Single hide() { @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final Single compose(SingleTransformer transformer) { - return wrap(((SingleTransformer) ObjectHelper.requireNonNull(transformer, "transformer is null")).apply(this)); + return wrap(((SingleTransformer) Objects.requireNonNull(transformer, "transformer is null")).apply(this)); } /** @@ -2140,7 +2141,7 @@ public final Single cache() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single cast(final Class clazz) { - ObjectHelper.requireNonNull(clazz, "clazz is null"); + Objects.requireNonNull(clazz, "clazz is null"); return map(Functions.castFunction(clazz)); } @@ -2259,8 +2260,8 @@ public final Single delay(final long time, final TimeUnit unit, final Schedul @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Single delay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean delayError) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new SingleDelay(this, time, unit, scheduler, delayError)); } @@ -2284,7 +2285,7 @@ public final Single delay(final long time, final TimeUnit unit, final Schedul @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single delaySubscription(CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable(this, other)); } @@ -2309,7 +2310,7 @@ public final Single delaySubscription(CompletableSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single delaySubscription(SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new SingleDelayWithSingle(this, other)); } @@ -2334,7 +2335,7 @@ public final Single delaySubscription(SingleSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single delaySubscription(ObservableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new SingleDelayWithObservable(this, other)); } @@ -2364,7 +2365,7 @@ public final Single delaySubscription(ObservableSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single delaySubscription(Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new SingleDelayWithPublisher(this, other)); } @@ -2445,7 +2446,7 @@ public final Single delaySubscription(long time, TimeUnit unit, Scheduler sch @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe dematerialize(Function> selector) { - ObjectHelper.requireNonNull(selector, "selector is null"); + Objects.requireNonNull(selector, "selector is null"); return RxJavaPlugins.onAssembly(new SingleDematerialize(this, selector)); } @@ -2469,7 +2470,7 @@ public final Maybe dematerialize(Function> sel @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doAfterSuccess(Consumer onAfterSuccess) { - ObjectHelper.requireNonNull(onAfterSuccess, "onAfterSuccess is null"); + Objects.requireNonNull(onAfterSuccess, "onAfterSuccess is null"); return RxJavaPlugins.onAssembly(new SingleDoAfterSuccess(this, onAfterSuccess)); } @@ -2498,7 +2499,7 @@ public final Single doAfterSuccess(Consumer onAfterSuccess) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doAfterTerminate(Action onAfterTerminate) { - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); return RxJavaPlugins.onAssembly(new SingleDoAfterTerminate(this, onAfterTerminate)); } @@ -2525,7 +2526,7 @@ public final Single doAfterTerminate(Action onAfterTerminate) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doFinally(Action onFinally) { - ObjectHelper.requireNonNull(onFinally, "onFinally is null"); + Objects.requireNonNull(onFinally, "onFinally is null"); return RxJavaPlugins.onAssembly(new SingleDoFinally(this, onFinally)); } @@ -2547,7 +2548,7 @@ public final Single doFinally(Action onFinally) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doOnSubscribe(final Consumer onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); return RxJavaPlugins.onAssembly(new SingleDoOnSubscribe(this, onSubscribe)); } @@ -2574,7 +2575,7 @@ public final Single doOnSubscribe(final Consumer onSubscr @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doOnTerminate(final Action onTerminate) { - ObjectHelper.requireNonNull(onTerminate, "onTerminate is null"); + Objects.requireNonNull(onTerminate, "onTerminate is null"); return RxJavaPlugins.onAssembly(new SingleDoOnTerminate(this, onTerminate)); } @@ -2596,7 +2597,7 @@ public final Single doOnTerminate(final Action onTerminate) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doOnSuccess(final Consumer onSuccess) { - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"); + Objects.requireNonNull(onSuccess, "onSuccess is null"); return RxJavaPlugins.onAssembly(new SingleDoOnSuccess(this, onSuccess)); } @@ -2617,7 +2618,7 @@ public final Single doOnSuccess(final Consumer onSuccess) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doOnEvent(final BiConsumer onEvent) { - ObjectHelper.requireNonNull(onEvent, "onEvent is null"); + Objects.requireNonNull(onEvent, "onEvent is null"); return RxJavaPlugins.onAssembly(new SingleDoOnEvent(this, onEvent)); } @@ -2639,7 +2640,7 @@ public final Single doOnEvent(final BiConsumer @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doOnError(final Consumer onError) { - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onError, "onError is null"); return RxJavaPlugins.onAssembly(new SingleDoOnError(this, onError)); } @@ -2662,7 +2663,7 @@ public final Single doOnError(final Consumer onError) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single doOnDispose(final Action onDispose) { - ObjectHelper.requireNonNull(onDispose, "onDispose is null"); + Objects.requireNonNull(onDispose, "onDispose is null"); return RxJavaPlugins.onAssembly(new SingleDoOnDispose(this, onDispose)); } @@ -2687,7 +2688,7 @@ public final Single doOnDispose(final Action onDispose) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Maybe filter(Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate is null"); + Objects.requireNonNull(predicate, "predicate is null"); return RxJavaPlugins.onAssembly(new MaybeFilterSingle(this, predicate)); } @@ -2711,7 +2712,7 @@ public final Maybe filter(Predicate predicate) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single flatMap(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new SingleFlatMap(this, mapper)); } @@ -2735,7 +2736,7 @@ public final Single flatMap(Function Maybe flatMapMaybe(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new SingleFlatMapMaybe(this, mapper)); } @@ -2764,7 +2765,7 @@ public final Maybe flatMapMaybe(final Function Flowable flatMapPublisher(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new SingleFlatMapPublisher(this, mapper)); } @@ -2793,7 +2794,7 @@ public final Flowable flatMapPublisher(Function Flowable flattenAsFlowable(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new SingleFlatMapIterableFlowable(this, mapper)); } @@ -2819,7 +2820,7 @@ public final Flowable flattenAsFlowable(final Function Observable flattenAsObservable(final Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new SingleFlatMapIterableObservable(this, mapper)); } @@ -2843,7 +2844,7 @@ public final Observable flattenAsObservable(final Function Observable flatMapObservable(Function> mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new SingleFlatMapObservable(this, mapper)); } @@ -2868,7 +2869,7 @@ public final Observable flatMapObservable(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new SingleFlatMapCompletable(this, mapper)); } @@ -3042,7 +3043,7 @@ public final T blockingGet() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single lift(final SingleOperator lift) { - ObjectHelper.requireNonNull(lift, "lift is null"); + Objects.requireNonNull(lift, "lift is null"); return RxJavaPlugins.onAssembly(new SingleLift(this, lift)); } @@ -3066,7 +3067,7 @@ public final Single lift(final SingleOperator lif @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single map(Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); return RxJavaPlugins.onAssembly(new SingleMap(this, mapper)); } @@ -3130,8 +3131,8 @@ public final Single contains(Object value) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single contains(final Object value, final BiPredicate comparer) { - ObjectHelper.requireNonNull(value, "value is null"); - ObjectHelper.requireNonNull(comparer, "comparer is null"); + Objects.requireNonNull(value, "value is null"); + Objects.requireNonNull(comparer, "comparer is null"); return RxJavaPlugins.onAssembly(new SingleContains(this, value, comparer)); } @@ -3184,7 +3185,7 @@ public final Flowable mergeWith(SingleSource other) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Single observeOn(final Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new SingleObserveOn(this, scheduler)); } @@ -3218,7 +3219,7 @@ public final Single observeOn(final Scheduler scheduler) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single onErrorReturn(final Function resumeFunction) { - ObjectHelper.requireNonNull(resumeFunction, "resumeFunction is null"); + Objects.requireNonNull(resumeFunction, "resumeFunction is null"); return RxJavaPlugins.onAssembly(new SingleOnErrorReturn(this, resumeFunction, null)); } @@ -3238,7 +3239,7 @@ public final Single onErrorReturn(final Function resu @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single onErrorReturnItem(final T value) { - ObjectHelper.requireNonNull(value, "value is null"); + Objects.requireNonNull(value, "value is null"); return RxJavaPlugins.onAssembly(new SingleOnErrorReturn(this, null, value)); } @@ -3273,7 +3274,7 @@ public final Single onErrorReturnItem(final T value) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single onErrorResumeWith(final SingleSource resumeSingleInCaseOfError) { - ObjectHelper.requireNonNull(resumeSingleInCaseOfError, "resumeSingleInCaseOfError is null"); + Objects.requireNonNull(resumeSingleInCaseOfError, "resumeSingleInCaseOfError is null"); return onErrorResumeNext(Functions.justFunction(resumeSingleInCaseOfError)); } @@ -3310,7 +3311,7 @@ public final Single onErrorResumeWith(final SingleSource resumeS @SchedulerSupport(SchedulerSupport.NONE) public final Single onErrorResumeNext( final Function> resumeFunctionInCaseOfError) { - ObjectHelper.requireNonNull(resumeFunctionInCaseOfError, "resumeFunctionInCaseOfError is null"); + Objects.requireNonNull(resumeFunctionInCaseOfError, "resumeFunctionInCaseOfError is null"); return RxJavaPlugins.onAssembly(new SingleResumeNext(this, resumeFunctionInCaseOfError)); } @@ -3614,7 +3615,7 @@ public final Disposable subscribe() { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Disposable subscribe(final BiConsumer onCallback) { - ObjectHelper.requireNonNull(onCallback, "onCallback is null"); + Objects.requireNonNull(onCallback, "onCallback is null"); BiConsumerSingleObserver observer = new BiConsumerSingleObserver(onCallback); subscribe(observer); @@ -3672,8 +3673,8 @@ public final Disposable subscribe(Consumer onSuccess) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Disposable subscribe(final Consumer onSuccess, final Consumer onError) { - ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onSuccess, "onSuccess is null"); + Objects.requireNonNull(onError, "onError is null"); ConsumerSingleObserver observer = new ConsumerSingleObserver(onSuccess, onError); subscribe(observer); @@ -3683,11 +3684,11 @@ public final Disposable subscribe(final Consumer onSuccess, final Con @SchedulerSupport(SchedulerSupport.NONE) @Override public final void subscribe(SingleObserver observer) { - ObjectHelper.requireNonNull(observer, "observer is null"); + Objects.requireNonNull(observer, "observer is null"); observer = RxJavaPlugins.onSubscribe(this, observer); - ObjectHelper.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null SingleObserver. Please check the handler provided to RxJavaPlugins.setOnSingleSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); + Objects.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null SingleObserver. Please check the handler provided to RxJavaPlugins.setOnSingleSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins"); try { subscribeActual(observer); @@ -3763,7 +3764,7 @@ public final > E subscribeWith(E observer) { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Single subscribeOn(final Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new SingleSubscribeOn(this, scheduler)); } @@ -3788,7 +3789,7 @@ public final Single subscribeOn(final Scheduler scheduler) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single takeUntil(final CompletableSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return takeUntil(new CompletableToFlowable(other)); } @@ -3820,7 +3821,7 @@ public final Single takeUntil(final CompletableSource other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single takeUntil(final Publisher other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return RxJavaPlugins.onAssembly(new SingleTakeUntil(this, other)); } @@ -3846,7 +3847,7 @@ public final Single takeUntil(final Publisher other) { @NonNull @SchedulerSupport(SchedulerSupport.NONE) public final Single takeUntil(final SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return takeUntil(new SingleToFlowable(other)); } @@ -3912,7 +3913,7 @@ public final Single timeout(long timeout, TimeUnit unit, Scheduler scheduler) @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Single timeout(long timeout, TimeUnit unit, Scheduler scheduler, SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(timeout, unit, scheduler, other); } @@ -3940,13 +3941,13 @@ public final Single timeout(long timeout, TimeUnit unit, Scheduler scheduler, @NonNull @SchedulerSupport(SchedulerSupport.COMPUTATION) public final Single timeout(long timeout, TimeUnit unit, SingleSource other) { - ObjectHelper.requireNonNull(other, "other is null"); + Objects.requireNonNull(other, "other is null"); return timeout0(timeout, unit, Schedulers.computation(), other); } private Single timeout0(final long timeout, final TimeUnit unit, final Scheduler scheduler, final SingleSource other) { - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new SingleTimeout(this, timeout, unit, scheduler, other)); } @@ -3970,7 +3971,7 @@ private Single timeout0(final long timeout, final TimeUnit unit, final Schedu @CheckReturnValue @SchedulerSupport(SchedulerSupport.NONE) public final R to(@NonNull SingleConverter converter) { - return ObjectHelper.requireNonNull(converter, "converter is null").apply(this); + return Objects.requireNonNull(converter, "converter is null").apply(this); } /** @@ -4095,7 +4096,7 @@ public final Observable toObservable() { @NonNull @SchedulerSupport(SchedulerSupport.CUSTOM) public final Single unsubscribeOn(final Scheduler scheduler) { - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new SingleUnsubscribeOn(this, scheduler)); } diff --git a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java index 245c41305b..c9c0a8988c 100644 --- a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java @@ -16,7 +16,6 @@ import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.exceptions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.*; /** @@ -41,10 +40,10 @@ public CompositeDisposable() { * @throws NullPointerException if {@code disposables} or any of its array items is null */ public CompositeDisposable(@NonNull Disposable... disposables) { - ObjectHelper.requireNonNull(disposables, "disposables is null"); + Objects.requireNonNull(disposables, "disposables is null"); this.resources = new OpenHashSet(disposables.length + 1); for (Disposable d : disposables) { - ObjectHelper.requireNonNull(d, "A Disposable in the disposables array is null"); + Objects.requireNonNull(d, "A Disposable in the disposables array is null"); this.resources.add(d); } } @@ -55,10 +54,10 @@ public CompositeDisposable(@NonNull Disposable... disposables) { * @throws NullPointerException if {@code disposables} or any of its items is null */ public CompositeDisposable(@NonNull Iterable disposables) { - ObjectHelper.requireNonNull(disposables, "disposables is null"); + Objects.requireNonNull(disposables, "disposables is null"); this.resources = new OpenHashSet(); for (Disposable d : disposables) { - ObjectHelper.requireNonNull(d, "A Disposable item in the disposables sequence is null"); + Objects.requireNonNull(d, "A Disposable item in the disposables sequence is null"); this.resources.add(d); } } @@ -95,7 +94,7 @@ public boolean isDisposed() { */ @Override public boolean add(@NonNull Disposable disposable) { - ObjectHelper.requireNonNull(disposable, "disposable is null"); + Objects.requireNonNull(disposable, "disposable is null"); if (!disposed) { synchronized (this) { if (!disposed) { @@ -121,7 +120,7 @@ public boolean add(@NonNull Disposable disposable) { * @throws NullPointerException if {@code disposables} or any of its array items is null */ public boolean addAll(@NonNull Disposable... disposables) { - ObjectHelper.requireNonNull(disposables, "disposables is null"); + Objects.requireNonNull(disposables, "disposables is null"); if (!disposed) { synchronized (this) { if (!disposed) { @@ -131,7 +130,7 @@ public boolean addAll(@NonNull Disposable... disposables) { resources = set; } for (Disposable d : disposables) { - ObjectHelper.requireNonNull(d, "A Disposable in the disposables array is null"); + Objects.requireNonNull(d, "A Disposable in the disposables array is null"); set.add(d); } return true; @@ -168,7 +167,7 @@ public boolean remove(@NonNull Disposable disposable) { */ @Override public boolean delete(@NonNull Disposable disposable) { - ObjectHelper.requireNonNull(disposable, "disposables is null"); + Objects.requireNonNull(disposable, "disposables is null"); if (disposed) { return false; } diff --git a/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java index d566b744f4..2ff83d64ff 100644 --- a/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.disposables; +import java.util.Objects; import java.util.concurrent.Future; import org.reactivestreams.Subscription; @@ -41,7 +42,7 @@ private Disposables() { */ @NonNull public static Disposable fromRunnable(@NonNull Runnable run) { - ObjectHelper.requireNonNull(run, "run is null"); + Objects.requireNonNull(run, "run is null"); return new RunnableDisposable(run); } @@ -53,7 +54,7 @@ public static Disposable fromRunnable(@NonNull Runnable run) { */ @NonNull public static Disposable fromAction(@NonNull Action run) { - ObjectHelper.requireNonNull(run, "run is null"); + Objects.requireNonNull(run, "run is null"); return new ActionDisposable(run); } @@ -65,7 +66,7 @@ public static Disposable fromAction(@NonNull Action run) { */ @NonNull public static Disposable fromFuture(@NonNull Future future) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return fromFuture(future, true); } @@ -78,7 +79,7 @@ public static Disposable fromFuture(@NonNull Future future) { */ @NonNull public static Disposable fromFuture(@NonNull Future future, boolean allowInterrupt) { - ObjectHelper.requireNonNull(future, "future is null"); + Objects.requireNonNull(future, "future is null"); return new FutureDisposable(future, allowInterrupt); } @@ -90,7 +91,7 @@ public static Disposable fromFuture(@NonNull Future future, boolean allowInte */ @NonNull public static Disposable fromSubscription(@NonNull Subscription subscription) { - ObjectHelper.requireNonNull(subscription, "subscription is null"); + Objects.requireNonNull(subscription, "subscription is null"); return new SubscriptionDisposable(subscription); } diff --git a/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java index e5032d694b..eea584ab0b 100644 --- a/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java @@ -13,10 +13,10 @@ package io.reactivex.rxjava3.disposables; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.annotations.NonNull; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Base class for Disposable containers that manage some other type that @@ -29,7 +29,7 @@ abstract class ReferenceDisposable extends AtomicReference implements Disp private static final long serialVersionUID = 6537757548749041217L; ReferenceDisposable(T value) { - super(ObjectHelper.requireNonNull(value, "value is null")); + super(Objects.requireNonNull(value, "value is null")); } protected abstract void onDisposed(@NonNull T value); diff --git a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java index 8b09993ac2..6916d219bf 100644 --- a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.flowables; +import java.util.Objects; import java.util.concurrent.TimeUnit; import org.reactivestreams.Subscriber; @@ -235,8 +236,8 @@ public final Flowable refCount(int subscriberCount, long timeout, TimeUnit un @BackpressureSupport(BackpressureKind.PASS_THROUGH) public final Flowable refCount(int subscriberCount, long timeout, TimeUnit unit, Scheduler scheduler) { ObjectHelper.verifyPositive(subscriberCount, "subscriberCount"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new FlowableRefCount(this, subscriberCount, timeout, unit, scheduler)); } diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java index 3a8c5d7029..1f2d2122d1 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava3.internal.disposables; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.ProtocolViolationException; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -75,7 +75,7 @@ public static boolean set(AtomicReference field, Disposable d) { * @return true if the operation succeeded, false */ public static boolean setOnce(AtomicReference field, Disposable d) { - ObjectHelper.requireNonNull(d, "d is null"); + Objects.requireNonNull(d, "d is null"); if (!field.compareAndSet(null, d)) { d.dispose(); if (field.get() != DISPOSED) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java index f3afcbf2c0..90928b64c6 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java @@ -16,7 +16,6 @@ import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.ExceptionHelper; /** @@ -32,19 +31,19 @@ public ListCompositeDisposable() { } public ListCompositeDisposable(Disposable... resources) { - ObjectHelper.requireNonNull(resources, "resources is null"); + Objects.requireNonNull(resources, "resources is null"); this.resources = new LinkedList(); for (Disposable d : resources) { - ObjectHelper.requireNonNull(d, "Disposable item is null"); + Objects.requireNonNull(d, "Disposable item is null"); this.resources.add(d); } } public ListCompositeDisposable(Iterable resources) { - ObjectHelper.requireNonNull(resources, "resources is null"); + Objects.requireNonNull(resources, "resources is null"); this.resources = new LinkedList(); for (Disposable d : resources) { - ObjectHelper.requireNonNull(d, "Disposable item is null"); + Objects.requireNonNull(d, "Disposable item is null"); this.resources.add(d); } } @@ -74,7 +73,7 @@ public boolean isDisposed() { @Override public boolean add(Disposable d) { - ObjectHelper.requireNonNull(d, "d is null"); + Objects.requireNonNull(d, "d is null"); if (!disposed) { synchronized (this) { if (!disposed) { @@ -93,7 +92,7 @@ public boolean add(Disposable d) { } public boolean addAll(Disposable... ds) { - ObjectHelper.requireNonNull(ds, "ds is null"); + Objects.requireNonNull(ds, "ds is null"); if (!disposed) { synchronized (this) { if (!disposed) { @@ -103,7 +102,7 @@ public boolean addAll(Disposable... ds) { resources = set; } for (Disposable d : ds) { - ObjectHelper.requireNonNull(d, "d is null"); + Objects.requireNonNull(d, "d is null"); set.add(d); } return true; @@ -127,7 +126,7 @@ public boolean remove(Disposable d) { @Override public boolean delete(Disposable d) { - ObjectHelper.requireNonNull(d, "Disposable item is null"); + Objects.requireNonNull(d, "Disposable item is null"); if (disposed) { return false; } diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java index 2e44b86d04..2dcbbdea50 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java +++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java @@ -34,46 +34,46 @@ private Functions() { } public static Function toFunction(final BiFunction f) { - ObjectHelper.requireNonNull(f, "f is null"); + Objects.requireNonNull(f, "f is null"); return new Array2Func(f); } public static Function toFunction(final Function3 f) { - ObjectHelper.requireNonNull(f, "f is null"); + Objects.requireNonNull(f, "f is null"); return new Array3Func(f); } public static Function toFunction(final Function4 f) { - ObjectHelper.requireNonNull(f, "f is null"); + Objects.requireNonNull(f, "f is null"); return new Array4Func(f); } public static Function toFunction(final Function5 f) { - ObjectHelper.requireNonNull(f, "f is null"); + Objects.requireNonNull(f, "f is null"); return new Array5Func(f); } public static Function toFunction( final Function6 f) { - ObjectHelper.requireNonNull(f, "f is null"); + Objects.requireNonNull(f, "f is null"); return new Array6Func(f); } public static Function toFunction( final Function7 f) { - ObjectHelper.requireNonNull(f, "f is null"); + Objects.requireNonNull(f, "f is null"); return new Array7Func(f); } public static Function toFunction( final Function8 f) { - ObjectHelper.requireNonNull(f, "f is null"); + Objects.requireNonNull(f, "f is null"); return new Array8Func(f); } public static Function toFunction( final Function9 f) { - ObjectHelper.requireNonNull(f, "f is null"); + Objects.requireNonNull(f, "f is null"); return new Array9Func(f); } diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java index 65f5a70c82..05bceafa1d 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java @@ -26,22 +26,6 @@ private ObjectHelper() { throw new IllegalStateException("No instances!"); } - /** - * Verifies if the object is not null and returns it or throws a NullPointerException - * with the given message. - * @param the value type - * @param object the object to verify - * @param message the message to use with the NullPointerException - * @return the object itself - * @throws NullPointerException if object is null - */ - public static T requireNonNull(T object, String message) { - if (object == null) { - throw new NullPointerException(message); - } - return object; - } - static final BiPredicate EQUALS = new BiObjectPredicate(); /** diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java index db34238b7a..0f4e4b16ba 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java +++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.jdk8; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.annotations.*; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.BackpressureHelper; @@ -140,7 +140,7 @@ public T poll() { return null; } } - return ObjectHelper.requireNonNull(iterator.next(), "Iterator.next() returned a null value"); + return Objects.requireNonNull(iterator.next(), "Iterator.next() returned a null value"); } @Override @@ -184,7 +184,7 @@ public void run(long n) { } else { T next; try { - next = ObjectHelper.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value"); + next = Objects.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -252,7 +252,7 @@ public void run(long n) { } else { T next; try { - next = ObjectHelper.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value"); + next = Objects.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java index c36f546c16..ef801a1646 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava3.internal.operators.completable; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class CompletableConcatIterable extends Completable { final Iterable sources; @@ -35,7 +35,7 @@ public void subscribeActual(CompletableObserver observer) { Iterator it; try { - it = ObjectHelper.requireNonNull(sources.iterator(), "The iterator returned is null"); + it = Objects.requireNonNull(sources.iterator(), "The iterator returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptyDisposable.error(e, observer); @@ -109,7 +109,7 @@ void next() { CompletableSource c; try { - c = ObjectHelper.requireNonNull(a.next(), "The CompletableSource returned is null"); + c = Objects.requireNonNull(a.next(), "The CompletableSource returned is null"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java index 0e28d0d28f..c451413f49 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java @@ -17,7 +17,8 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; public final class CompletableDefer extends Completable { @@ -32,7 +33,7 @@ protected void subscribeActual(CompletableObserver observer) { CompletableSource c; try { - c = ObjectHelper.requireNonNull(completableSupplier.get(), "The completableSupplier returned a null CompletableSource"); + c = Objects.requireNonNull(completableSupplier.get(), "The completableSupplier returned a null CompletableSource"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptyDisposable.error(e, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java index 12b39277db..bd4250c447 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java @@ -17,7 +17,8 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; public final class CompletableErrorSupplier extends Completable { @@ -32,7 +33,7 @@ protected void subscribeActual(CompletableObserver observer) { Throwable error; try { - error = ObjectHelper.requireNonNull(errorSupplier.get(), "The error returned is null"); + error = Objects.requireNonNull(errorSupplier.get(), "The error returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); error = e; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java index 6d420cf044..55efbd8915 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java @@ -14,12 +14,12 @@ package io.reactivex.rxjava3.internal.operators.completable; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.CompositeDisposable; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.completable.CompletableMergeDelayErrorArray.*; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -40,7 +40,7 @@ public void subscribeActual(final CompletableObserver observer) { Iterator iterator; try { - iterator = ObjectHelper.requireNonNull(sources.iterator(), "The source iterator returned is null"); + iterator = Objects.requireNonNull(sources.iterator(), "The source iterator returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); observer.onError(e); @@ -77,7 +77,7 @@ public void subscribeActual(final CompletableObserver observer) { CompletableSource c; try { - c = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null CompletableSource"); + c = Objects.requireNonNull(iterator.next(), "The iterator returned a null CompletableSource"); } catch (Throwable e) { Exceptions.throwIfFatal(e); errors.tryAddThrowableOrReport(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java index 86c08d359c..b0e5b87bf7 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java @@ -14,12 +14,12 @@ package io.reactivex.rxjava3.internal.operators.completable; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableMergeIterable extends Completable { @@ -41,7 +41,7 @@ public void subscribeActual(final CompletableObserver observer) { Iterator iterator; try { - iterator = ObjectHelper.requireNonNull(sources.iterator(), "The source iterator returned is null"); + iterator = Objects.requireNonNull(sources.iterator(), "The source iterator returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); observer.onError(e); @@ -74,7 +74,7 @@ public void subscribeActual(final CompletableObserver observer) { CompletableSource c; try { - c = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null CompletableSource"); + c = Objects.requireNonNull(iterator.next(), "The iterator returned a null CompletableSource"); } catch (Throwable e) { Exceptions.throwIfFatal(e); set.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java index 63227fb391..1d3bd7a3a0 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.completable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class CompletableResumeNext extends Completable { @@ -79,7 +79,7 @@ public void onError(Throwable e) { CompletableSource c; try { - c = ObjectHelper.requireNonNull(errorMapper.apply(e), "The errorMapper returned a null CompletableSource"); + c = Objects.requireNonNull(errorMapper.apply(e), "The errorMapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(new CompositeException(e, ex)); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java index ab29ce4ae8..7a4e99b332 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.completable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableUsing extends Completable { @@ -54,7 +54,7 @@ protected void subscribeActual(CompletableObserver observer) { CompletableSource source; try { - source = ObjectHelper.requireNonNull(completableFunction.apply(resource), "The completableFunction returned a null CompletableSource"); + source = Objects.requireNonNull(completableFunction.apply(resource), "The completableFunction returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (eager) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java index 76a68d37b3..d83f65c347 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java @@ -16,9 +16,10 @@ import org.reactivestreams.Publisher; import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher; +import java.util.Objects; + /** * Abstract base class for operators that take an upstream * source {@link Publisher}. @@ -39,7 +40,7 @@ abstract class AbstractFlowableWithUpstream extends Flowable implements * @param source the source (upstream) Publisher instance, not null (verified) */ AbstractFlowableWithUpstream(Flowable source) { - this.source = ObjectHelper.requireNonNull(source, "source is null"); + this.source = Objects.requireNonNull(source, "source is null"); } @Override diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java index 899ae6c21c..14654d35ee 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.*; import org.reactivestreams.*; @@ -103,9 +104,9 @@ public static void subscribe(Publisher o) { */ public static void subscribe(Publisher o, final Consumer onNext, final Consumer onError, final Action onComplete) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); subscribe(o, new LambdaSubscriber(onNext, onError, onComplete, Functions.REQUEST_MAX)); } @@ -120,9 +121,9 @@ public static void subscribe(Publisher o, final Consumer void subscribe(Publisher o, final Consumer onNext, final Consumer onError, final Action onComplete, int bufferSize) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); ObjectHelper.verifyPositive(bufferSize, "number > 0 required"); subscribe(o, new BoundedSubscriber(onNext, onError, onComplete, Functions.boundedConsumer(bufferSize), bufferSize)); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java index 0da3aea64e..08f89e99e2 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java @@ -21,7 +21,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -105,7 +104,7 @@ public void onNext(T t) { if (b == null) { try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); + b = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); @@ -227,7 +226,7 @@ public void onNext(T t) { if (i++ == 0) { try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); + b = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); @@ -378,7 +377,7 @@ public void onNext(T t) { C b; try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); + b = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java index 4e8103e1a6..47f6e6bf06 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; @@ -181,8 +180,8 @@ void open(Open token) { Publisher p; C buf; try { - buf = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null Collection"); - p = ObjectHelper.requireNonNull(bufferClose.apply(token), "The bufferClose returned a null Publisher"); + buf = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null Collection"); + p = Objects.requireNonNull(bufferClose.apply(token), "The bufferClose returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); SubscriptionHelper.cancel(upstream); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java index 22d139eb89..a1ca188b13 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Collection; +import java.util.Objects; import org.reactivestreams.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; @@ -73,7 +73,7 @@ public void onSubscribe(Subscription s) { U b; try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancelled = true; @@ -153,7 +153,7 @@ void next() { U next; try { - next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); + next = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java index 4057a06abb..0b3faed1c5 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java @@ -25,7 +25,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; @@ -110,7 +109,7 @@ public void onSubscribe(Subscription s) { U b; try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); @@ -187,7 +186,7 @@ public void run() { U next; try { - next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); + next = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); @@ -258,7 +257,7 @@ public void onSubscribe(Subscription s) { final U b; // NOPMD try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); w.dispose(); @@ -339,7 +338,7 @@ public void run() { final U b; // NOPMD try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); @@ -424,7 +423,7 @@ public void onSubscribe(Subscription s) { U b; try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); w.dispose(); @@ -468,7 +467,7 @@ public void onNext(T t) { fastPathOrderedEmitMax(b, false, this); try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); @@ -550,7 +549,7 @@ public void run() { U next; try { - next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); + next = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java index d5b4dd8233..80345f2f3b 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java @@ -17,10 +17,11 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class FlowableCollect extends AbstractFlowableWithUpstream { final Supplier initialSupplier; @@ -36,7 +37,7 @@ public FlowableCollect(Flowable source, Supplier initialSupplier protected void subscribeActual(Subscriber s) { U u; try { - u = ObjectHelper.requireNonNull(initialSupplier.get(), "The initial value supplied is null"); + u = Objects.requireNonNull(initialSupplier.get(), "The initial value supplied is null"); } catch (Throwable e) { EmptySubscription.error(e, s); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java index b48f4d11fc..fcb5590b49 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java @@ -19,11 +19,12 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class FlowableCollectSingle extends Single implements FuseToFlowable { final Flowable source; @@ -41,7 +42,7 @@ public FlowableCollectSingle(Flowable source, Supplier initialSu protected void subscribeActual(SingleObserver observer) { U u; try { - u = ObjectHelper.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value"); + u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value"); } catch (Throwable e) { EmptyDisposable.error(e, observer); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java index 70f7f313bc..24306072bc 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.flowable.FlowableMap.MapSubscriber; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.*; @@ -82,7 +82,7 @@ public void subscribeActual(Subscriber s) { Iterator> it; try { - it = ObjectHelper.requireNonNull(iterable.iterator(), "The iterator returned is null"); + it = Objects.requireNonNull(iterable.iterator(), "The iterator returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptySubscription.error(e, s); @@ -108,7 +108,7 @@ public void subscribeActual(Subscriber s) { Publisher p; try { - p = ObjectHelper.requireNonNull(it.next(), "The publisher returned by the iterator is null"); + p = Objects.requireNonNull(it.next(), "The publisher returned by the iterator is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptySubscription.error(e, s); @@ -359,7 +359,7 @@ void drainAsync() { R w; try { - w = ObjectHelper.requireNonNull(combiner.apply(va), "The combiner returned a null value"); + w = Objects.requireNonNull(combiner.apply(va), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); @@ -472,7 +472,7 @@ public R poll() throws Throwable { return null; } T[] a = (T[])queue.poll(); - R r = ObjectHelper.requireNonNull(combiner.apply(a), "The combiner returned a null value"); + R r = Objects.requireNonNull(combiner.apply(a), "The combiner returned a null value"); ((CombineLatestInnerSubscriber)e).requestOne(); return r; } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java index a11f206dde..f757fb5f3b 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java @@ -12,6 +12,7 @@ */ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; @@ -19,7 +20,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.*; @@ -277,7 +277,7 @@ void drain() { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher"); } catch (Throwable e) { Exceptions.throwIfFatal(e); @@ -479,7 +479,7 @@ void drain() { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher"); } catch (Throwable e) { Exceptions.throwIfFatal(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java index 29c2077226..9aee3eaebb 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscribers.*; @@ -115,7 +115,7 @@ public void onNext(T t) { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java index 828bb5a5fa..05c984b533 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java @@ -12,6 +12,7 @@ */ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; @@ -19,7 +20,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.*; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; @@ -287,7 +287,7 @@ public void run() { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher"); } catch (Throwable e) { Exceptions.throwIfFatal(e); @@ -474,7 +474,7 @@ public void run() { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher"); } catch (Throwable e) { Exceptions.throwIfFatal(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java index 53f3c4e833..ab86164622 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.BackpressureHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -88,7 +88,7 @@ public void onNext(T t) { Publisher p; try { - p = ObjectHelper.requireNonNull(debounceSelector.apply(t), "The publisher supplied is null"); + p = Objects.requireNonNull(debounceSelector.apply(t), "The publisher supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java index 6117d56f92..6c3d8f9008 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java @@ -18,9 +18,10 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; +import java.util.Objects; + public final class FlowableDefer extends Flowable { final Supplier> supplier; public FlowableDefer(Supplier> supplier) { @@ -31,7 +32,7 @@ public FlowableDefer(Supplier> supplier) { public void subscribeActual(Subscriber s) { Publisher pub; try { - pub = ObjectHelper.requireNonNull(supplier.get(), "The publisher supplied is null"); + pub = Objects.requireNonNull(supplier.get(), "The publisher supplied is null"); } catch (Throwable t) { Exceptions.throwIfFatal(t); EmptySubscription.error(t, s); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java index d19bf4f037..d5e46e6d23 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java @@ -18,10 +18,11 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class FlowableDematerialize extends AbstractFlowableWithUpstream { final Function> selector; @@ -74,7 +75,7 @@ public void onNext(T item) { Notification notification; try { - notification = ObjectHelper.requireNonNull(selector.apply(item), "The selector returned a null Notification"); + notification = Objects.requireNonNull(selector.apply(item), "The selector returned a null Notification"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java index 870710bd87..1cd4be2458 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Collection; +import java.util.Objects; import org.reactivestreams.Subscriber; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.QueueFuseable; import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; @@ -77,7 +77,7 @@ public void onNext(T value) { boolean b; try { - key = ObjectHelper.requireNonNull(keySelector.apply(value), "The keySelector returned a null key"); + key = Objects.requireNonNull(keySelector.apply(value), "The keySelector returned a null key"); b = collection.add(key); } catch (Throwable ex) { fail(ex); @@ -125,7 +125,7 @@ public T poll() throws Throwable { for (;;) { T v = qs.poll(); - if (v == null || collection.add(ObjectHelper.requireNonNull(keySelector.apply(v), "The keySelector returned a null key"))) { + if (v == null || collection.add(Objects.requireNonNull(keySelector.apply(v), "The keySelector returned a null key"))) { return v; } else { if (sourceMode == QueueFuseable.ASYNC) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java index de53c5d5b8..1c14ea54af 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.*; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; @@ -128,7 +128,7 @@ public void onNext(T t) { } Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable e) { Exceptions.throwIfFatal(e); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java index 5c20e9d75a..5c544add23 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; @@ -23,7 +24,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -106,7 +106,7 @@ public void onNext(T value) { CompletableSource cs; try { - cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java index 52a719ca44..94f0fa8653 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscription; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -114,7 +114,7 @@ public void onNext(T value) { CompletableSource cs; try { - cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java index f6cb69c84a..18c2e21f63 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; @@ -115,7 +115,7 @@ public void onNext(T t) { MaybeSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource"); + ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java index b1ba1fed12..366b48be09 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; @@ -115,7 +115,7 @@ public void onNext(T t) { SingleSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource"); + ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java index 808d964798..de7221cb38 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.*; @@ -297,7 +297,7 @@ void drain() { R v; try { - v = ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value"); + v = Objects.requireNonNull(it.next(), "The iterator returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); current = null; @@ -432,7 +432,7 @@ public R poll() throws Throwable { current = it; } - R r = ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value"); + R r = Objects.requireNonNull(it.next(), "The iterator returned a null value"); if (!it.hasNext()) { current = null; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java index 0b49186290..83371ab447 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java @@ -17,11 +17,12 @@ import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.Flowable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import java.util.Objects; + public final class FlowableFromArray extends Flowable { final T[] array; @@ -67,7 +68,7 @@ public final T poll() { } index = i + 1; - return ObjectHelper.requireNonNull(arr[i], "array element is null"); + return Objects.requireNonNull(arr[i], "array element is null"); } @Override diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java index 7f918c5c51..80afc65910 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.Callable; import org.reactivestreams.Subscriber; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -37,7 +37,7 @@ public void subscribeActual(Subscriber s) { T t; try { - t = ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value"); + t = Objects.requireNonNull(callable.call(), "The callable returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (deferred.isCancelled()) { @@ -53,6 +53,6 @@ public void subscribeActual(Subscriber s) { @Override public T get() throws Throwable { - return ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value"); + return Objects.requireNonNull(callable.call(), "The callable returned a null value"); } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java index c8dc87c0c3..7ae3f3e7d1 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Iterator; +import java.util.Objects; import org.reactivestreams.Subscriber; import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.BackpressureHelper; @@ -101,7 +101,7 @@ public final T poll() { return null; } } - return ObjectHelper.requireNonNull(it.next(), "Iterator.next() returned a null value"); + return Objects.requireNonNull(it.next(), "Iterator.next() returned a null value"); } @Override diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java index bd714ee6c0..7be86d618b 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java @@ -18,10 +18,11 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Call a Supplier for each incoming Subscriber and signal the returned value or the thrown exception. * @param the value type and element type returned by the supplier and the flow @@ -42,7 +43,7 @@ public void subscribeActual(Subscriber s) { T t; try { - t = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value"); + t = Objects.requireNonNull(supplier.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (deferred.isCancelled()) { @@ -58,6 +59,6 @@ public void subscribeActual(Subscriber s) { @Override public T get() throws Throwable { - return ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value"); + return Objects.requireNonNull(supplier.get(), "The supplier returned a null value"); } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java index 213073c672..ccd80c53d9 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java @@ -25,7 +25,6 @@ import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; @@ -247,7 +246,7 @@ void drain() { Publisher p; try { - p = ObjectHelper.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher"); + p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -269,7 +268,7 @@ void drain() { R w; try { - w = ObjectHelper.requireNonNull(resultSelector.apply(left, up), "The resultSelector returned a null value"); + w = Objects.requireNonNull(resultSelector.apply(left, up), "The resultSelector returned a null value"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -299,7 +298,7 @@ else if (mode == RIGHT_VALUE) { Publisher p; try { - p = ObjectHelper.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher"); + p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher"); } catch (Throwable exc) { fail(exc, a, q); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java index 243d58b9b8..f8f97191fd 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java @@ -12,6 +12,7 @@ */ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.TimeUnit; import org.reactivestreams.*; @@ -76,7 +77,7 @@ static final class ItemDelayFunction implements Function> @Override public Publisher apply(final T v) throws Throwable { - Publisher p = ObjectHelper.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null Publisher"); + Publisher p = Objects.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null Publisher"); return new FlowableTakePublisher(p, 1).map(Functions.justFunction(v)).defaultIfEmpty(v); } } @@ -164,7 +165,7 @@ static final class FlatMapWithCombinerOuter implements Function apply(final T t) throws Throwable { @SuppressWarnings("unchecked") - Publisher u = (Publisher)ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + Publisher u = (Publisher)Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); return new FlowableMapPublisher(u, new FlatMapWithCombinerInner(combiner, t)); } } @@ -184,7 +185,7 @@ static final class FlatMapIntoIterable implements Function @Override public Publisher apply(T t) throws Throwable { - return new FlowableFromIterable(ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable")); + return new FlowableFromIterable(Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable")); } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java index 591cdb159a..df8eff7049 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; import io.reactivex.rxjava3.internal.operators.flowable.FlowableGroupJoin.*; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; @@ -223,7 +222,7 @@ void drain() { Publisher p; try { - p = ObjectHelper.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher"); + p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -250,7 +249,7 @@ void drain() { R w; try { - w = ObjectHelper.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value"); + w = Objects.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -284,7 +283,7 @@ else if (mode == RIGHT_VALUE) { Publisher p; try { - p = ObjectHelper.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher"); + p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -311,7 +310,7 @@ else if (mode == RIGHT_VALUE) { R w; try { - w = ObjectHelper.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value"); + w = Objects.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value"); } catch (Throwable exc) { fail(exc, a, q); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java index cec093d278..208baca0b2 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java @@ -18,10 +18,11 @@ import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscribers.*; +import java.util.Objects; + public final class FlowableMap extends AbstractFlowableWithUpstream { final Function mapper; public FlowableMap(Flowable source, Function mapper) { @@ -60,7 +61,7 @@ public void onNext(T t) { U v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value."); + v = Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value."); } catch (Throwable ex) { fail(ex); return; @@ -77,7 +78,7 @@ public int requestFusion(int mode) { @Override public U poll() throws Throwable { T t = qs.poll(); - return t != null ? ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null; + return t != null ? Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null; } } @@ -103,7 +104,7 @@ public void onNext(T t) { U v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value."); + v = Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value."); } catch (Throwable ex) { fail(ex); return; @@ -120,7 +121,7 @@ public boolean tryOnNext(T t) { U v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value."); + v = Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value."); } catch (Throwable ex) { fail(ex); return true; @@ -137,7 +138,7 @@ public int requestFusion(int mode) { @Override public U poll() throws Throwable { T t = qs.poll(); - return t != null ? ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null; + return t != null ? Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null; } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java index 9998bee06b..cdfb0b0bb5 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java @@ -18,9 +18,10 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber; +import java.util.Objects; + public final class FlowableMapNotification extends AbstractFlowableWithUpstream { final Function onNextMapper; @@ -66,7 +67,7 @@ public void onNext(T t) { R p; try { - p = ObjectHelper.requireNonNull(onNextMapper.apply(t), "The onNext publisher returned is null"); + p = Objects.requireNonNull(onNextMapper.apply(t), "The onNext publisher returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); @@ -82,7 +83,7 @@ public void onError(Throwable t) { R p; try { - p = ObjectHelper.requireNonNull(onErrorMapper.apply(t), "The onError publisher returned is null"); + p = Objects.requireNonNull(onErrorMapper.apply(t), "The onError publisher returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(new CompositeException(t, e)); @@ -97,7 +98,7 @@ public void onComplete() { R p; try { - p = ObjectHelper.requireNonNull(onCompleteSupplier.get(), "The onComplete publisher returned is null"); + p = Objects.requireNonNull(onCompleteSupplier.get(), "The onComplete publisher returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java index 7a186cdec0..1d939022b4 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java @@ -18,10 +18,11 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class FlowableOnErrorNext extends AbstractFlowableWithUpstream { final Function> nextSupplier; @@ -90,7 +91,7 @@ public void onError(Throwable t) { Publisher p; try { - p = ObjectHelper.requireNonNull(nextSupplier.apply(t), "The nextSupplier returned a null Publisher"); + p = Objects.requireNonNull(nextSupplier.apply(t), "The nextSupplier returned a null Publisher"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(new CompositeException(t, e)); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java index df57dd5c00..4a908cc113 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java @@ -18,9 +18,10 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber; +import java.util.Objects; + public final class FlowableOnErrorReturn extends AbstractFlowableWithUpstream { final Function valueSupplier; public FlowableOnErrorReturn(Flowable source, Function valueSupplier) { @@ -54,7 +55,7 @@ public void onNext(T t) { public void onError(Throwable t) { T v; try { - v = ObjectHelper.requireNonNull(valueSupplier.apply(t), "The valueSupplier returned a null value"); + v = Objects.requireNonNull(valueSupplier.apply(t), "The valueSupplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(new CompositeException(t, ex)); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java index cc36e86821..702955bf02 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java @@ -16,6 +16,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -24,7 +25,6 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; @@ -60,7 +60,7 @@ protected void subscribeActual(Subscriber s) { Publisher other; try { - other = ObjectHelper.requireNonNull(selector.apply(mp), "selector returned a null Publisher"); + other = Objects.requireNonNull(selector.apply(mp), "selector returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java index 4da1d68d99..9d3d3f4794 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java @@ -18,10 +18,11 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Reduces a sequence via a function into a single value or signals NoSuchElementException for * an empty source. @@ -77,7 +78,7 @@ public void onNext(T t) { value = t; } else { try { - value = ObjectHelper.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"); + value = Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java index 72b4f1ac28..2de3b633fe 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java @@ -19,11 +19,12 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Reduce a Flowable into a single value exposed as Single or signal NoSuchElementException. * @@ -105,7 +106,7 @@ public void onNext(T t) { value = t; } else { try { - value = ObjectHelper.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"); + value = Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java index cf489963ed..ec570639c6 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java @@ -19,10 +19,11 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Reduce a sequence of values, starting from a seed value and by using * an accumulator function and return the last accumulated value. @@ -81,7 +82,7 @@ public void onNext(T value) { R v = this.value; if (v != null) { try { - this.value = ObjectHelper.requireNonNull(reducer.apply(v, value), "The reducer returned a null value"); + this.value = Objects.requireNonNull(reducer.apply(v, value), "The reducer returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java index ca8be6779e..343d72c4e3 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java @@ -19,9 +19,10 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.flowable.FlowableReduceSeedSingle.ReduceSeedObserver; +import java.util.Objects; + /** * Reduce a sequence of values, starting from a generated seed value and by using * an accumulator function and return the last accumulated value. @@ -48,7 +49,7 @@ protected void subscribeActual(SingleObserver observer) { R seed; try { - seed = ObjectHelper.requireNonNull(seedSupplier.get(), "The seedSupplier returned a null value"); + seed = Objects.requireNonNull(seedSupplier.get(), "The seedSupplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java index 021b4dd387..dcd807aa2a 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.processors.*; import io.reactivex.rxjava3.subscribers.SerializedSubscriber; @@ -44,7 +44,7 @@ public void subscribeActual(Subscriber s) { Publisher when; try { - when = ObjectHelper.requireNonNull(handler.apply(processor), "handler returned a null Publisher"); + when = Objects.requireNonNull(handler.apply(processor), "handler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java index ff7ddb84af..7307664353 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java @@ -18,12 +18,13 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.flowable.FlowableRepeatWhen.*; import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; import io.reactivex.rxjava3.processors.*; import io.reactivex.rxjava3.subscribers.SerializedSubscriber; +import java.util.Objects; + public final class FlowableRetryWhen extends AbstractFlowableWithUpstream { final Function, ? extends Publisher> handler; @@ -42,7 +43,7 @@ public void subscribeActual(Subscriber s) { Publisher when; try { - when = ObjectHelper.requireNonNull(handler.apply(processor), "handler returned a null Publisher"); + when = Objects.requireNonNull(handler.apply(processor), "handler returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java index 999cf48a51..2ef89c0023 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java @@ -18,10 +18,11 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Utility classes to work with scalar-sourced XMap operators (where X == { flat, concat, switch }). */ @@ -64,7 +65,7 @@ public static boolean tryScalarXMapSubscribe(Publisher source, Publisher r; try { - r = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + r = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, subscriber); @@ -133,7 +134,7 @@ static final class ScalarXMapFlowable extends Flowable { public void subscribeActual(Subscriber s) { Publisher other; try { - other = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null Publisher"); + other = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null Publisher"); } catch (Throwable e) { EmptySubscription.error(e, s); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java index 3dadb2968b..2fab24a484 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java @@ -18,10 +18,11 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class FlowableScan extends AbstractFlowableWithUpstream { final BiFunction accumulator; public FlowableScan(Flowable source, BiFunction accumulator) { @@ -71,7 +72,7 @@ public void onNext(T t) { T u; try { - u = ObjectHelper.requireNonNull(accumulator.apply(v, t), "The value returned by the accumulator is null"); + u = Objects.requireNonNull(accumulator.apply(v, t), "The value returned by the accumulator is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java index c1875f3070..da0b1870da 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java @@ -12,6 +12,7 @@ */ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -19,7 +20,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.*; @@ -41,7 +41,7 @@ protected void subscribeActual(Subscriber s) { R r; try { - r = ObjectHelper.requireNonNull(seedSupplier.get(), "The seed supplied is null"); + r = Objects.requireNonNull(seedSupplier.get(), "The seed supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptySubscription.error(e, s); @@ -109,7 +109,7 @@ public void onNext(T t) { R v = value; try { - v = ObjectHelper.requireNonNull(accumulator.apply(v, t), "The accumulator returned a null value"); + v = Objects.requireNonNull(accumulator.apply(v, t), "The accumulator returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java index e77110b6a0..c618a0252b 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; @@ -110,7 +110,7 @@ public void onNext(T t) { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The publisher returned is null"); + p = Objects.requireNonNull(mapper.apply(t), "The publisher returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java index b45755fc30..c5879c2e74 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.*; @@ -23,7 +24,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.flowable.FlowableTimeoutTimed.TimeoutSupport; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -108,7 +108,7 @@ public void onNext(T t) { Publisher itemTimeoutPublisher; try { - itemTimeoutPublisher = ObjectHelper.requireNonNull( + itemTimeoutPublisher = Objects.requireNonNull( itemTimeoutIndicator.apply(t), "The itemTimeoutIndicator returned a null Publisher."); } catch (Throwable ex) { @@ -243,7 +243,7 @@ public void onNext(T t) { Publisher itemTimeoutPublisher; try { - itemTimeoutPublisher = ObjectHelper.requireNonNull( + itemTimeoutPublisher = Objects.requireNonNull( itemTimeoutIndicator.apply(t), "The itemTimeoutIndicator returned a null Publisher."); } catch (Throwable ex) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java index 9c0dc74d4c..7e2e91c672 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -54,7 +54,7 @@ public void subscribeActual(Subscriber s) { Publisher source; try { - source = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Publisher"); + source = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Publisher"); } catch (Throwable e) { Exceptions.throwIfFatal(e); try { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java index 63ee8ccf3c..4e38351ef7 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; @@ -244,7 +243,7 @@ void drain() { Publisher endSource; try { - endSource = ObjectHelper.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null Publisher"); + endSource = Objects.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null Publisher"); } catch (Throwable ex) { upstream.cancel(); startSubscriber.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java index c3ec3ab5f9..049befd1f4 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.subscribers.SerializedSubscriber; @@ -84,7 +84,7 @@ public boolean tryOnNext(T t) { if (u != null) { R r; try { - r = ObjectHelper.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); + r = Objects.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java index 7c3b06ed8c..1d1be81e05 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Arrays; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; @@ -174,7 +174,7 @@ public boolean tryOnNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(combiner.apply(objects), "The combiner returned a null value"); + v = Objects.requireNonNull(combiner.apply(objects), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancel(); @@ -297,7 +297,7 @@ void dispose() { final class SingletonArrayFunc implements Function { @Override public R apply(T t) throws Throwable { - return ObjectHelper.requireNonNull(combiner.apply(new Object[] { t }), "The combiner returned a null value"); + return Objects.requireNonNull(combiner.apply(new Object[] { t }), "The combiner returned a null value"); } } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java index 09f1a59a7f..27f1f8e2dc 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Arrays; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.*; @@ -229,7 +229,7 @@ void drain() { R v; try { - v = ObjectHelper.requireNonNull(zipper.apply(values.clone()), "The zipper returned a null value"); + v = Objects.requireNonNull(zipper.apply(values.clone()), "The zipper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancelAll(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java index fad3df6e8e..a41c591fe2 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Iterator; +import java.util.Objects; import org.reactivestreams.*; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -41,7 +41,7 @@ public void subscribeActual(Subscriber t) { Iterator it; try { - it = ObjectHelper.requireNonNull(other.iterator(), "The iterator returned by other is null"); + it = Objects.requireNonNull(other.iterator(), "The iterator returned by other is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptySubscription.error(e, t); @@ -99,7 +99,7 @@ public void onNext(T t) { U u; try { - u = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value"); + u = Objects.requireNonNull(iterator.next(), "The iterator returned a null value"); } catch (Throwable e) { error(e); return; @@ -107,7 +107,7 @@ public void onNext(T t) { V v; try { - v = ObjectHelper.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value"); + v = Objects.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value"); } catch (Throwable e) { error(e); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java index b01b58c6a0..f3abd7ddb8 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; @@ -45,7 +45,7 @@ protected void subscribeActual(Subscriber s) { Iterator> it; try { - it = ObjectHelper.requireNonNull(sources.iterator(), "The sources Iterable returned a null Iterator"); + it = Objects.requireNonNull(sources.iterator(), "The sources Iterable returned a null Iterator"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptySubscription.error(ex, s); @@ -169,7 +169,7 @@ void drain() { MaybeSource source; try { - source = ObjectHelper.requireNonNull(sources.next(), "The source Iterator returned a null MaybeSource"); + source = Objects.requireNonNull(sources.next(), "The source Iterator returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); a.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java index 3146b4781d..ccba4e0041 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java @@ -17,7 +17,8 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; /** * Defers the creation of the actual Maybe the incoming MaybeObserver is subscribed to. @@ -37,7 +38,7 @@ protected void subscribeActual(MaybeObserver observer) { MaybeSource source; try { - source = ObjectHelper.requireNonNull(maybeSupplier.get(), "The maybeSupplier returned a null MaybeSource"); + source = Objects.requireNonNull(maybeSupplier.get(), "The maybeSupplier returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java index c463567227..afb27373c5 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,12 +21,11 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps a source item to another MaybeSource then calls a BiFunction with the * original item and the secondary item to generate the final result. - * + * * @param the main value type * @param the second value type * @param the result value type @@ -85,7 +85,7 @@ public void onSuccess(T value) { MaybeSource next; try { - next = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource"); + next = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); inner.downstream.onError(ex); @@ -139,7 +139,7 @@ public void onSuccess(U value) { R r; try { - r = ObjectHelper.requireNonNull(resultSelector.apply(t, value), "The resultSelector returned a null value"); + r = Objects.requireNonNull(resultSelector.apply(t, value), "The resultSelector returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java index 7ad1008421..fb8bb9d9f1 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of the source MaybeSource into a Completable. @@ -80,7 +80,7 @@ public void onSuccess(T value) { CompletableSource cs; try { - cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java index 9c8aef2ba9..8460405dc9 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.Subscriber; @@ -24,7 +25,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.BackpressureHelper; @@ -211,7 +211,7 @@ void drain() { R v; try { - v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value"); + v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); a.onError(ex); @@ -283,7 +283,7 @@ public R poll() throws Exception { Iterator iterator = it; if (iterator != null) { - R v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value"); + R v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value"); if (!iterator.hasNext()) { it = null; } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java index 8c2b4816c9..afbb56f8e9 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; import java.util.Iterator; +import java.util.Objects; import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable; /** @@ -193,7 +193,7 @@ public R poll() throws Exception { Iterator iterator = it; if (iterator != null) { - R v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value"); + R v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value"); if (!iterator.hasNext()) { it = null; } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java index 39007e5117..2f50f8cd7d 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps a value into a MaybeSource and relays its signal. @@ -102,7 +102,7 @@ public void onSuccess(T value) { MaybeSource source; try { - source = ObjectHelper.requireNonNull(onSuccessMapper.apply(value), "The onSuccessMapper returned a null MaybeSource"); + source = Objects.requireNonNull(onSuccessMapper.apply(value), "The onSuccessMapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -117,7 +117,7 @@ public void onError(Throwable e) { MaybeSource source; try { - source = ObjectHelper.requireNonNull(onErrorMapper.apply(e), "The onErrorMapper returned a null MaybeSource"); + source = Objects.requireNonNull(onErrorMapper.apply(e), "The onErrorMapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(new CompositeException(e, ex)); @@ -132,7 +132,7 @@ public void onComplete() { MaybeSource source; try { - source = ObjectHelper.requireNonNull(onCompleteSupplier.get(), "The onCompleteSupplier returned a null MaybeSource"); + source = Objects.requireNonNull(onCompleteSupplier.get(), "The onCompleteSupplier returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java index 011cbd9ab7..38ec9417d9 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of the source MaybeSource into a Single. @@ -81,7 +81,7 @@ public void onSuccess(T value) { SingleSource ss; try { - ss = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource"); + ss = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java index e823b06936..b917a5885e 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of the source MaybeSource into a Single. @@ -82,7 +82,7 @@ public void onSuccess(T value) { SingleSource ss; try { - ss = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource"); + ss = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java index 837ba675ef..325c4db2ea 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps a value into a MaybeSource and relays its signal. @@ -85,7 +85,7 @@ public void onSuccess(T value) { MaybeSource source; try { - source = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource"); + source = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java index 38cb73972c..8e40bbd45d 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java @@ -16,7 +16,8 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; /** * Calls a MaybeOperator for the incoming MaybeObserver. @@ -38,7 +39,7 @@ protected void subscribeActual(MaybeObserver observer) { MaybeObserver lifted; try { - lifted = ObjectHelper.requireNonNull(operator.apply(observer), "The operator returned a null MaybeObserver"); + lifted = Objects.requireNonNull(operator.apply(observer), "The operator returned a null MaybeObserver"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java index c2a14f994d..167e21d7fb 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java @@ -18,7 +18,8 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; /** * Maps the upstream success value into some other value. @@ -79,7 +80,7 @@ public void onSuccess(T value) { R v; try { - v = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null item"); + v = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null item"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java index d5e5069d22..2910a2e803 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.*; @@ -327,7 +327,7 @@ static final class MpscFillOnceSimpleQueue @Override public boolean offer(T value) { - ObjectHelper.requireNonNull(value, "value is null"); + Objects.requireNonNull(value, "value is null"); int idx = producerIndex.getAndIncrement(); if (idx < length()) { lazySet(idx, value); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java index 15ec49c3a9..901016f39a 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,11 +21,10 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Subscribes to the MaybeSource returned by a function if the main source signals an onError. - * + * * @param the value type */ public final class MaybeOnErrorNext extends AbstractMaybeWithUpstream { @@ -97,7 +97,7 @@ public void onError(Throwable e) { MaybeSource m; try { - m = ObjectHelper.requireNonNull(resumeFunction.apply(e), "The resumeFunction returned a null MaybeSource"); + m = Objects.requireNonNull(resumeFunction.apply(e), "The resumeFunction returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(new CompositeException(e, ex)); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java index 5c61179678..c7ab7b8524 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java @@ -18,7 +18,8 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; /** * Returns a value generated via a function if the main source signals an onError. @@ -82,7 +83,7 @@ public void onError(Throwable e) { T v; try { - v = ObjectHelper.requireNonNull(valueSupplier.apply(e), "The valueSupplier returned a null value"); + v = Objects.requireNonNull(valueSupplier.apply(e), "The valueSupplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(new CompositeException(e, ex)); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java index 628c4dda23..0e490d6f40 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -65,7 +65,7 @@ protected void subscribeActual(MaybeObserver observer) { MaybeSource source; try { - source = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null MaybeSource"); + source = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (eager) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java index 9d83976966..d4bf3b0a77 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.maybe; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class MaybeZipArray extends Maybe { @@ -108,7 +108,7 @@ void innerSuccess(T value, int index) { R v; try { - v = ObjectHelper.requireNonNull(zipper.apply(values), "The zipper returned a null value"); + v = Objects.requireNonNull(zipper.apply(values), "The zipper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -190,7 +190,7 @@ public void onComplete() { final class SingletonArrayFunc implements Function { @Override public R apply(T t) throws Throwable { - return ObjectHelper.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value"); + return Objects.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value"); } } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java index efcd10b136..7c2d85c97b 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java @@ -14,12 +14,12 @@ package io.reactivex.rxjava3.internal.operators.maybe; import java.util.Arrays; +import java.util.Objects; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.maybe.MaybeZipArray.ZipCoordinator; public final class MaybeZipIterable extends Maybe { @@ -82,7 +82,7 @@ protected void subscribeActual(MaybeObserver observer) { final class SingletonArrayFunc implements Function { @Override public R apply(T t) throws Throwable { - return ObjectHelper.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value"); + return Objects.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value"); } } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java index 6e16c9b6a9..986af99049 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscription; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; @@ -223,7 +223,7 @@ void drain() { CompletableSource cs; try { - cs = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); queue.clear(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java index 39fa04b174..cd8b9fa77f 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; @@ -251,7 +251,7 @@ void drain() { MaybeSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null MaybeSource"); + ms = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java index cd5e857274..78334d4a1f 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; @@ -246,7 +246,7 @@ void drain() { SingleSource ss; try { - ss = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null SingleSource"); + ss = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java index f354d8f057..a2d66067ab 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscription; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.AtomicThrowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -96,7 +96,7 @@ public void onNext(T t) { CompletableSource c; try { - c = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null CompletableSource"); + c = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java index 56858d5d22..11ea0a4c77 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -116,7 +116,7 @@ public void onNext(T t) { MaybeSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource"); + ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java index ac0880082b..c41b52f6e5 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -116,7 +116,7 @@ public void onNext(T t) { SingleSource ss; try { - ss = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource"); + ss = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java index a4dde1242f..891c2a0f33 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,12 +21,11 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of a Maybe onto an ObservableSource and * relays its signals to the downstream observer. - * + * * @param the success value type of the Maybe source * @param the result type of the ObservableSource and this operator * @since 2.1.15 @@ -99,7 +99,7 @@ public void onSuccess(T t) { ObservableSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java index 66a446f3f3..1ac179bcca 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -22,13 +23,12 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Maps the success value of a Maybe onto a Publisher and * relays its signals to the downstream subscriber. - * + * * @param the success value type of the Maybe source * @param the result type of the Publisher and this operator * @since 2.1.15 @@ -109,7 +109,7 @@ public void onSuccess(T t) { Publisher p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java index 4921722b5d..44f322e39d 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.*; @@ -224,7 +224,7 @@ void drain() { try { T v = queue.poll(); if (v != null) { - cs = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null CompletableSource"); empty = false; } } catch (Throwable ex) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java index 17e4de9050..c76b0115cb 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.*; @@ -224,7 +224,7 @@ void drain() { MaybeSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null MaybeSource"); + ms = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java index 91428a80db..34d7d04734 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.*; @@ -219,7 +219,7 @@ void drain() { SingleSource ss; try { - ss = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null SingleSource"); + ss = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java index 06a09676d0..a7a6a7fd99 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.AtomicThrowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -94,7 +94,7 @@ public void onNext(T t) { CompletableSource c; try { - c = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null CompletableSource"); + c = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java index b85bc0e2c2..bf3c9f43c2 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.AtomicThrowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -109,7 +109,7 @@ public void onNext(T t) { MaybeSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource"); + ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java index 3343f93d97..bc19c88b55 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.AtomicThrowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -109,7 +109,7 @@ public void onNext(T t) { SingleSource ss; try { - ss = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource"); + ss = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java index 24f231e45c..d7fe0e3445 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java @@ -17,10 +17,11 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.maybe.MaybeToObservable; import io.reactivex.rxjava3.internal.operators.single.SingleToObservable; +import java.util.Objects; + /** * Utility class to extract a value from a scalar source reactive type, * map it to a 0-1 type then subscribe the output type's consumer to it, @@ -55,7 +56,7 @@ static boolean tryAsCompletable(Object source, try { T item = supplier.get(); if (item != null) { - cs = ObjectHelper.requireNonNull(mapper.apply(item), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null CompletableSource"); } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); @@ -94,7 +95,7 @@ static boolean tryAsMaybe(Object source, try { T item = supplier.get(); if (item != null) { - cs = ObjectHelper.requireNonNull(mapper.apply(item), "The mapper returned a null MaybeSource"); + cs = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null MaybeSource"); } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); @@ -133,7 +134,7 @@ static boolean tryAsSingle(Object source, try { T item = supplier.get(); if (item != null) { - cs = ObjectHelper.requireNonNull(mapper.apply(item), "The mapper returned a null SingleSource"); + cs = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null SingleSource"); } } catch (Throwable ex) { Exceptions.throwIfFatal(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java index 9591783a8e..bfb466bac1 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.mixed; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,12 +21,11 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of a Single onto an ObservableSource and * relays its signals to the downstream observer. - * + * * @param the success value type of the Single source * @param the result type of the ObservableSource and this operator * @since 2.1.15 @@ -99,7 +99,7 @@ public void onSuccess(T t) { ObservableSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); + o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java index c35f927c0b..c02bcfca88 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.*; import io.reactivex.rxjava3.core.*; @@ -97,9 +98,9 @@ public static void subscribe(ObservableSource o) { */ public static void subscribe(ObservableSource o, final Consumer onNext, final Consumer onError, final Action onComplete) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(onError, "onError is null"); - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); subscribe(o, new LambdaObserver(onNext, onError, onComplete, Functions.emptyConsumer())); } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java index d0ae0b89cc..2b09748a61 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.ExceptionHelper; public final class ObservableBuffer> extends AbstractObservableWithUpstream { @@ -68,7 +67,7 @@ static final class BufferExactObserver> imple boolean createBuffer() { U b; try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "Empty buffer supplied"); + b = Objects.requireNonNull(bufferSupplier.get(), "Empty buffer supplied"); } catch (Throwable t) { Exceptions.throwIfFatal(t); buffer = null; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java index 961c6cd374..cef9ef41d8 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.AtomicThrowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -172,8 +171,8 @@ void open(Open token) { ObservableSource p; C buf; try { - buf = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null Collection"); - p = ObjectHelper.requireNonNull(bufferClose.apply(token), "The bufferClose returned a null ObservableSource"); + buf = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null Collection"); + p = Objects.requireNonNull(bufferClose.apply(token), "The bufferClose returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); DisposableHelper.dispose(upstream); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java index 474e993653..7d76354cf9 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava3.internal.operators.observable; import java.util.Collection; +import java.util.Objects; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.QueueDrainObserver; import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; import io.reactivex.rxjava3.internal.util.QueueDrainHelper; @@ -69,7 +69,7 @@ public void onSubscribe(Disposable d) { U b; try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); cancelled = true; @@ -148,7 +148,7 @@ void next() { U next; try { - next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); + next = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java index 107b011b2d..3b12c3d0f5 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java @@ -24,7 +24,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.QueueDrainObserver; import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; import io.reactivex.rxjava3.internal.util.QueueDrainHelper; @@ -110,7 +109,7 @@ public void onSubscribe(Disposable d) { U b; try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); dispose(); @@ -184,7 +183,7 @@ public void run() { U next; try { - next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); + next = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); @@ -246,7 +245,7 @@ public void onSubscribe(Disposable d) { final U b; // NOPMD try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); d.dispose(); @@ -328,7 +327,7 @@ public void run() { final U b; // NOPMD try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); + b = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); @@ -427,7 +426,7 @@ public void onSubscribe(Disposable d) { U b; try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); d.dispose(); @@ -469,7 +468,7 @@ public void onNext(T t) { fastPathOrderedEmit(b, false, this); try { - b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); + b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); @@ -541,7 +540,7 @@ public void run() { U next; try { - next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); + next = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer"); } catch (Throwable e) { Exceptions.throwIfFatal(e); dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java index 3b81a32ad9..6471d7538c 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java @@ -16,9 +16,10 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class ObservableCollect extends AbstractObservableWithUpstream { final Supplier initialSupplier; final BiConsumer collector; @@ -34,7 +35,7 @@ public ObservableCollect(ObservableSource source, protected void subscribeActual(Observer t) { U u; try { - u = ObjectHelper.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value"); + u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value"); } catch (Throwable e) { EmptyDisposable.error(e, t); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java index a63812a9ab..09c86cb24a 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java @@ -16,10 +16,11 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class ObservableCollectSingle extends Single implements FuseToObservable { final ObservableSource source; @@ -38,7 +39,7 @@ public ObservableCollectSingle(ObservableSource source, protected void subscribeActual(SingleObserver t) { U u; try { - u = ObjectHelper.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value"); + u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value"); } catch (Throwable e) { EmptyDisposable.error(e, t); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java index 6a379d142c..0cc8e3e45e 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -188,7 +188,7 @@ void drain() { R v; try { - v = ObjectHelper.requireNonNull(combiner.apply(s), "The combiner returned a null value"); + v = Objects.requireNonNull(combiner.apply(s), "The combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); errors.tryAddThrowableOrReport(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java index 665306db95..b96b1ec8a0 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java @@ -12,6 +12,7 @@ */ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -19,7 +20,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.*; @@ -208,7 +208,7 @@ void drain() { ObservableSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); + o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); dispose(); @@ -436,7 +436,7 @@ void drain() { ObservableSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource"); + o = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancelled = true; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java index 47c4099b83..fe2bed8c8c 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.observable; import java.util.ArrayDeque; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import io.reactivex.rxjava3.core.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.observers.*; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; @@ -271,7 +271,7 @@ public void drain() { break; } - source = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource"); + source = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java index efe4b79fc6..f45dd92f1f 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java @@ -12,6 +12,7 @@ */ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -19,7 +20,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.*; @@ -218,7 +218,7 @@ public void run() { ObservableSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); + o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); dispose(); @@ -459,7 +459,7 @@ public void run() { ObservableSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource"); + o = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancelled = true; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java index d2e1f8cf18..20f98731c1 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.observers.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -81,7 +81,7 @@ public void onNext(T t) { ObservableSource p; try { - p = ObjectHelper.requireNonNull(debounceSelector.apply(t), "The ObservableSource supplied is null"); + p = Objects.requireNonNull(debounceSelector.apply(t), "The ObservableSource supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java index c1f8dc41ab..15b3394af7 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java @@ -17,7 +17,8 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; public final class ObservableDefer extends Observable { final Supplier> supplier; @@ -29,7 +30,7 @@ public ObservableDefer(Supplier> supplie public void subscribeActual(Observer observer) { ObservableSource pub; try { - pub = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null ObservableSource"); + pub = Objects.requireNonNull(supplier.get(), "The supplier returned a null ObservableSource"); } catch (Throwable t) { Exceptions.throwIfFatal(t); EmptyDisposable.error(t, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java index 59da21cd47..45b42e1ecc 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java @@ -18,9 +18,10 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class ObservableDematerialize extends AbstractObservableWithUpstream { final Function> selector; @@ -83,7 +84,7 @@ public void onNext(T item) { Notification notification; try { - notification = ObjectHelper.requireNonNull(selector.apply(item), "The selector returned a null Notification"); + notification = Objects.requireNonNull(selector.apply(item), "The selector returned a null Notification"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java index 98c197156c..aadeafb2b1 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava3.internal.operators.observable; import java.util.Collection; +import java.util.Objects; import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; import io.reactivex.rxjava3.internal.util.ExceptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -74,7 +74,7 @@ public void onNext(T value) { boolean b; try { - key = ObjectHelper.requireNonNull(keySelector.apply(value), "The keySelector returned a null key"); + key = Objects.requireNonNull(keySelector.apply(value), "The keySelector returned a null key"); b = collection.add(key); } catch (Throwable ex) { fail(ex); @@ -120,7 +120,7 @@ public T poll() throws Throwable { for (;;) { T v = qd.poll(); - if (v == null || collection.add(ObjectHelper.requireNonNull(keySelector.apply(v), "The keySelector returned a null key"))) { + if (v == null || collection.add(Objects.requireNonNull(keySelector.apply(v), "The keySelector returned a null key"))) { return v; } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java index 596719176e..7e01d7cbc1 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.*; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -117,7 +116,7 @@ public void onNext(T t) { } ObservableSource p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); + p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); } catch (Throwable e) { Exceptions.throwIfFatal(e); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java index 26f0505a14..75fc80ac61 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.annotations.Nullable; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -88,7 +88,7 @@ public void onNext(T value) { CompletableSource cs; try { - cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java index b9a9213769..ddf9602a05 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; import io.reactivex.rxjava3.internal.util.AtomicThrowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -94,7 +94,7 @@ public void onNext(T value) { CompletableSource cs; try { - cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java index 9e323ec346..ac951a571c 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -96,7 +96,7 @@ public void onNext(T t) { MaybeSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource"); + ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java index 4ca080a73f..6d5dd3da63 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -96,7 +96,7 @@ public void onNext(T t) { SingleSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource"); + ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java index c6704398a1..3f90f31acd 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava3.internal.operators.observable; import java.util.Iterator; +import java.util.Objects; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** @@ -100,7 +100,7 @@ public void onNext(T value) { R v; try { - v = ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value"); + v = Objects.requireNonNull(it.next(), "The iterator returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java index 7c4b09ba62..fb4beaaf21 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java @@ -15,9 +15,10 @@ import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable; +import java.util.Objects; + public final class ObservableFromArray extends Observable { final T[] array; public ObservableFromArray(T[] array) { @@ -70,7 +71,7 @@ public T poll() { T[] a = array; if (i != a.length) { index = i + 1; - return ObjectHelper.requireNonNull(a[i], "The array element is null"); + return Objects.requireNonNull(a[i], "The array element is null"); } return null; } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java index 91811b3c4a..9edf260931 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java @@ -14,12 +14,12 @@ package io.reactivex.rxjava3.internal.operators.observable; import java.util.Iterator; +import java.util.Objects; import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable; public final class ObservableFromIterable extends Observable { @@ -88,7 +88,7 @@ void run() { T v; try { - v = ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value"); + v = Objects.requireNonNull(it.next(), "The iterator returned a null value"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); @@ -138,7 +138,7 @@ public T poll() { checkNext = true; } - return ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value"); + return Objects.requireNonNull(it.next(), "The iterator returned a null value"); } @Override diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java index 821d2e81e1..78edf33cea 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java @@ -23,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.observables.GroupedObservable; @@ -115,7 +114,7 @@ public void onNext(T t) { V v; try { - v = ObjectHelper.requireNonNull(valueSelector.apply(t), "The value supplied is null"); + v = Objects.requireNonNull(valueSelector.apply(t), "The value supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java index b6c9f811f4..7b12579966 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java @@ -26,7 +26,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.ExceptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -243,7 +242,7 @@ void drain() { ObservableSource p; try { - p = ObjectHelper.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null ObservableSource"); + p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null ObservableSource"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -265,7 +264,7 @@ void drain() { R w; try { - w = ObjectHelper.requireNonNull(resultSelector.apply(left, up), "The resultSelector returned a null value"); + w = Objects.requireNonNull(resultSelector.apply(left, up), "The resultSelector returned a null value"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -288,7 +287,7 @@ else if (mode == RIGHT_VALUE) { ObservableSource p; try { - p = ObjectHelper.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null ObservableSource"); + p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null ObservableSource"); } catch (Throwable exc) { fail(exc, a, q); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java index 1665b99014..fcd5f57fa5 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java @@ -12,6 +12,7 @@ */ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.TimeUnit; import io.reactivex.rxjava3.core.*; @@ -73,7 +74,7 @@ static final class ItemDelayFunction implements Function apply(final T v) throws Throwable { - ObservableSource o = ObjectHelper.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null ObservableSource"); + ObservableSource o = Objects.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null ObservableSource"); return new ObservableTake(o, 1).map(Functions.justFunction(v)).defaultIfEmpty(v); } } @@ -161,7 +162,7 @@ static final class FlatMapWithCombinerOuter implements Function apply(final T t) throws Throwable { @SuppressWarnings("unchecked") - ObservableSource u = (ObservableSource)ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); + ObservableSource u = (ObservableSource)Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); return new ObservableMap(u, new FlatMapWithCombinerInner(combiner, t)); } } @@ -181,7 +182,7 @@ static final class FlatMapIntoIterable implements Function apply(T t) throws Throwable { - return new ObservableFromIterable(ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable")); + return new ObservableFromIterable(Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable")); } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java index cf98732637..6660d342f3 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java @@ -24,7 +24,6 @@ import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.observable.ObservableGroupJoin.*; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.ExceptionHelper; @@ -219,7 +218,7 @@ void drain() { ObservableSource p; try { - p = ObjectHelper.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null ObservableSource"); + p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null ObservableSource"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -243,7 +242,7 @@ void drain() { R w; try { - w = ObjectHelper.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value"); + w = Objects.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -263,7 +262,7 @@ else if (mode == RIGHT_VALUE) { ObservableSource p; try { - p = ObjectHelper.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null ObservableSource"); + p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null ObservableSource"); } catch (Throwable exc) { fail(exc, a, q); return; @@ -287,7 +286,7 @@ else if (mode == RIGHT_VALUE) { R w; try { - w = ObjectHelper.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value"); + w = Objects.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value"); } catch (Throwable exc) { fail(exc, a, q); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java index f38ac66bd3..4aa45683ff 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java @@ -15,9 +15,10 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Allows lifting operators into a chain of Observables. * @@ -40,7 +41,7 @@ public ObservableLift(ObservableSource source, ObservableOperator observer) { Observer liftedObserver; try { - liftedObserver = ObjectHelper.requireNonNull(operator.apply(observer), "Operator " + operator + " returned a null Observer"); + liftedObserver = Objects.requireNonNull(operator.apply(observer), "Operator " + operator + " returned a null Observer"); } catch (NullPointerException e) { // NOPMD throw e; } catch (Throwable e) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java index 9bff5de703..4361016ec6 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java @@ -16,9 +16,10 @@ import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; +import java.util.Objects; + public final class ObservableMap extends AbstractObservableWithUpstream { final Function function; @@ -54,7 +55,7 @@ public void onNext(T t) { U v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value."); + v = Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value."); } catch (Throwable ex) { fail(ex); return; @@ -71,7 +72,7 @@ public int requestFusion(int mode) { @Override public U poll() throws Throwable { T t = qd.poll(); - return t != null ? ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null; + return t != null ? Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null; } } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java index 8ef5a5395d..147c21ae37 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java @@ -18,7 +18,8 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; public final class ObservableMapNotification extends AbstractObservableWithUpstream> { @@ -84,7 +85,7 @@ public void onNext(T t) { ObservableSource p; try { - p = ObjectHelper.requireNonNull(onNextMapper.apply(t), "The onNext ObservableSource returned is null"); + p = Objects.requireNonNull(onNextMapper.apply(t), "The onNext ObservableSource returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); @@ -99,7 +100,7 @@ public void onError(Throwable t) { ObservableSource p; try { - p = ObjectHelper.requireNonNull(onErrorMapper.apply(t), "The onError ObservableSource returned is null"); + p = Objects.requireNonNull(onErrorMapper.apply(t), "The onError ObservableSource returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(new CompositeException(t, e)); @@ -115,7 +116,7 @@ public void onComplete() { ObservableSource p; try { - p = ObjectHelper.requireNonNull(onCompleteSupplier.get(), "The onComplete ObservableSource returned is null"); + p = Objects.requireNonNull(onCompleteSupplier.get(), "The onComplete ObservableSource returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java index ef7d2367fc..8247a6abfc 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.subjects.PublishSubject; /** @@ -45,7 +45,7 @@ protected void subscribeActual(Observer observer) { ObservableSource target; try { - target = ObjectHelper.requireNonNull(selector.apply(subject), "The selector returned a null ObservableSource"); + target = Objects.requireNonNull(selector.apply(subject), "The selector returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java index 24d5e5d568..bab7bbb065 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java @@ -18,9 +18,10 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Reduce a sequence of values into a single value via an aggregator function and emit the final value or complete * if the source is empty. @@ -78,7 +79,7 @@ public void onNext(T value) { this.value = value; } else { try { - this.value = ObjectHelper.requireNonNull(reducer.apply(v, value), "The reducer returned a null value"); + this.value = Objects.requireNonNull(reducer.apply(v, value), "The reducer returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java index 4ec8ac8bcc..e6b0d1d0ef 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java @@ -18,9 +18,10 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Reduce a sequence of values, starting from a seed value and by using * an accumulator function and return the last accumulated value. @@ -77,7 +78,7 @@ public void onNext(T value) { R v = this.value; if (v != null) { try { - this.value = ObjectHelper.requireNonNull(reducer.apply(v, value), "The reducer returned a null value"); + this.value = Objects.requireNonNull(reducer.apply(v, value), "The reducer returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java index e7b1b16813..956d7bf7c9 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java @@ -17,9 +17,10 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.observable.ObservableReduceSeedSingle.ReduceSeedObserver; +import java.util.Objects; + /** * Reduce a sequence of values, starting from a generated seed value and by using * an accumulator function and return the last accumulated value. @@ -46,7 +47,7 @@ protected void subscribeActual(SingleObserver observer) { R seed; try { - seed = ObjectHelper.requireNonNull(seedSupplier.get(), "The seedSupplier returned a null value"); + seed = Objects.requireNonNull(seedSupplier.get(), "The seedSupplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java index abdf42b872..eff1e248ac 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.subjects.*; @@ -45,7 +45,7 @@ protected void subscribeActual(Observer observer) { ObservableSource other; try { - other = ObjectHelper.requireNonNull(handler.apply(signaller), "The handler returned a null ObservableSource"); + other = Objects.requireNonNull(handler.apply(signaller), "The handler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java index 1bb4f344d4..ba0811b85c 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java @@ -24,7 +24,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.observables.ConnectableObservable; @@ -1054,8 +1053,8 @@ protected void subscribeActual(Observer child) { ConnectableObservable co; ObservableSource observable; try { - co = ObjectHelper.requireNonNull(connectableFactory.get(), "The connectableFactory returned a null ConnectableObservable"); - observable = ObjectHelper.requireNonNull(selector.apply(co), "The selector returned a null ObservableSource"); + co = Objects.requireNonNull(connectableFactory.get(), "The connectableFactory returned a null ConnectableObservable"); + observable = Objects.requireNonNull(selector.apply(co), "The selector returned a null ObservableSource"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptyDisposable.error(e, child); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java index 054887adab..0eb5fbb5b7 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.subjects.*; @@ -45,7 +45,7 @@ protected void subscribeActual(Observer observer) { ObservableSource other; try { - other = ObjectHelper.requireNonNull(handler.apply(signaller), "The handler returned a null ObservableSource"); + other = Objects.requireNonNull(handler.apply(signaller), "The handler returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java index 85c13e27e7..128d327e2b 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import io.reactivex.rxjava3.annotations.Nullable; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -66,7 +66,7 @@ public static boolean tryScalarXMapSubscribe(ObservableSource source, ObservableSource r; try { - r = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); + r = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); @@ -138,7 +138,7 @@ static final class ScalarXMapObservable extends Observable { public void subscribeActual(Observer observer) { ObservableSource other; try { - other = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null ObservableSource"); + other = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null ObservableSource"); } catch (Throwable e) { EmptyDisposable.error(e, observer); return; diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java index 026b3ac5eb..94918b6c39 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java @@ -18,9 +18,10 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class ObservableScan extends AbstractObservableWithUpstream { final BiFunction accumulator; public ObservableScan(ObservableSource source, BiFunction accumulator) { @@ -80,7 +81,7 @@ public void onNext(T t) { T u; try { - u = ObjectHelper.requireNonNull(accumulator.apply(v, t), "The value returned by the accumulator is null"); + u = Objects.requireNonNull(accumulator.apply(v, t), "The value returned by the accumulator is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java index e13c6fe189..24e4b580ad 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java @@ -17,9 +17,10 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + public final class ObservableScanSeed extends AbstractObservableWithUpstream { final BiFunction accumulator; final Supplier seedSupplier; @@ -35,7 +36,7 @@ public void subscribeActual(Observer t) { R r; try { - r = ObjectHelper.requireNonNull(seedSupplier.get(), "The seed supplied is null"); + r = Objects.requireNonNull(seedSupplier.get(), "The seed supplied is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptyDisposable.error(e, t); @@ -93,7 +94,7 @@ public void onNext(T t) { R u; try { - u = ObjectHelper.requireNonNull(accumulator.apply(v, t), "The accumulator returned a null value"); + u = Objects.requireNonNull(accumulator.apply(v, t), "The accumulator returned a null value"); } catch (Throwable e) { Exceptions.throwIfFatal(e); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java index d9d50fc032..bca0f1beeb 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.*; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; import io.reactivex.rxjava3.internal.util.AtomicThrowable; @@ -108,7 +108,7 @@ public void onNext(T t) { ObservableSource p; try { - p = ObjectHelper.requireNonNull(mapper.apply(t), "The ObservableSource returned is null"); + p = Objects.requireNonNull(mapper.apply(t), "The ObservableSource returned is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); upstream.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java index 4fe72feadd..a9ada29730 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.observable.ObservableTimeoutTimed.TimeoutSupport; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -102,7 +102,7 @@ public void onNext(T t) { ObservableSource itemTimeoutObservableSource; try { - itemTimeoutObservableSource = ObjectHelper.requireNonNull( + itemTimeoutObservableSource = Objects.requireNonNull( itemTimeoutIndicator.apply(t), "The itemTimeoutIndicator returned a null ObservableSource."); } catch (Throwable ex) { @@ -231,7 +231,7 @@ public void onNext(T t) { ObservableSource itemTimeoutObservableSource; try { - itemTimeoutObservableSource = ObjectHelper.requireNonNull( + itemTimeoutObservableSource = Objects.requireNonNull( itemTimeoutIndicator.apply(t), "The itemTimeoutIndicator returned a null ObservableSource."); } catch (Throwable ex) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java index 3a4e5d81e2..60fad9e740 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableUsing extends Observable { @@ -53,7 +53,7 @@ public void subscribeActual(Observer observer) { ObservableSource source; try { - source = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null ObservableSource"); + source = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null ObservableSource"); } catch (Throwable e) { Exceptions.throwIfFatal(e); try { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java index 037c7d0773..5ea42da118 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java @@ -23,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; import io.reactivex.rxjava3.internal.util.*; @@ -236,7 +235,7 @@ void drain() { ObservableSource endSource; try { - endSource = ObjectHelper.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null ObservableSource"); + endSource = Objects.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null ObservableSource"); } catch (Throwable ex) { upstream.dispose(); startObserver.dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java index 91b4b0266d..6ac680db30 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.observers.SerializedObserver; public final class ObservableWithLatestFrom extends AbstractObservableWithUpstream { @@ -73,7 +73,7 @@ public void onNext(T t) { if (u != null) { R r; try { - r = ObjectHelper.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); + r = Objects.requireNonNull(combiner.apply(t, u), "The combiner returned a null value"); } catch (Throwable e) { Exceptions.throwIfFatal(e); dispose(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java index fc64adc42f..73d28032fc 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.observable; import java.util.Arrays; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.annotations.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -164,7 +164,7 @@ public void onNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(combiner.apply(objects), "combiner returned a null value"); + v = Objects.requireNonNull(combiner.apply(objects), "combiner returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); dispose(); @@ -285,7 +285,7 @@ public void dispose() { final class SingletonArrayFunc implements Function { @Override public R apply(T t) throws Throwable { - return ObjectHelper.requireNonNull(combiner.apply(new Object[] { t }), "The combiner returned a null value"); + return Objects.requireNonNull(combiner.apply(new Object[] { t }), "The combiner returned a null value"); } } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java index b3d40dc2ed..80ae9b174b 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.observable; import java.util.Arrays; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; public final class ObservableZip extends Observable { @@ -195,7 +195,7 @@ public void drain() { R v; try { - v = ObjectHelper.requireNonNull(zipper.apply(os.clone()), "The zipper returned a null value"); + v = Objects.requireNonNull(zipper.apply(os.clone()), "The zipper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java index d86b90395d..d775c58515 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava3.internal.operators.observable; import java.util.Iterator; +import java.util.Objects; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableZipIterable extends Observable { @@ -41,7 +41,7 @@ public void subscribeActual(Observer t) { Iterator it; try { - it = ObjectHelper.requireNonNull(other.iterator(), "The iterator returned by other is null"); + it = Objects.requireNonNull(other.iterator(), "The iterator returned by other is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptyDisposable.error(e, t); @@ -109,7 +109,7 @@ public void onNext(T t) { U u; try { - u = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value"); + u = Objects.requireNonNull(iterator.next(), "The iterator returned a null value"); } catch (Throwable e) { Exceptions.throwIfFatal(e); error(e); @@ -118,7 +118,7 @@ public void onNext(T t) { V v; try { - v = ObjectHelper.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value"); + v = Objects.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value"); } catch (Throwable e) { Exceptions.throwIfFatal(e); error(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java index d37bcfa1b3..e1da1b76b7 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java @@ -17,12 +17,13 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.parallel.ParallelFlowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Reduce the sequence of values in each 'rail' to a single value. * @@ -59,7 +60,7 @@ public void subscribe(Subscriber[] subscribers) { C initialValue; try { - initialValue = ObjectHelper.requireNonNull(initialCollection.get(), "The initialSupplier returned a null value"); + initialValue = Objects.requireNonNull(initialCollection.get(), "The initialSupplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); reportError(subscribers, ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java index 5b7d3ef5c4..1ff745ecba 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java @@ -16,11 +16,12 @@ import org.reactivestreams.*; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap; import io.reactivex.rxjava3.internal.util.ErrorMode; import io.reactivex.rxjava3.parallel.ParallelFlowable; +import java.util.Objects; + /** * Concatenates the generated Publishers on each rail. * @@ -42,9 +43,9 @@ public ParallelConcatMap( Function> mapper, int prefetch, ErrorMode errorMode) { this.source = source; - this.mapper = ObjectHelper.requireNonNull(mapper, "mapper"); + this.mapper = Objects.requireNonNull(mapper, "mapper"); this.prefetch = prefetch; - this.errorMode = ObjectHelper.requireNonNull(errorMode, "errorMode"); + this.errorMode = Objects.requireNonNull(errorMode, "errorMode"); } @Override diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java index 0e93abcccb..557d5282c4 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java @@ -17,12 +17,13 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.parallel.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Calls a Consumer for each upstream value passing by * and handles any failure with a handler function. @@ -133,7 +134,7 @@ public boolean tryOnNext(T t) { ParallelFailureHandling h; try { - h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); + h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); cancel(); @@ -244,7 +245,7 @@ public boolean tryOnNext(T t) { ParallelFailureHandling h; try { - h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); + h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java index 12366c30fa..f6eff78249 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java @@ -17,12 +17,13 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.parallel.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Filters each 'rail' of the source ParallelFlowable with a predicate function. * @@ -136,7 +137,7 @@ public boolean tryOnNext(T t) { ParallelFailureHandling h; try { - h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); + h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); cancel(); @@ -225,7 +226,7 @@ public boolean tryOnNext(T t) { ParallelFailureHandling h; try { - h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); + h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java index b262bfa240..c941887853 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java @@ -18,12 +18,13 @@ import io.reactivex.rxjava3.core.FlowableSubscriber; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.parallel.ParallelFlowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Maps each 'rail' of the source ParallelFlowable with a mapper function. * @@ -110,7 +111,7 @@ public void onNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); + v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancel(); @@ -183,7 +184,7 @@ public void onNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); + v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancel(); @@ -202,7 +203,7 @@ public boolean tryOnNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); + v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java index 8096116ea5..ff8da40c62 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java @@ -17,12 +17,13 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.parallel.*; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Maps each 'rail' of the source ParallelFlowable with a mapper function * and handle any failure based on a handler function. @@ -129,14 +130,14 @@ public boolean tryOnNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); + v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); ParallelFailureHandling h; try { - h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); + h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); cancel(); @@ -242,14 +243,14 @@ public boolean tryOnNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value"); + v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); ParallelFailureHandling h; try { - h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); + h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item"); } catch (Throwable exc) { Exceptions.throwIfFatal(exc); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java index 4c15e207d4..50f04d46ec 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java @@ -18,11 +18,12 @@ import io.reactivex.rxjava3.core.FlowableSubscriber; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.parallel.ParallelFlowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Execute a Consumer in each 'rail' for the current element passing through. * @@ -53,14 +54,14 @@ public ParallelPeek(ParallelFlowable source, ) { this.source = source; - this.onNext = ObjectHelper.requireNonNull(onNext, "onNext is null"); - this.onAfterNext = ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null"); - this.onError = ObjectHelper.requireNonNull(onError, "onError is null"); - this.onComplete = ObjectHelper.requireNonNull(onComplete, "onComplete is null"); - this.onAfterTerminated = ObjectHelper.requireNonNull(onAfterTerminated, "onAfterTerminated is null"); - this.onSubscribe = ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); - this.onRequest = ObjectHelper.requireNonNull(onRequest, "onRequest is null"); - this.onCancel = ObjectHelper.requireNonNull(onCancel, "onCancel is null"); + this.onNext = Objects.requireNonNull(onNext, "onNext is null"); + this.onAfterNext = Objects.requireNonNull(onAfterNext, "onAfterNext is null"); + this.onError = Objects.requireNonNull(onError, "onError is null"); + this.onComplete = Objects.requireNonNull(onComplete, "onComplete is null"); + this.onAfterTerminated = Objects.requireNonNull(onAfterTerminated, "onAfterTerminated is null"); + this.onSubscribe = Objects.requireNonNull(onSubscribe, "onSubscribe is null"); + this.onRequest = Objects.requireNonNull(onRequest, "onRequest is null"); + this.onCancel = Objects.requireNonNull(onCancel, "onCancel is null"); } @Override diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java index f813149407..87c02c8922 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java @@ -17,12 +17,13 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.parallel.ParallelFlowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Reduce the sequence of values in each 'rail' to a single value. * @@ -58,7 +59,7 @@ public void subscribe(Subscriber[] subscribers) { R initialValue; try { - initialValue = ObjectHelper.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value"); + initialValue = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); reportError(subscribers, ex); @@ -115,7 +116,7 @@ public void onNext(T t) { R v; try { - v = ObjectHelper.requireNonNull(reducer.apply(accumulator, t), "The reducer returned a null value"); + v = Objects.requireNonNull(reducer.apply(accumulator, t), "The reducer returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java index 3a8cfa2290..e376c352cb 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.parallel; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.BiFunction; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.parallel.ParallelFlowable; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -132,7 +132,7 @@ void innerComplete(T value) { if (sp != null) { try { - value = ObjectHelper.requireNonNull(reducer.apply(sp.first, sp.second), "The reducer returned a null value"); + value = Objects.requireNonNull(reducer.apply(sp.first, sp.second), "The reducer returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); innerError(ex); @@ -192,7 +192,7 @@ public void onNext(T t) { } else { try { - v = ObjectHelper.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"); + v = Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); get().cancel(); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java index fff2ca8d58..24a35fbdee 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java @@ -17,7 +17,8 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; public final class SingleDefer extends Single { @@ -32,7 +33,7 @@ protected void subscribeActual(SingleObserver observer) { SingleSource next; try { - next = ObjectHelper.requireNonNull(singleSupplier.get(), "The singleSupplier returned a null SingleSource"); + next = Objects.requireNonNull(singleSupplier.get(), "The singleSupplier returned a null SingleSource"); } catch (Throwable e) { Exceptions.throwIfFatal(e); EmptyDisposable.error(e, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java index 15f57b631b..4582e4d4da 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java @@ -18,7 +18,8 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; /** * Maps the success value of the source to a Notification, then @@ -81,7 +82,7 @@ public void onSuccess(T t) { Notification notification; try { - notification = ObjectHelper.requireNonNull(selector.apply(t), "The selector returned a null Notification"); + notification = Objects.requireNonNull(selector.apply(t), "The selector returned a null Notification"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java index 3128c93e5a..d622f83fae 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.single; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class SingleFlatMap extends Single { final SingleSource source; @@ -74,7 +74,7 @@ public void onSuccess(T value) { SingleSource o; try { - o = ObjectHelper.requireNonNull(mapper.apply(value), "The single returned by the mapper is null"); + o = Objects.requireNonNull(mapper.apply(value), "The single returned by the mapper is null"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java index 03edadb83b..d4a9f54737 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.single; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of the source SingleSource into a Completable. @@ -80,7 +80,7 @@ public void onSuccess(T value) { CompletableSource cs; try { - cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); + cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java index cc7f2740b9..0d9e4aee0f 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.single; import java.util.Iterator; +import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.Subscriber; @@ -24,7 +25,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.*; import io.reactivex.rxjava3.internal.util.BackpressureHelper; @@ -166,7 +166,7 @@ void drain() { R v; try { - v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value"); + v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); a.onError(ex); @@ -277,7 +277,7 @@ public R poll() throws Exception { Iterator iterator = it; if (iterator != null) { - R v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value"); + R v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value"); if (!iterator.hasNext()) { it = null; } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java index d742a06e1c..795f60a3ca 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java @@ -14,6 +14,7 @@ package io.reactivex.rxjava3.internal.operators.single; import java.util.Iterator; +import java.util.Objects; import io.reactivex.rxjava3.annotations.Nullable; import io.reactivex.rxjava3.core.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable; /** @@ -187,7 +187,7 @@ public R poll() throws Exception { Iterator iterator = it; if (iterator != null) { - R v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value"); + R v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value"); if (!iterator.hasNext()) { it = null; } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java index 20e60ab476..d810f8f5c3 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.single; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class SingleFlatMapMaybe extends Maybe { @@ -75,7 +75,7 @@ public void onSuccess(T value) { MaybeSource ms; try { - ms = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource"); + ms = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); onError(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java index 0fb91438c8..4a636ba337 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.single; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -21,7 +22,6 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** @@ -86,7 +86,7 @@ public void onSubscribe(Disposable d) { public void onSuccess(S value) { Publisher f; try { - f = ObjectHelper.requireNonNull(mapper.apply(value), "the mapper returned a null Publisher"); + f = Objects.requireNonNull(mapper.apply(value), "the mapper returned a null Publisher"); } catch (Throwable e) { Exceptions.throwIfFatal(e); downstream.onError(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java index 562032f01e..5300d968b0 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava3.internal.operators.single; +import java.util.Objects; import java.util.concurrent.Callable; import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.Exceptions; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleFromCallable extends Single { @@ -40,7 +40,7 @@ protected void subscribeActual(SingleObserver observer) { T value; try { - value = ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value"); + value = Objects.requireNonNull(callable.call(), "The callable returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (!d.isDisposed()) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java index 04d6ca72cf..88dcd7dc94 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java @@ -17,9 +17,10 @@ import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Supplier; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import java.util.Objects; + /** * Calls a supplier and emits its value or exception to the incoming SingleObserver. * @param the value type returned @@ -44,7 +45,7 @@ protected void subscribeActual(SingleObserver observer) { T value; try { - value = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value"); + value = Objects.requireNonNull(supplier.get(), "The supplier returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); if (!d.isDisposed()) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java index af5f969157..8382b2f1b8 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java @@ -16,7 +16,8 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; public final class SingleLift extends Single { @@ -34,7 +35,7 @@ protected void subscribeActual(SingleObserver observer) { SingleObserver sr; try { - sr = ObjectHelper.requireNonNull(onLift.apply(observer), "The onLift returned a null SingleObserver"); + sr = Objects.requireNonNull(onLift.apply(observer), "The onLift returned a null SingleObserver"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); EmptyDisposable.error(ex, observer); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java index d6ee948d5a..534b41495c 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java @@ -17,7 +17,8 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; + +import java.util.Objects; public final class SingleMap extends Single { final SingleSource source; @@ -54,7 +55,7 @@ public void onSubscribe(Disposable d) { public void onSuccess(T value) { R v; try { - v = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper function returned a null value."); + v = Objects.requireNonNull(mapper.apply(value), "The mapper function returned a null value."); } catch (Throwable e) { Exceptions.throwIfFatal(e); onError(e); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java index 71ccfdc035..6f768591e8 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.single; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.observers.ResumeSingleObserver; public final class SingleResumeNext extends Single { @@ -70,7 +70,7 @@ public void onError(Throwable e) { SingleSource source; try { - source = ObjectHelper.requireNonNull(nextFunction.apply(e), "The nextFunction returned a null SingleSource."); + source = Objects.requireNonNull(nextFunction.apply(e), "The nextFunction returned a null SingleSource."); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(new CompositeException(e, ex)); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java index a0cb1d84d9..57f9daf263 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.single; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleUsing extends Single { @@ -56,7 +56,7 @@ protected void subscribeActual(final SingleObserver observer) { SingleSource source; try { - source = ObjectHelper.requireNonNull(singleFunction.apply(resource), "The singleFunction returned a null SingleSource"); + source = Objects.requireNonNull(singleFunction.apply(resource), "The singleFunction returned a null SingleSource"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java index 9633e94bc7..b207476c95 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.operators.single; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.core.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleZipArray extends Single { @@ -109,7 +109,7 @@ void innerSuccess(T value, int index) { R v; try { - v = ObjectHelper.requireNonNull(zipper.apply(values), "The zipper returned a null value"); + v = Objects.requireNonNull(zipper.apply(values), "The zipper returned a null value"); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); downstream.onError(ex); @@ -179,7 +179,7 @@ public void onError(Throwable e) { final class SingletonArrayFunc implements Function { @Override public R apply(T t) throws Throwable { - return ObjectHelper.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value"); + return Objects.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value"); } } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java index 215f19a58e..b41538aeb4 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java @@ -19,7 +19,6 @@ import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.operators.single.SingleZipArray.ZipCoordinator; public final class SingleZipIterable extends Single { @@ -82,7 +81,7 @@ protected void subscribeActual(SingleObserver observer) { final class SingletonArrayFunc implements Function { @Override public R apply(T t) throws Throwable { - return ObjectHelper.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value"); + return Objects.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value"); } } } diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java index c3fb7955fa..6a50ab07dc 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java @@ -25,11 +25,11 @@ * the License for the specific language governing permissions and limitations under the License. */ +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscription; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** @@ -78,7 +78,7 @@ public final void setSubscription(Subscription s) { return; } - ObjectHelper.requireNonNull(s, "s is null"); + Objects.requireNonNull(s, "s is null"); if (get() == 0 && compareAndSet(0, 1)) { Subscription a = actual; diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java index 7080b3472c..8cfc3f5a7c 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava3.internal.subscriptions; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscription; import io.reactivex.rxjava3.exceptions.ProtocolViolationException; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.BackpressureHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -129,7 +129,7 @@ public static boolean set(AtomicReference field, Subscription s) { * @return true if the operation succeeded, false if the target field was not null. */ public static boolean setOnce(AtomicReference field, Subscription s) { - ObjectHelper.requireNonNull(s, "s is null"); + Objects.requireNonNull(s, "s is null"); if (!field.compareAndSet(null, s)) { s.cancel(); if (field.get() != CANCELLED) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java index 1e051a636c..01b95a0a11 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.internal.util; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscription; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.ProtocolViolationException; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -50,7 +50,7 @@ private EndConsumerHelper() { * @return true if successful, false if the upstream was non null */ public static boolean validate(Disposable upstream, Disposable next, Class observer) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); if (upstream != null) { next.dispose(); if (upstream != DisposableHelper.DISPOSED) { @@ -72,7 +72,7 @@ public static boolean validate(Disposable upstream, Disposable next, Class ob * @return true if successful, false if the content of the AtomicReference was non null */ public static boolean setOnce(AtomicReference upstream, Disposable next, Class observer) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); if (!upstream.compareAndSet(null, next)) { next.dispose(); if (upstream.get() != DisposableHelper.DISPOSED) { @@ -95,7 +95,7 @@ public static boolean setOnce(AtomicReference upstream, Disposable n * @return true if successful, false if the upstream was non null */ public static boolean validate(Subscription upstream, Subscription next, Class subscriber) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); if (upstream != null) { next.cancel(); if (upstream != SubscriptionHelper.CANCELLED) { @@ -117,7 +117,7 @@ public static boolean validate(Subscription upstream, Subscription next, Class upstream, Subscription next, Class subscriber) { - ObjectHelper.requireNonNull(next, "next is null"); + Objects.requireNonNull(next, "next is null"); if (!upstream.compareAndSet(null, next)) { next.cancel(); if (upstream.get() != SubscriptionHelper.CANCELLED) { diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java index 606368d041..c4aaadb343 100644 --- a/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java @@ -165,7 +165,7 @@ public static NullPointerException createNullPointerException(String prefix) { } /** - * Similar to ObjectHelper.requireNonNull but composes the error message via + * Similar to Objects.requireNonNull but composes the error message via * {@link #nullWarning(String)}. * @param the value type * @param value the value to check diff --git a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java index 135f183ceb..1a9b942011 100644 --- a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java +++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.observables; +import java.util.Objects; import java.util.concurrent.TimeUnit; import io.reactivex.rxjava3.annotations.*; @@ -209,8 +210,8 @@ public final Observable refCount(int subscriberCount, long timeout, TimeUnit @SchedulerSupport(SchedulerSupport.CUSTOM) public final Observable refCount(int subscriberCount, long timeout, TimeUnit unit, Scheduler scheduler) { ObjectHelper.verifyPositive(subscriberCount, "subscriberCount"); - ObjectHelper.requireNonNull(unit, "unit is null"); - ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + Objects.requireNonNull(unit, "unit is null"); + Objects.requireNonNull(scheduler, "scheduler is null"); return RxJavaPlugins.onAssembly(new ObservableRefCount(this, subscriberCount, timeout, unit, scheduler)); } diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java index 3a7ab322a6..b57d77f6f5 100644 --- a/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java +++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava3.observers; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.CompletableObserver; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.EndConsumerHelper; /** @@ -87,7 +87,7 @@ public abstract class ResourceCompletableObserver implements CompletableObserver * @throws NullPointerException if resource is null */ public final void add(@NonNull Disposable resource) { - ObjectHelper.requireNonNull(resource, "resource is null"); + Objects.requireNonNull(resource, "resource is null"); resources.add(resource); } diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java index f824d3c97a..cb42a70fbd 100644 --- a/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java +++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava3.observers; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.MaybeObserver; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.EndConsumerHelper; /** @@ -97,7 +97,7 @@ public abstract class ResourceMaybeObserver implements MaybeObserver, Disp * @throws NullPointerException if resource is null */ public final void add(@NonNull Disposable resource) { - ObjectHelper.requireNonNull(resource, "resource is null"); + Objects.requireNonNull(resource, "resource is null"); resources.add(resource); } diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java index 04f2959595..b6d77a0d5f 100644 --- a/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java +++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava3.observers; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.EndConsumerHelper; /** @@ -95,7 +95,7 @@ public abstract class ResourceObserver implements Observer, Disposable { * @throws NullPointerException if resource is null */ public final void add(@NonNull Disposable resource) { - ObjectHelper.requireNonNull(resource, "resource is null"); + Objects.requireNonNull(resource, "resource is null"); resources.add(resource); } diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java index fe8075f75a..af723bf789 100644 --- a/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java +++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava3.observers; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.SingleObserver; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.internal.disposables.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.EndConsumerHelper; /** @@ -90,7 +90,7 @@ public abstract class ResourceSingleObserver implements SingleObserver, Di * @throws NullPointerException if resource is null */ public final void add(@NonNull Disposable resource) { - ObjectHelper.requireNonNull(resource, "resource is null"); + Objects.requireNonNull(resource, "resource is null"); resources.add(resource); } diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java index 38d3505337..afa2eddcf0 100644 --- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java @@ -113,7 +113,7 @@ public static ParallelFlowable from(@NonNull Publisher sourc @NonNull public static ParallelFlowable from(@NonNull Publisher source, int parallelism, int prefetch) { - ObjectHelper.requireNonNull(source, "source"); + Objects.requireNonNull(source, "source"); ObjectHelper.verifyPositive(parallelism, "parallelism"); ObjectHelper.verifyPositive(prefetch, "prefetch"); @@ -131,7 +131,7 @@ public static ParallelFlowable from(@NonNull Publisher sourc @CheckReturnValue @NonNull public final ParallelFlowable map(@NonNull Function mapper) { - ObjectHelper.requireNonNull(mapper, "mapper"); + Objects.requireNonNull(mapper, "mapper"); return RxJavaPlugins.onAssembly(new ParallelMap(this, mapper)); } @@ -151,8 +151,8 @@ public final ParallelFlowable map(@NonNull Function ParallelFlowable map(@NonNull Function mapper, @NonNull ParallelFailureHandling errorHandler) { - ObjectHelper.requireNonNull(mapper, "mapper"); - ObjectHelper.requireNonNull(errorHandler, "errorHandler is null"); + Objects.requireNonNull(mapper, "mapper"); + Objects.requireNonNull(errorHandler, "errorHandler is null"); return RxJavaPlugins.onAssembly(new ParallelMapTry(this, mapper, errorHandler)); } @@ -173,8 +173,8 @@ public final ParallelFlowable map(@NonNull Function ParallelFlowable map(@NonNull Function mapper, @NonNull BiFunction errorHandler) { - ObjectHelper.requireNonNull(mapper, "mapper"); - ObjectHelper.requireNonNull(errorHandler, "errorHandler is null"); + Objects.requireNonNull(mapper, "mapper"); + Objects.requireNonNull(errorHandler, "errorHandler is null"); return RxJavaPlugins.onAssembly(new ParallelMapTry(this, mapper, errorHandler)); } @@ -187,7 +187,7 @@ public final ParallelFlowable map(@NonNull Function filter(@NonNull Predicate predicate) { - ObjectHelper.requireNonNull(predicate, "predicate"); + Objects.requireNonNull(predicate, "predicate"); return RxJavaPlugins.onAssembly(new ParallelFilter(this, predicate)); } @@ -205,8 +205,8 @@ public final ParallelFlowable filter(@NonNull Predicate predicate) */ @CheckReturnValue public final ParallelFlowable filter(@NonNull Predicate predicate, @NonNull ParallelFailureHandling errorHandler) { - ObjectHelper.requireNonNull(predicate, "predicate"); - ObjectHelper.requireNonNull(errorHandler, "errorHandler is null"); + Objects.requireNonNull(predicate, "predicate"); + Objects.requireNonNull(errorHandler, "errorHandler is null"); return RxJavaPlugins.onAssembly(new ParallelFilterTry(this, predicate, errorHandler)); } @@ -225,8 +225,8 @@ public final ParallelFlowable filter(@NonNull Predicate predicate, */ @CheckReturnValue public final ParallelFlowable filter(@NonNull Predicate predicate, @NonNull BiFunction errorHandler) { - ObjectHelper.requireNonNull(predicate, "predicate"); - ObjectHelper.requireNonNull(errorHandler, "errorHandler is null"); + Objects.requireNonNull(predicate, "predicate"); + Objects.requireNonNull(errorHandler, "errorHandler is null"); return RxJavaPlugins.onAssembly(new ParallelFilterTry(this, predicate, errorHandler)); } @@ -279,7 +279,7 @@ public final ParallelFlowable runOn(@NonNull Scheduler scheduler) { @CheckReturnValue @NonNull public final ParallelFlowable runOn(@NonNull Scheduler scheduler, int prefetch) { - ObjectHelper.requireNonNull(scheduler, "scheduler"); + Objects.requireNonNull(scheduler, "scheduler"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ParallelRunOn(this, scheduler, prefetch)); } @@ -295,7 +295,7 @@ public final ParallelFlowable runOn(@NonNull Scheduler scheduler, int prefetc @CheckReturnValue @NonNull public final Flowable reduce(@NonNull BiFunction reducer) { - ObjectHelper.requireNonNull(reducer, "reducer"); + Objects.requireNonNull(reducer, "reducer"); return RxJavaPlugins.onAssembly(new ParallelReduceFull(this, reducer)); } @@ -313,8 +313,8 @@ public final Flowable reduce(@NonNull BiFunction reducer) { @CheckReturnValue @NonNull public final ParallelFlowable reduce(@NonNull Supplier initialSupplier, @NonNull BiFunction reducer) { - ObjectHelper.requireNonNull(initialSupplier, "initialSupplier"); - ObjectHelper.requireNonNull(reducer, "reducer"); + Objects.requireNonNull(initialSupplier, "initialSupplier"); + Objects.requireNonNull(reducer, "reducer"); return RxJavaPlugins.onAssembly(new ParallelReduce(this, initialSupplier, reducer)); } @@ -449,7 +449,7 @@ public final Flowable sorted(@NonNull Comparator comparator) { @CheckReturnValue @NonNull public final Flowable sorted(@NonNull Comparator comparator, int capacityHint) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(comparator, "comparator is null"); ObjectHelper.verifyPositive(capacityHint, "capacityHint"); int ch = capacityHint / parallelism() + 1; ParallelFlowable> railReduced = reduce(Functions.createArrayList(ch), ListAddBiConsumer.instance()); @@ -483,7 +483,7 @@ public final Flowable> toSortedList(@NonNull Comparator compa @CheckReturnValue @NonNull public final Flowable> toSortedList(@NonNull Comparator comparator, int capacityHint) { - ObjectHelper.requireNonNull(comparator, "comparator is null"); + Objects.requireNonNull(comparator, "comparator is null"); ObjectHelper.verifyPositive(capacityHint, "capacityHint"); int ch = capacityHint / parallelism() + 1; @@ -504,7 +504,7 @@ public final Flowable> toSortedList(@NonNull Comparator compa @CheckReturnValue @NonNull public final ParallelFlowable doOnNext(@NonNull Consumer onNext) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(onNext, "onNext is null"); return RxJavaPlugins.onAssembly(new ParallelPeek(this, onNext, Functions.emptyConsumer(), @@ -530,8 +530,8 @@ public final ParallelFlowable doOnNext(@NonNull Consumer onNext) { @CheckReturnValue @NonNull public final ParallelFlowable doOnNext(@NonNull Consumer onNext, @NonNull ParallelFailureHandling errorHandler) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(errorHandler, "errorHandler is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(errorHandler, "errorHandler is null"); return RxJavaPlugins.onAssembly(new ParallelDoOnNextTry(this, onNext, errorHandler)); } @@ -549,8 +549,8 @@ public final ParallelFlowable doOnNext(@NonNull Consumer onNext, @ @CheckReturnValue @NonNull public final ParallelFlowable doOnNext(@NonNull Consumer onNext, @NonNull BiFunction errorHandler) { - ObjectHelper.requireNonNull(onNext, "onNext is null"); - ObjectHelper.requireNonNull(errorHandler, "errorHandler is null"); + Objects.requireNonNull(onNext, "onNext is null"); + Objects.requireNonNull(errorHandler, "errorHandler is null"); return RxJavaPlugins.onAssembly(new ParallelDoOnNextTry(this, onNext, errorHandler)); } @@ -564,7 +564,7 @@ public final ParallelFlowable doOnNext(@NonNull Consumer onNext, @ @CheckReturnValue @NonNull public final ParallelFlowable doAfterNext(@NonNull Consumer onAfterNext) { - ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null"); + Objects.requireNonNull(onAfterNext, "onAfterNext is null"); return RxJavaPlugins.onAssembly(new ParallelPeek(this, Functions.emptyConsumer(), onAfterNext, @@ -586,7 +586,7 @@ public final ParallelFlowable doAfterNext(@NonNull Consumer onAfte @CheckReturnValue @NonNull public final ParallelFlowable doOnError(@NonNull Consumer onError) { - ObjectHelper.requireNonNull(onError, "onError is null"); + Objects.requireNonNull(onError, "onError is null"); return RxJavaPlugins.onAssembly(new ParallelPeek(this, Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -608,7 +608,7 @@ public final ParallelFlowable doOnError(@NonNull Consumer onError) @CheckReturnValue @NonNull public final ParallelFlowable doOnComplete(@NonNull Action onComplete) { - ObjectHelper.requireNonNull(onComplete, "onComplete is null"); + Objects.requireNonNull(onComplete, "onComplete is null"); return RxJavaPlugins.onAssembly(new ParallelPeek(this, Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -630,7 +630,7 @@ public final ParallelFlowable doOnComplete(@NonNull Action onComplete) { @CheckReturnValue @NonNull public final ParallelFlowable doAfterTerminated(@NonNull Action onAfterTerminate) { - ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); + Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"); return RxJavaPlugins.onAssembly(new ParallelPeek(this, Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -652,7 +652,7 @@ public final ParallelFlowable doAfterTerminated(@NonNull Action onAfterTermin @CheckReturnValue @NonNull public final ParallelFlowable doOnSubscribe(@NonNull Consumer onSubscribe) { - ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"); + Objects.requireNonNull(onSubscribe, "onSubscribe is null"); return RxJavaPlugins.onAssembly(new ParallelPeek(this, Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -674,7 +674,7 @@ public final ParallelFlowable doOnSubscribe(@NonNull Consumer doOnRequest(@NonNull LongConsumer onRequest) { - ObjectHelper.requireNonNull(onRequest, "onRequest is null"); + Objects.requireNonNull(onRequest, "onRequest is null"); return RxJavaPlugins.onAssembly(new ParallelPeek(this, Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -696,7 +696,7 @@ public final ParallelFlowable doOnRequest(@NonNull LongConsumer onRequest) { @CheckReturnValue @NonNull public final ParallelFlowable doOnCancel(@NonNull Action onCancel) { - ObjectHelper.requireNonNull(onCancel, "onCancel is null"); + Objects.requireNonNull(onCancel, "onCancel is null"); return RxJavaPlugins.onAssembly(new ParallelPeek(this, Functions.emptyConsumer(), Functions.emptyConsumer(), @@ -721,8 +721,8 @@ public final ParallelFlowable doOnCancel(@NonNull Action onCancel) { @CheckReturnValue @NonNull public final ParallelFlowable collect(@NonNull Supplier collectionSupplier, @NonNull BiConsumer collector) { - ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null"); - ObjectHelper.requireNonNull(collector, "collector is null"); + Objects.requireNonNull(collectionSupplier, "collectionSupplier is null"); + Objects.requireNonNull(collector, "collector is null"); return RxJavaPlugins.onAssembly(new ParallelCollect(this, collectionSupplier, collector)); } @@ -757,7 +757,7 @@ public static ParallelFlowable fromArray(@NonNull Publisher... publish @CheckReturnValue @NonNull public final R to(@NonNull ParallelFlowableConverter converter) { - return ObjectHelper.requireNonNull(converter, "converter is null").apply(this); + return Objects.requireNonNull(converter, "converter is null").apply(this); } /** @@ -771,7 +771,7 @@ public final R to(@NonNull ParallelFlowableConverter converter) { @CheckReturnValue @NonNull public final ParallelFlowable compose(@NonNull ParallelTransformer composer) { - return RxJavaPlugins.onAssembly(ObjectHelper.requireNonNull(composer, "composer is null").apply(this)); + return RxJavaPlugins.onAssembly(Objects.requireNonNull(composer, "composer is null").apply(this)); } /** @@ -842,7 +842,7 @@ public final ParallelFlowable flatMap( public final ParallelFlowable flatMap( @NonNull Function> mapper, boolean delayError, int maxConcurrency, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ParallelFlatMap(this, mapper, delayError, maxConcurrency, prefetch)); @@ -879,7 +879,7 @@ public final ParallelFlowable concatMap( public final ParallelFlowable concatMap( @NonNull Function> mapper, int prefetch) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ParallelConcatMap(this, mapper, prefetch, ErrorMode.IMMEDIATE)); } @@ -919,7 +919,7 @@ public final ParallelFlowable concatMapDelayError( public final ParallelFlowable concatMapDelayError( @NonNull Function> mapper, int prefetch, boolean tillTheEnd) { - ObjectHelper.requireNonNull(mapper, "mapper is null"); + Objects.requireNonNull(mapper, "mapper is null"); ObjectHelper.verifyPositive(prefetch, "prefetch"); return RxJavaPlugins.onAssembly(new ParallelConcatMap( this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY)); diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java index 976289c542..9012e36f12 100644 --- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java +++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.plugins; import java.lang.Thread.UncaughtExceptionHandler; +import java.util.Objects; import java.util.concurrent.ThreadFactory; import org.reactivestreams.Subscriber; @@ -22,7 +23,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.flowables.ConnectableFlowable; import io.reactivex.rxjava3.functions.*; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.schedulers.*; import io.reactivex.rxjava3.internal.util.ExceptionHelper; import io.reactivex.rxjava3.observables.ConnectableObservable; @@ -266,7 +266,7 @@ public static Consumer getErrorHandler() { */ @NonNull public static Scheduler initComputationScheduler(@NonNull Supplier defaultScheduler) { - ObjectHelper.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null"); + Objects.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null"); Function, ? extends Scheduler> f = onInitComputationHandler; if (f == null) { return callRequireNonNull(defaultScheduler); @@ -282,7 +282,7 @@ public static Scheduler initComputationScheduler(@NonNull Supplier de */ @NonNull public static Scheduler initIoScheduler(@NonNull Supplier defaultScheduler) { - ObjectHelper.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null"); + Objects.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null"); Function, ? extends Scheduler> f = onInitIoHandler; if (f == null) { return callRequireNonNull(defaultScheduler); @@ -298,7 +298,7 @@ public static Scheduler initIoScheduler(@NonNull Supplier defaultSche */ @NonNull public static Scheduler initNewThreadScheduler(@NonNull Supplier defaultScheduler) { - ObjectHelper.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null"); + Objects.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null"); Function, ? extends Scheduler> f = onInitNewThreadHandler; if (f == null) { return callRequireNonNull(defaultScheduler); @@ -314,7 +314,7 @@ public static Scheduler initNewThreadScheduler(@NonNull Supplier defa */ @NonNull public static Scheduler initSingleScheduler(@NonNull Supplier defaultScheduler) { - ObjectHelper.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null"); + Objects.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null"); Function, ? extends Scheduler> f = onInitSingleHandler; if (f == null) { return callRequireNonNull(defaultScheduler); @@ -464,7 +464,7 @@ public static Scheduler onNewThreadScheduler(@NonNull Scheduler defaultScheduler */ @NonNull public static Runnable onSchedule(@NonNull Runnable run) { - ObjectHelper.requireNonNull(run, "run is null"); + Objects.requireNonNull(run, "run is null"); Function f = onScheduleHandler; if (f == null) { @@ -1208,7 +1208,7 @@ public static BooleanSupplier getOnBeforeBlocking() { */ @NonNull public static Scheduler createComputationScheduler(@NonNull ThreadFactory threadFactory) { - return new ComputationScheduler(ObjectHelper.requireNonNull(threadFactory, "threadFactory is null")); + return new ComputationScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null")); } /** @@ -1222,7 +1222,7 @@ public static Scheduler createComputationScheduler(@NonNull ThreadFactory thread */ @NonNull public static Scheduler createIoScheduler(@NonNull ThreadFactory threadFactory) { - return new IoScheduler(ObjectHelper.requireNonNull(threadFactory, "threadFactory is null")); + return new IoScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null")); } /** @@ -1236,7 +1236,7 @@ public static Scheduler createIoScheduler(@NonNull ThreadFactory threadFactory) */ @NonNull public static Scheduler createNewThreadScheduler(@NonNull ThreadFactory threadFactory) { - return new NewThreadScheduler(ObjectHelper.requireNonNull(threadFactory, "threadFactory is null")); + return new NewThreadScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null")); } /** @@ -1250,7 +1250,7 @@ public static Scheduler createNewThreadScheduler(@NonNull ThreadFactory threadFa */ @NonNull public static Scheduler createSingleScheduler(@NonNull ThreadFactory threadFactory) { - return new SingleScheduler(ObjectHelper.requireNonNull(threadFactory, "threadFactory is null")); + return new SingleScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null")); } /** @@ -1301,7 +1301,7 @@ static R apply(@NonNull BiFunction f, @NonNull T t, @NonNull @NonNull static Scheduler callRequireNonNull(@NonNull Supplier s) { try { - return ObjectHelper.requireNonNull(s.get(), "Scheduler Supplier result can't be null"); + return Objects.requireNonNull(s.get(), "Scheduler Supplier result can't be null"); } catch (Throwable ex) { throw ExceptionHelper.wrapOrThrow(ex); } @@ -1317,7 +1317,7 @@ static Scheduler callRequireNonNull(@NonNull Supplier s) { */ @NonNull static Scheduler applyRequireNonNull(@NonNull Function, ? extends Scheduler> f, Supplier s) { - return ObjectHelper.requireNonNull(apply(f, s), "Scheduler Supplier result can't be null"); + return Objects.requireNonNull(apply(f, s), "Scheduler Supplier result can't be null"); } /** Helper class, no instances. */ diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java index 5ac1d1d607..eaf47ecae3 100644 --- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java +++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.processors; +import java.util.Objects; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.annotations.*; import io.reactivex.rxjava3.exceptions.MissingBackpressureException; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate; @@ -208,7 +208,7 @@ public static BehaviorProcessor create() { @CheckReturnValue @NonNull public static BehaviorProcessor createDefault(T defaultValue) { - ObjectHelper.requireNonNull(defaultValue, "defaultValue is null"); + Objects.requireNonNull(defaultValue, "defaultValue is null"); return new BehaviorProcessor(defaultValue); } @@ -234,7 +234,7 @@ public static BehaviorProcessor createDefault(T defaultValue) { */ BehaviorProcessor(T defaultValue) { this(); - this.value.lazySet(ObjectHelper.requireNonNull(defaultValue, "defaultValue is null")); + this.value.lazySet(Objects.requireNonNull(defaultValue, "defaultValue is null")); } @Override diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java index 1ab964a6dd..fcd2cb913f 100644 --- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java +++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java @@ -1052,8 +1052,8 @@ static final class SizeAndTimeBoundReplayBuffer SizeAndTimeBoundReplayBuffer(int maxSize, long maxAge, TimeUnit unit, Scheduler scheduler) { this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize"); this.maxAge = ObjectHelper.verifyPositive(maxAge, "maxAge"); - this.unit = ObjectHelper.requireNonNull(unit, "unit is null"); - this.scheduler = ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + this.unit = Objects.requireNonNull(unit, "unit is null"); + this.scheduler = Objects.requireNonNull(scheduler, "scheduler is null"); TimedNode h = new TimedNode(null, 0L); this.tail = h; this.head = h; diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java index a3715103d5..4a1862a95f 100644 --- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java +++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.processors; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.*; @@ -222,7 +223,7 @@ public static UnicastProcessor create(boolean delayError) { @CheckReturnValue @NonNull public static UnicastProcessor create(int capacityHint, Runnable onCancelled) { - ObjectHelper.requireNonNull(onCancelled, "onTerminate"); + Objects.requireNonNull(onCancelled, "onTerminate"); return new UnicastProcessor(capacityHint, onCancelled); } @@ -243,7 +244,7 @@ public static UnicastProcessor create(int capacityHint, Runnable onCancel @CheckReturnValue @NonNull public static UnicastProcessor create(int capacityHint, Runnable onCancelled, boolean delayError) { - ObjectHelper.requireNonNull(onCancelled, "onTerminate"); + Objects.requireNonNull(onCancelled, "onTerminate"); return new UnicastProcessor(capacityHint, onCancelled, delayError); } diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java index fff21ad682..845273ff22 100644 --- a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java +++ b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java @@ -17,7 +17,6 @@ import java.util.concurrent.TimeUnit; import io.reactivex.rxjava3.annotations.NonNull; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Holds onto a value along with time information. @@ -39,7 +38,7 @@ public final class Timed { public Timed(@NonNull T value, long time, @NonNull TimeUnit unit) { this.value = value; this.time = time; - this.unit = ObjectHelper.requireNonNull(unit, "unit is null"); + this.unit = Objects.requireNonNull(unit, "unit is null"); } /** diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java index 45ddb72a51..68efd5bf8f 100644 --- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java +++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava3.subjects; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.*; import io.reactivex.rxjava3.annotations.*; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.util.*; import io.reactivex.rxjava3.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate; import io.reactivex.rxjava3.plugins.RxJavaPlugins; @@ -218,7 +218,7 @@ public static BehaviorSubject createDefault(T defaultValue) { */ BehaviorSubject(T defaultValue) { this(); - this.value.lazySet(ObjectHelper.requireNonNull(defaultValue, "defaultValue is null")); + this.value.lazySet(Objects.requireNonNull(defaultValue, "defaultValue is null")); } @Override diff --git a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java index 2d9dbe779a..aad2092429 100644 --- a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java +++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java @@ -1053,8 +1053,8 @@ static final class SizeAndTimeBoundReplayBuffer SizeAndTimeBoundReplayBuffer(int maxSize, long maxAge, TimeUnit unit, Scheduler scheduler) { this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize"); this.maxAge = ObjectHelper.verifyPositive(maxAge, "maxAge"); - this.unit = ObjectHelper.requireNonNull(unit, "unit is null"); - this.scheduler = ObjectHelper.requireNonNull(scheduler, "scheduler is null"); + this.unit = Objects.requireNonNull(unit, "unit is null"); + this.scheduler = Objects.requireNonNull(scheduler, "scheduler is null"); TimedNode h = new TimedNode(null, 0L); this.tail = h; this.head = h; diff --git a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java index be824a7708..c522343aed 100644 --- a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java +++ b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.subjects; +import java.util.Objects; import java.util.concurrent.atomic.*; import io.reactivex.rxjava3.annotations.*; @@ -288,7 +289,7 @@ public static UnicastSubject create(boolean delayError) { */ UnicastSubject(int capacityHint, Runnable onTerminate, boolean delayError) { this.queue = new SpscLinkedArrayQueue(ObjectHelper.verifyPositive(capacityHint, "capacityHint")); - this.onTerminate = new AtomicReference(ObjectHelper.requireNonNull(onTerminate, "onTerminate")); + this.onTerminate = new AtomicReference(Objects.requireNonNull(onTerminate, "onTerminate")); this.delayError = delayError; this.downstream = new AtomicReference>(); this.once = new AtomicBoolean(); diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java index 71bdeb0121..1990939311 100644 --- a/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java @@ -13,6 +13,7 @@ package io.reactivex.rxjava3.subscribers; +import java.util.Objects; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscription; @@ -20,7 +21,6 @@ import io.reactivex.rxjava3.core.FlowableSubscriber; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.internal.disposables.ListCompositeDisposable; -import io.reactivex.rxjava3.internal.functions.ObjectHelper; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.EndConsumerHelper; @@ -110,7 +110,7 @@ public abstract class ResourceSubscriber implements FlowableSubscriber, Di * @throws NullPointerException if resource is null */ public final void add(Disposable resource) { - ObjectHelper.requireNonNull(resource, "resource is null"); + Objects.requireNonNull(resource, "resource is null"); resources.add(resource); }