This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new a821cc4b8 Add messages when throwing NullPointerException.
a821cc4b8 is described below
commit a821cc4b80c7d3c8a301c0e9886aa9e3bbb3e94a
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Jul 22 11:42:36 2026 -0400
Add messages when throwing NullPointerException.
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/lang3/ThreadUtils.java | 2 +-
src/main/java/org/apache/commons/lang3/Validate.java | 2 +-
src/main/java/org/apache/commons/lang3/builder/Diff.java | 6 +++---
src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java | 4 ++--
.../java/org/apache/commons/lang3/event/EventListenerSupport.java | 2 +-
.../java/org/apache/commons/lang3/function/BooleanConsumer.java | 2 +-
src/main/java/org/apache/commons/lang3/function/ByteConsumer.java | 2 +-
.../java/org/apache/commons/lang3/function/FailableBiConsumer.java | 2 +-
.../java/org/apache/commons/lang3/function/FailableBiFunction.java | 2 +-
.../java/org/apache/commons/lang3/function/FailableBiPredicate.java | 4 ++--
.../org/apache/commons/lang3/function/FailableByteConsumer.java | 2 +-
.../java/org/apache/commons/lang3/function/FailableConsumer.java | 2 +-
.../org/apache/commons/lang3/function/FailableDoubleConsumer.java | 2 +-
.../org/apache/commons/lang3/function/FailableDoublePredicate.java | 4 ++--
.../apache/commons/lang3/function/FailableDoubleUnaryOperator.java | 4 ++--
.../java/org/apache/commons/lang3/function/FailableFunction.java | 4 ++--
.../java/org/apache/commons/lang3/function/FailableIntConsumer.java | 2 +-
.../org/apache/commons/lang3/function/FailableIntPredicate.java | 4 ++--
.../org/apache/commons/lang3/function/FailableIntUnaryOperator.java | 4 ++--
.../org/apache/commons/lang3/function/FailableLongConsumer.java | 2 +-
.../org/apache/commons/lang3/function/FailableLongPredicate.java | 4 ++--
.../apache/commons/lang3/function/FailableLongUnaryOperator.java | 4 ++--
.../java/org/apache/commons/lang3/function/FailablePredicate.java | 4 ++--
src/main/java/org/apache/commons/lang3/function/TriConsumer.java | 2 +-
src/main/java/org/apache/commons/lang3/function/TriFunction.java | 2 +-
src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java | 6 +++---
src/main/java/org/apache/commons/lang3/time/DurationUtils.java | 2 +-
src/test/java/org/apache/commons/lang3/ClassUtilsTest.java | 2 +-
29 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c0fc4e0d9..dfab32538 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -228,6 +228,7 @@ java.lang.NullPointerException: Cannot invoke
<action type="fix" dev="ggregory" due-to="alhudz, Gary
Gregory">Fix ArrayUtils.reverse range underflow on Integer.MIN_VALUE end
(#1750).</action>
<action type="fix" dev="ggregory" due-to="alhudz, Gary
Gregory">Fix sign extension in BitField.getValue for top-bit fields
(#1749).</action>
<action type="fix" dev="ggregory" due-to="alhudz, Gary
Gregory">Fix int overflow in FluentBitSet.setInclusive at Integer.MAX_VALUE
(#1751).</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">Add messages when
throwing NullPointerException.</action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add JavaVersion.JAVA_27.</action>
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add SystemUtils.IS_JAVA_27.</action>
diff --git a/src/main/java/org/apache/commons/lang3/ThreadUtils.java
b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
index f43a39038..d9ab9962b 100644
--- a/src/main/java/org/apache/commons/lang3/ThreadUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
@@ -486,7 +486,7 @@ public static void join(final Thread thread, final Duration
duration) throws Int
}
private static <T> Predicate<T> namePredicate(final String name, final
Function<T, String> nameGetter) {
- return (Predicate<T>) t -> t != null &&
Objects.equals(nameGetter.apply(t), Objects.requireNonNull(name));
+ return (Predicate<T>) t -> t != null &&
Objects.equals(nameGetter.apply(t), Objects.requireNonNull(name, "name"));
}
private static Predicate<Thread> predicateThread(final String threadName) {
diff --git a/src/main/java/org/apache/commons/lang3/Validate.java
b/src/main/java/org/apache/commons/lang3/Validate.java
index 263f424a2..def549d7a 100644
--- a/src/main/java/org/apache/commons/lang3/Validate.java
+++ b/src/main/java/org/apache/commons/lang3/Validate.java
@@ -1056,7 +1056,7 @@ public static <T> T notNull(final T object) {
* @param values The optional values for the formatted exception message.
* @return The validated object (never {@code null} for method chaining).
* @throws NullPointerException if the object is {@code null}.
- * @see Objects#requireNonNull(Object)
+ * @see Objects#requireNonNull(Object, String)
*/
public static <T> T notNull(final T object, final String message, final
Object... values) {
return Objects.requireNonNull(object, toSupplier(message, values));
diff --git a/src/main/java/org/apache/commons/lang3/builder/Diff.java
b/src/main/java/org/apache/commons/lang3/builder/Diff.java
index a6289cbbd..d88f6af71 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Diff.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Diff.java
@@ -50,13 +50,13 @@ public abstract class Diff<T> extends Pair<T, T> {
* the field name.
*/
protected Diff(final String fieldName) {
- this.fieldName = Objects.requireNonNull(fieldName);
+ this.fieldName = Objects.requireNonNull(fieldName, "fieldName");
this.type =
ObjectUtils.getIfNull(TypeUtils.getTypeArguments(getClass(),
Diff.class).get(Diff.class.getTypeParameters()[0]), Object.class);
}
Diff(final String fieldName, final Type type) {
- this.fieldName = Objects.requireNonNull(fieldName);
- this.type = Objects.requireNonNull(type);
+ this.fieldName = Objects.requireNonNull(fieldName, "fieldName");
+ this.type = Objects.requireNonNull(type, "type");
}
/**
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
index 90b36bb2b..45e0b2777 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
@@ -172,8 +172,8 @@ private static final class SDiff<T> extends Diff<T> {
private SDiff(final String fieldName, final SerializableSupplier<T>
leftSupplier, final SerializableSupplier<T> rightSupplier, final Class<T> type)
{
super(fieldName, type);
- this.leftSupplier = Objects.requireNonNull(leftSupplier);
- this.rightSupplier = Objects.requireNonNull(rightSupplier);
+ this.leftSupplier = Objects.requireNonNull(leftSupplier,
"leftSupplier");
+ this.rightSupplier = Objects.requireNonNull(rightSupplier,
"rightSupplier");
}
@Override
diff --git
a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
index e95dd8179..faa182947 100644
--- a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
+++ b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
@@ -88,7 +88,7 @@ public ProxyInvocationHandler() {
* @since 3.15.0
*/
public ProxyInvocationHandler(final FailableConsumer<Throwable,
IllegalAccessException> handler) {
- this.handler = Objects.requireNonNull(handler);
+ this.handler = Objects.requireNonNull(handler, "handler");
}
/**
diff --git
a/src/main/java/org/apache/commons/lang3/function/BooleanConsumer.java
b/src/main/java/org/apache/commons/lang3/function/BooleanConsumer.java
index 3aa8d9e94..da01369a2 100644
--- a/src/main/java/org/apache/commons/lang3/function/BooleanConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/BooleanConsumer.java
@@ -59,7 +59,7 @@ static BooleanConsumer nop() {
* @throws NullPointerException if {@code after} is null
*/
default BooleanConsumer andThen(final BooleanConsumer after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final boolean t) -> {
accept(t);
after.accept(t);
diff --git a/src/main/java/org/apache/commons/lang3/function/ByteConsumer.java
b/src/main/java/org/apache/commons/lang3/function/ByteConsumer.java
index a186362c7..42a44187a 100644
--- a/src/main/java/org/apache/commons/lang3/function/ByteConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/ByteConsumer.java
@@ -59,7 +59,7 @@ static ByteConsumer nop() {
* @throws NullPointerException if {@code after} is null
*/
default ByteConsumer andThen(final ByteConsumer after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final byte t) -> {
accept(t);
after.accept(t);
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java
b/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java
index 4d2d9bb7b..f096e792d 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java
@@ -65,7 +65,7 @@ static <T, U, E extends Throwable> FailableBiConsumer<T, U,
E> nop() {
* @throws NullPointerException when {@code after} is null.
*/
default FailableBiConsumer<T, U, E> andThen(final FailableBiConsumer<?
super T, ? super U, E> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (t, u) -> {
accept(t, u);
after.accept(t, u);
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableBiFunction.java
b/src/main/java/org/apache/commons/lang3/function/FailableBiFunction.java
index 01c7f1da5..0d83eb646 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableBiFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableBiFunction.java
@@ -60,7 +60,7 @@ static <T, U, R, E extends Throwable> FailableBiFunction<T,
U, R, E> nop() {
* @throws NullPointerException when {@code after} is null.
*/
default <V> FailableBiFunction<T, U, V, E> andThen(final
FailableFunction<? super R, ? extends V, E> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final T t, final U u) -> after.apply(apply(t, u));
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
b/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
index decba4318..457b6c9a9 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableBiPredicate.java
@@ -73,7 +73,7 @@ static <T, U, E extends Throwable> FailableBiPredicate<T, U,
E> truePredicate()
* @throws NullPointerException if other is null
*/
default FailableBiPredicate<T, U, E> and(final FailableBiPredicate<? super
T, ? super U, E> other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return (final T t, final U u) -> test(t, u) && other.test(t, u);
}
@@ -94,7 +94,7 @@ default FailableBiPredicate<T, U, E> negate() {
* @throws NullPointerException if other is null
*/
default FailableBiPredicate<T, U, E> or(final FailableBiPredicate<? super
T, ? super U, E> other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return (final T t, final U u) -> test(t, u) || other.test(t, u);
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableByteConsumer.java
b/src/main/java/org/apache/commons/lang3/function/FailableByteConsumer.java
index 4dfd0ec15..99329a17b 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableByteConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableByteConsumer.java
@@ -60,7 +60,7 @@ static <E extends Throwable> FailableByteConsumer<E> nop() {
* @throws NullPointerException if {@code after} is null
*/
default FailableByteConsumer<E> andThen(final FailableByteConsumer<E>
after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final byte t) -> {
accept(t);
after.accept(t);
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableConsumer.java
b/src/main/java/org/apache/commons/lang3/function/FailableConsumer.java
index 0360d9b81..ba2d83814 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableConsumer.java
@@ -83,7 +83,7 @@ static <T, E extends Throwable> FailableConsumer<T, E> nop() {
* @throws NullPointerException when {@code after} is null
*/
default FailableConsumer<T, E> andThen(final FailableConsumer<? super T,
E> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final T t) -> {
accept(t);
after.accept(t);
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableDoubleConsumer.java
b/src/main/java/org/apache/commons/lang3/function/FailableDoubleConsumer.java
index bd5c9b681..c5ce8bec1 100644
---
a/src/main/java/org/apache/commons/lang3/function/FailableDoubleConsumer.java
+++
b/src/main/java/org/apache/commons/lang3/function/FailableDoubleConsumer.java
@@ -60,7 +60,7 @@ static <E extends Throwable> FailableDoubleConsumer<E> nop() {
* @throws NullPointerException when {@code after} is null.
*/
default FailableDoubleConsumer<E> andThen(final FailableDoubleConsumer<E>
after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final double t) -> {
accept(t);
after.accept(t);
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
b/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
index 5cd6d549b..17c0923a8 100644
---
a/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
+++
b/src/main/java/org/apache/commons/lang3/function/FailableDoublePredicate.java
@@ -67,7 +67,7 @@ static <E extends Throwable> FailableDoublePredicate<E>
truePredicate() {
* @throws NullPointerException if other is null
*/
default FailableDoublePredicate<E> and(final FailableDoublePredicate<E>
other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return t -> test(t) && other.test(t);
}
@@ -88,7 +88,7 @@ default FailableDoublePredicate<E> negate() {
* @throws NullPointerException if other is null
*/
default FailableDoublePredicate<E> or(final FailableDoublePredicate<E>
other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return t -> test(t) || other.test(t);
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableDoubleUnaryOperator.java
b/src/main/java/org/apache/commons/lang3/function/FailableDoubleUnaryOperator.java
index 3e3a9af5e..a5f1406aa 100644
---
a/src/main/java/org/apache/commons/lang3/function/FailableDoubleUnaryOperator.java
+++
b/src/main/java/org/apache/commons/lang3/function/FailableDoubleUnaryOperator.java
@@ -64,7 +64,7 @@ static <E extends Throwable> FailableDoubleUnaryOperator<E>
nop() {
* @see #compose(FailableDoubleUnaryOperator)
*/
default FailableDoubleUnaryOperator<E> andThen(final
FailableDoubleUnaryOperator<E> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final double t) -> after.applyAsDouble(applyAsDouble(t));
}
@@ -88,7 +88,7 @@ default FailableDoubleUnaryOperator<E> andThen(final
FailableDoubleUnaryOperator
* @see #andThen(FailableDoubleUnaryOperator)
*/
default FailableDoubleUnaryOperator<E> compose(final
FailableDoubleUnaryOperator<E> before) {
- Objects.requireNonNull(before);
+ Objects.requireNonNull(before, "before");
return (final double v) -> applyAsDouble(before.applyAsDouble(v));
}
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableFunction.java
b/src/main/java/org/apache/commons/lang3/function/FailableFunction.java
index 21febd5e8..9cd8c05e1 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableFunction.java
@@ -82,7 +82,7 @@ static <T, R, E extends Throwable> FailableFunction<T, R, E>
nop() {
* @throws NullPointerException when {@code after} is null.
*/
default <V> FailableFunction<T, V, E> andThen(final FailableFunction<?
super R, ? extends V, E> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final T t) -> after.apply(apply(t));
}
@@ -105,7 +105,7 @@ default <V> FailableFunction<T, V, E> andThen(final
FailableFunction<? super R,
* @see #andThen(FailableFunction)
*/
default <V> FailableFunction<V, R, E> compose(final FailableFunction<?
super V, ? extends T, E> before) {
- Objects.requireNonNull(before);
+ Objects.requireNonNull(before, "before");
return (final V v) -> apply(before.apply(v));
}
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableIntConsumer.java
b/src/main/java/org/apache/commons/lang3/function/FailableIntConsumer.java
index 6847ce3d2..2a92cbb47 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntConsumer.java
@@ -60,7 +60,7 @@ static <E extends Throwable> FailableIntConsumer<E> nop() {
* @throws NullPointerException if {@code after} is null
*/
default FailableIntConsumer<E> andThen(final FailableIntConsumer<E> after)
{
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final int t) -> {
accept(t);
after.accept(t);
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
b/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
index daf11505e..c9fc41fa3 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableIntPredicate.java
@@ -67,7 +67,7 @@ static <E extends Throwable> FailableIntPredicate<E>
truePredicate() {
* @throws NullPointerException if other is null
*/
default FailableIntPredicate<E> and(final FailableIntPredicate<E> other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return t -> test(t) && other.test(t);
}
@@ -88,7 +88,7 @@ default FailableIntPredicate<E> negate() {
* @throws NullPointerException if other is null
*/
default FailableIntPredicate<E> or(final FailableIntPredicate<E> other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return t -> test(t) || other.test(t);
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableIntUnaryOperator.java
b/src/main/java/org/apache/commons/lang3/function/FailableIntUnaryOperator.java
index ce6f3db3f..bbe796b8c 100644
---
a/src/main/java/org/apache/commons/lang3/function/FailableIntUnaryOperator.java
+++
b/src/main/java/org/apache/commons/lang3/function/FailableIntUnaryOperator.java
@@ -62,7 +62,7 @@ static <E extends Throwable> FailableIntUnaryOperator<E>
nop() {
* @see #compose(FailableIntUnaryOperator)
*/
default FailableIntUnaryOperator<E> andThen(final
FailableIntUnaryOperator<E> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final int t) -> after.applyAsInt(applyAsInt(t));
}
@@ -84,7 +84,7 @@ default FailableIntUnaryOperator<E> andThen(final
FailableIntUnaryOperator<E> af
* @see #andThen(FailableIntUnaryOperator)
*/
default FailableIntUnaryOperator<E> compose(final
FailableIntUnaryOperator<E> before) {
- Objects.requireNonNull(before);
+ Objects.requireNonNull(before, "before");
return (final int v) -> applyAsInt(before.applyAsInt(v));
}
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableLongConsumer.java
b/src/main/java/org/apache/commons/lang3/function/FailableLongConsumer.java
index 824994c57..f772e4b42 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongConsumer.java
@@ -60,7 +60,7 @@ static <E extends Throwable> FailableLongConsumer<E> nop() {
* @throws NullPointerException if {@code after} is null
*/
default FailableLongConsumer<E> andThen(final FailableLongConsumer<E>
after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final long t) -> {
accept(t);
after.accept(t);
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
b/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
index 2668277a3..204272622 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailableLongPredicate.java
@@ -67,7 +67,7 @@ static <E extends Throwable> FailableLongPredicate<E>
truePredicate() {
* @throws NullPointerException if other is null
*/
default FailableLongPredicate<E> and(final FailableLongPredicate<E> other)
{
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return t -> test(t) && other.test(t);
}
@@ -88,7 +88,7 @@ default FailableLongPredicate<E> negate() {
* @throws NullPointerException if other is null
*/
default FailableLongPredicate<E> or(final FailableLongPredicate<E> other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return t -> test(t) || other.test(t);
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailableLongUnaryOperator.java
b/src/main/java/org/apache/commons/lang3/function/FailableLongUnaryOperator.java
index 2ad2a8815..b5e576e82 100644
---
a/src/main/java/org/apache/commons/lang3/function/FailableLongUnaryOperator.java
+++
b/src/main/java/org/apache/commons/lang3/function/FailableLongUnaryOperator.java
@@ -62,7 +62,7 @@ static <E extends Throwable> FailableLongUnaryOperator<E>
nop() {
* @see #compose(FailableLongUnaryOperator)
*/
default FailableLongUnaryOperator<E> andThen(final
FailableLongUnaryOperator<E> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final long t) -> after.applyAsLong(applyAsLong(t));
}
@@ -84,7 +84,7 @@ default FailableLongUnaryOperator<E> andThen(final
FailableLongUnaryOperator<E>
* @see #andThen(FailableLongUnaryOperator)
*/
default FailableLongUnaryOperator<E> compose(final
FailableLongUnaryOperator<E> before) {
- Objects.requireNonNull(before);
+ Objects.requireNonNull(before, "before");
return (final long v) -> applyAsLong(before.applyAsLong(v));
}
}
diff --git
a/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
b/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
index f15066fa3..f44f88b40 100644
--- a/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
+++ b/src/main/java/org/apache/commons/lang3/function/FailablePredicate.java
@@ -70,7 +70,7 @@ static <T, E extends Throwable> FailablePredicate<T, E>
truePredicate() {
* @throws NullPointerException if other is null
*/
default FailablePredicate<T, E> and(final FailablePredicate<? super T, E>
other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return t -> test(t) && other.test(t);
}
@@ -91,7 +91,7 @@ default FailablePredicate<T, E> negate() {
* @throws NullPointerException if other is null
*/
default FailablePredicate<T, E> or(final FailablePredicate<? super T, E>
other) {
- Objects.requireNonNull(other);
+ Objects.requireNonNull(other, "other");
return t -> test(t) || other.test(t);
}
diff --git a/src/main/java/org/apache/commons/lang3/function/TriConsumer.java
b/src/main/java/org/apache/commons/lang3/function/TriConsumer.java
index c492bf770..7afbdd53a 100644
--- a/src/main/java/org/apache/commons/lang3/function/TriConsumer.java
+++ b/src/main/java/org/apache/commons/lang3/function/TriConsumer.java
@@ -60,7 +60,7 @@ public interface TriConsumer<T, U, V> {
* @throws NullPointerException if {@code after} is null.
*/
default TriConsumer<T, U, V> andThen(final TriConsumer<? super T, ? super
U, ? super V> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (t, u, v) -> {
accept(t, u, v);
after.accept(t, u, v);
diff --git a/src/main/java/org/apache/commons/lang3/function/TriFunction.java
b/src/main/java/org/apache/commons/lang3/function/TriFunction.java
index b5731179d..5398e6503 100644
--- a/src/main/java/org/apache/commons/lang3/function/TriFunction.java
+++ b/src/main/java/org/apache/commons/lang3/function/TriFunction.java
@@ -49,7 +49,7 @@ public interface TriFunction<T, U, V, R> {
* @throws NullPointerException if after is null
*/
default <W> TriFunction<T, U, V, W> andThen(final Function<? super R, ?
extends W> after) {
- Objects.requireNonNull(after);
+ Objects.requireNonNull(after, "after");
return (final T t, final U u, final V v) -> after.apply(apply(t, u,
v));
}
diff --git a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
index 4415fbfe5..e4f3e892e 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
@@ -1003,7 +1003,7 @@ public StrSubstitutor setVariablePrefix(final char
prefix) {
* @throws NullPointerException if the prefix is null.
*/
public StrSubstitutor setVariablePrefix(final String prefix) {
- return
setVariablePrefixMatcher(StrMatcher.stringMatcher(Objects.requireNonNull(prefix)));
+ return
setVariablePrefixMatcher(StrMatcher.stringMatcher(Objects.requireNonNull(prefix,
"prefix")));
}
/**
@@ -1059,7 +1059,7 @@ public StrSubstitutor setVariableSuffix(final char
suffix) {
* @throws NullPointerException if the suffix is null.
*/
public StrSubstitutor setVariableSuffix(final String suffix) {
- return
setVariableSuffixMatcher(StrMatcher.stringMatcher(Objects.requireNonNull(suffix)));
+ return
setVariableSuffixMatcher(StrMatcher.stringMatcher(Objects.requireNonNull(suffix,
"suffix")));
}
/**
@@ -1075,7 +1075,7 @@ public StrSubstitutor setVariableSuffix(final String
suffix) {
* @throws NullPointerException if the suffix matcher is null.
*/
public StrSubstitutor setVariableSuffixMatcher(final StrMatcher
suffixMatcher) {
- this.suffixMatcher = Objects.requireNonNull(suffixMatcher);
+ this.suffixMatcher = Objects.requireNonNull(suffixMatcher,
"suffixMatcher");
return this;
}
diff --git a/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
b/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
index 2d5da03fa..9921493fe 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationUtils.java
@@ -203,7 +203,7 @@ public static Duration since(final Temporal startInclusive)
{
*/
static ChronoUnit toChronoUnit(final TimeUnit timeUnit) {
// TODO when using Java >= 9: Use TimeUnit.toChronoUnit().
- switch (Objects.requireNonNull(timeUnit)) {
+ switch (Objects.requireNonNull(timeUnit, "timeUnit")) {
case NANOSECONDS:
return ChronoUnit.NANOS;
case MICROSECONDS:
diff --git a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
index 8f18a2bc8..a630b327c 100644
--- a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
@@ -121,7 +121,7 @@ private void assertGetClassThrowsNullPointerException(final
String className) {
}
private int getDimension(final Class<?> clazz) {
- Objects.requireNonNull(clazz);
+ Objects.requireNonNull(clazz, "clazz");
if (!clazz.isArray()) {
fail("Not an array: " + clazz);
}
