Replace ObjectHelper.requireNonNull with Objects.requireNonNull (#6771)

Author: JakeWharton

src/main/java/io/reactivex/rxjava3/core/Completable.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 <T> Notification<T> createOnNext(@NonNull T value) {
-        ObjectHelper.requireNonNull(value, "value is null");
+        Objects.requireNonNull(value, "value is null");
         return new Notification<T>(value);
     }
 
@@ -141,7 +140,7 @@ public static <T> Notification<T> createOnNext(@NonNull T value) {
      */
     @NonNull
     public static <T> Notification<T> createOnError(@NonNull Throwable error) {
-        ObjectHelper.requireNonNull(error, "error is null");
+        Objects.requireNonNull(error, "error is null");
         return new Notification<T>(NotificationLite.error(error));
     }
 

src/main/java/io/reactivex/rxjava3/core/Flowable.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<Disposable>(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<? extends Disposable> disposables) {
-        ObjectHelper.requireNonNull(disposables, "disposables is null");
+        Objects.requireNonNull(disposables, "disposables is null");
         this.resources = new OpenHashSet<Disposable>();
         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;
         }

src/main/java/io/reactivex/rxjava3/core/Maybe.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);
     }
 

src/main/java/io/reactivex/rxjava3/core/Notification.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<T> extends AtomicReference<T> 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);

src/main/java/io/reactivex/rxjava3/core/Observable.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<T> refCount(int subscriberCount, long timeout, TimeUnit un
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final Flowable<T> 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<T>(this, subscriberCount, timeout, unit, scheduler));
     }