Skip to content

[3.x] Replace ObjectHelper.requireNonNull with Objects.requireNonNull #6771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2019
Merged

[3.x] Replace ObjectHelper.requireNonNull with Objects.requireNonNull #6771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 73 additions & 72 deletions src/main/java/io/reactivex/rxjava3/core/Completable.java
View file
Open in desktop

Large diffs are not rendered by default.

954 changes: 477 additions & 477 deletions src/main/java/io/reactivex/rxjava3/core/Flowable.java
View file
Open in desktop

Large diffs are not rendered by default.

355 changes: 178 additions & 177 deletions src/main/java/io/reactivex/rxjava3/core/Maybe.java
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions src/main/java/io/reactivex/rxjava3/core/Notification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}

Expand All @@ -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));
}

Expand Down
950 changes: 475 additions & 475 deletions src/main/java/io/reactivex/rxjava3/core/Observable.java
View file
Open in desktop

Large diffs are not rendered by default.

301 changes: 151 additions & 150 deletions src/main/java/io/reactivex/rxjava3/core/Single.java
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 8 additions & 9 deletions src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

/**
Expand All @@ -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);
}
}
Expand All @@ -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);
}
}
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

package io.reactivex.rxjava3.disposables;

import java.util.Objects;
import java.util.concurrent.Future;

import org.reactivestreams.Subscription;
Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

package io.reactivex.rxjava3.flowables;

import java.util.Objects;
import java.util.concurrent.TimeUnit;

import org.reactivestreams.Subscriber;
Expand Down Expand Up @@ -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));
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -75,7 +75,7 @@ public static boolean set(AtomicReference<Disposable> field, Disposable d) {
* @return true if the operation succeeded, false
*/
public static boolean setOnce(AtomicReference<Disposable> 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) {
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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<Disposable>();
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<? extends Disposable> resources) {
ObjectHelper.requireNonNull(resources, "resources is null");
Objects.requireNonNull(resources, "resources is null");
this.resources = new LinkedList<Disposable>();
for (Disposable d : resources) {
ObjectHelper.requireNonNull(d, "Disposable item is null");
Objects.requireNonNull(d, "Disposable item is null");
this.resources.add(d);
}
}
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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;
Expand All @@ -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;
}
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,46 +34,46 @@ private Functions() {
}

public static <T1, T2, R> Function<Object[], R> toFunction(final BiFunction<? super T1, ? super T2, ? extends R> f) {
ObjectHelper.requireNonNull(f, "f is null");
Objects.requireNonNull(f, "f is null");
return new Array2Func<T1, T2, R>(f);
}

public static <T1, T2, T3, R> Function<Object[], R> toFunction(final Function3<T1, T2, T3, R> f) {
ObjectHelper.requireNonNull(f, "f is null");
Objects.requireNonNull(f, "f is null");
return new Array3Func<T1, T2, T3, R>(f);
}

public static <T1, T2, T3, T4, R> Function<Object[], R> toFunction(final Function4<T1, T2, T3, T4, R> f) {
ObjectHelper.requireNonNull(f, "f is null");
Objects.requireNonNull(f, "f is null");
return new Array4Func<T1, T2, T3, T4, R>(f);
}

public static <T1, T2, T3, T4, T5, R> Function<Object[], R> toFunction(final Function5<T1, T2, T3, T4, T5, R> f) {
ObjectHelper.requireNonNull(f, "f is null");
Objects.requireNonNull(f, "f is null");
return new Array5Func<T1, T2, T3, T4, T5, R>(f);
}

public static <T1, T2, T3, T4, T5, T6, R> Function<Object[], R> toFunction(
final Function6<T1, T2, T3, T4, T5, T6, R> f) {
ObjectHelper.requireNonNull(f, "f is null");
Objects.requireNonNull(f, "f is null");
return new Array6Func<T1, T2, T3, T4, T5, T6, R>(f);
}

public static <T1, T2, T3, T4, T5, T6, T7, R> Function<Object[], R> toFunction(
final Function7<T1, T2, T3, T4, T5, T6, T7, R> f) {
ObjectHelper.requireNonNull(f, "f is null");
Objects.requireNonNull(f, "f is null");
return new Array7Func<T1, T2, T3, T4, T5, T6, T7, R>(f);
}

public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Function<Object[], R> toFunction(
final Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> f) {
ObjectHelper.requireNonNull(f, "f is null");
Objects.requireNonNull(f, "f is null");
return new Array8Func<T1, T2, T3, T4, T5, T6, T7, T8, R>(f);
}

public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Function<Object[], R> toFunction(
final Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> f) {
ObjectHelper.requireNonNull(f, "f is null");
Objects.requireNonNull(f, "f is null");
return new Array9Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, R>(f);
}

Expand Down
16 changes: 0 additions & 16 deletions src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <T> 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> T requireNonNull(T object, String message) {
if (object == null) {
throw new NullPointerException(message);
}
return object;
}

static final BiPredicate<Object, Object> EQUALS = new BiObjectPredicate();

/**
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading