diff --git a/src/main/java/org/apache/commons/lang3/ObjectUtils.java b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
index 8461ee9b167..a5028507907 100644
--- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.TreeSet;
+import java.util.function.Consumer;
import java.util.function.Supplier;
import org.apache.commons.lang3.exception.CloneFailedException;
@@ -226,6 +227,63 @@ public static boolean anyNotNull(final Object... values) {
return firstNonNull(values) != null;
}
+ /**
+ *
+ * Calls the given {@code consumer's} {@link Consumer#accept(Object)} method with the first {@code non-null} value
+ * from {@code objects}. If all the values are null, the consumer is not invoked. This is equivalent to the call
+ * {@code ObjectUtils.acceptIfNonNull(ObjectUtils.firstNonNull(objects), consumer)}
+ *
+ *
+ *
+ * The caller is responsible for thread-safety and exception handling of consumer.
+ *
+ *
+ *
+ * ObjectUtils.acceptFirstNonNull(bean::setValue, null) - setValue not invoked
+ * ObjectUtils.acceptFirstNonNull(bean::setValue, null, "abc", "def") - setValue invoked with "abc"
+ * ObjectUtils.acceptFirstNonNull(v -> bean.setValue(v), "abc") - setValue invoked with "abc"
+ *
+ *
+ * @param the type of the object
+ * @param objects the values to test, may be {@code null} or empty
+ * @param consumer the consumer operation to invoke with the first non-null {@code objects}.
+ * @see #firstNonNull(Object...)
+ * @see #acceptIfNonNull(Object, Consumer)
+ * @since 3.12
+ */
+ @SafeVarargs
+ public static void acceptFirstNonNull(final Consumer consumer, final T... objects) {
+ acceptIfNonNull(firstNonNull(objects), consumer);
+ }
+
+ /**
+ *
+ * Calls the given {@code consumer's} {@link Consumer#accept(Object)} method with the {@code object} if it is
+ * {@code non-null}.
+ *
+ *
+ *
+ * The caller is responsible for thread-safety and exception handling of consumer.
+ *
+ *
+ *
+ * ObjectUtils.acceptIfNonNull(null, bean::setValue) - setValue not invoked
+ * ObjectUtils.acceptIfNonNull("abc", bean::setValue) - setValue invoked with "abc"
+ * ObjectUtils.acceptIfNonNull("abc", v -> bean.setValue(v)) - setValue invoked with "abc"
+ *
+ *
+ * @param the type of the object
+ * @param object the {@code Object} to test, may be {@code null}
+ * @param consumer the consumer operation to invoke with {@code object} if it is {@code non-null}
+ * @see #acceptFirstNonNull(Consumer, Object...)
+ * @since 3.12
+ */
+ public static void acceptIfNonNull(final T object, final Consumer consumer) {
+ if (object != null) {
+ consumer.accept(object);
+ }
+ }
+
// cloning
//-----------------------------------------------------------------------
/**
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 478139e37a7..f0874c267ac 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -4391,16 +4391,12 @@ public static String join(final Iterator> iterator, final char separator) {
// two or more elements
final StringBuilder buf = new StringBuilder(STRING_BUILDER_SIZE); // Java default is 16, probably too small
- if (first != null) {
- buf.append(first);
- }
+ ObjectUtils.acceptIfNonNull(first, buf::append);
while (iterator.hasNext()) {
buf.append(separator);
final Object obj = iterator.next();
- if (obj != null) {
- buf.append(obj);
- }
+ ObjectUtils.acceptIfNonNull(obj, buf::append);
}
return buf.toString();
@@ -4435,18 +4431,12 @@ public static String join(final Iterator> iterator, final String separator) {
// two or more elements
final StringBuilder buf = new StringBuilder(STRING_BUILDER_SIZE); // Java default is 16, probably too small
- if (first != null) {
- buf.append(first);
- }
+ ObjectUtils.acceptIfNonNull(first, buf::append);
while (iterator.hasNext()) {
- if (separator != null) {
- buf.append(separator);
- }
+ ObjectUtils.acceptIfNonNull(separator, buf::append);
final Object obj = iterator.next();
- if (obj != null) {
- buf.append(obj);
- }
+ ObjectUtils.acceptIfNonNull(obj, buf::append);
}
return buf.toString();
}
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
index 63ad959d181..c34829a17f5 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
@@ -29,6 +29,7 @@
import org.apache.commons.lang3.ArraySorter;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.Validate;
/**
@@ -413,9 +414,7 @@ static String[] toNoNullStringArray(final Collection collection) {
static String[] toNoNullStringArray(final Object[] array) {
final List list = new ArrayList<>(array.length);
for (final Object e : array) {
- if (e != null) {
- list.add(e.toString());
- }
+ ObjectUtils.acceptIfNonNull(e, o -> list.add(e.toString()));
}
return list.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
}
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
index 631f2e4653a..0422e7e95c5 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
@@ -20,6 +20,7 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.Validate;
/**
@@ -224,17 +225,11 @@ private void initializeThread(final Thread thread) {
thread.setName(String.format(getNamingPattern(), count));
}
- if (getUncaughtExceptionHandler() != null) {
- thread.setUncaughtExceptionHandler(getUncaughtExceptionHandler());
- }
+ ObjectUtils.acceptIfNonNull(getUncaughtExceptionHandler(), thread::setUncaughtExceptionHandler);
- if (getPriority() != null) {
- thread.setPriority(getPriority().intValue());
- }
+ ObjectUtils.acceptIfNonNull(getPriority(), p -> thread.setPriority(p.intValue()));
- if (getDaemonFlag() != null) {
- thread.setDaemon(getDaemonFlag().booleanValue());
- }
+ ObjectUtils.acceptIfNonNull(getDaemonFlag(), d -> thread.setDaemon(d.booleanValue()));
}
/**
diff --git a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
index 3efafe70ab6..11eb563dcf7 100644
--- a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
@@ -40,6 +40,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.function.Supplier;
@@ -245,6 +246,33 @@ public void testEquals() {
assertTrue(ObjectUtils.equals(FOO, FOO), "ObjectUtils.equals(\"foo\", \"foo\") returned false");
}
+ @Test
+ public void testAcceptFirstNonNull() {
+ final ApplyIfNonNullBean bean = new ApplyIfNonNullBean();
+ bean.setValue(FOO);
+
+ ObjectUtils.acceptFirstNonNull(bean::setValue, null, null, null);
+ assertEquals(FOO, bean.getValue());
+
+ ObjectUtils.acceptFirstNonNull(bean::setValue, null, null, BAR, FOO, null);
+ assertEquals(BAR, bean.getValue());
+ }
+
+ @Test
+ public void testAcceptIfNonNull() {
+ final ApplyIfNonNullBean bean = new ApplyIfNonNullBean();
+ bean.setValue(FOO);
+
+ ObjectUtils.acceptIfNonNull(null, bean::setValue);
+ assertEquals(FOO, bean.getValue());
+
+ ObjectUtils.acceptIfNonNull(BAR, bean::setValue);
+ assertEquals(BAR, bean.getValue());
+
+ ObjectUtils.acceptIfNonNull(FOO, v -> bean.setValue(v));
+ assertEquals(FOO, bean.getValue());
+ }
+
@Test
public void testNotEqual() {
assertFalse(ObjectUtils.notEqual(null, null), "ObjectUtils.notEqual(null, null) returned false");
@@ -764,4 +792,13 @@ public int compare(final CharSequence o1, final CharSequence o2) {
}
+ static final class ApplyIfNonNullBean {
+ private String value;
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = Objects.requireNonNull(value, "value");
+ }
+ }
}