Eat your own dog food for LANG-1634

Update a few existing classes to use ObjectUtils#acceptIfNonNull(Object, Consumer)
apache · Dec 30, 2020 · d5cdd4e · d5cdd4e
1 parent 03165ee
commit d5cdd4e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 39 deletions.
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -4330,16 +4330,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();
@@ -4374,18 +4370,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();
     }
@@ -4611,14 +4601,10 @@ public static String join(final Object[] array, final char separator, final int
             return EMPTY;
         }
         final StringBuilder buf = newStringBuilder(noOfItems);
-        if (array[startIndex] != null) {
-            buf.append(array[startIndex]);
-        }
+        ObjectUtils.acceptIfNonNull(array[startIndex], buf::append);
         for (int i = startIndex + 1; i < endIndex; i++) {
             buf.append(separator);
-            if (array[i] != null) {
-                buf.append(array[i]);
-            }
+            ObjectUtils.acceptIfNonNull(array[i], buf::append);
         }
         return buf.toString();
     }
@@ -4705,16 +4691,12 @@ public static String join(final Object[] array, String separator, final int star
 
         final StringBuilder buf = newStringBuilder(noOfItems);
 
-        if (array[startIndex] != null) {
-            buf.append(array[startIndex]);
-        }
+        ObjectUtils.acceptIfNonNull(array[startIndex], buf::append);
 
         for (int i = startIndex + 1; i < endIndex; i++) {
             buf.append(separator);
 
-            if (array[i] != null) {
-                buf.append(array[i]);
-            }
+            ObjectUtils.acceptIfNonNull(array[i], 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
@@ -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<String> collection) {
     static String[] toNoNullStringArray(final Object[] array) {
         final List<String> 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
@@ -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()));
     }
 
     /**