Skip to content

Commit cbcc405

Browse files
committed
Eat your own dog food for LANG-1634
Update a few existing classes to use ObjectUtils#acceptIfNonNull(Object, Consumer)
1 parent 84f63b0 commit cbcc405

File tree

3 files changed

+15
-39
lines changed

3 files changed

+15
-39
lines changed

src/main/java/org/apache/commons/lang3/StringUtils.java

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4330,16 +4330,12 @@ public static String join(final Iterator<?> iterator, final char separator) {
43304330

43314331
// two or more elements
43324332
final StringBuilder buf = new StringBuilder(STRING_BUILDER_SIZE); // Java default is 16, probably too small
4333-
if (first != null) {
4334-
buf.append(first);
4335-
}
4333+
ObjectUtils.acceptIfNonNull(first, buf::append);
43364334

43374335
while (iterator.hasNext()) {
43384336
buf.append(separator);
43394337
final Object obj = iterator.next();
4340-
if (obj != null) {
4341-
buf.append(obj);
4342-
}
4338+
ObjectUtils.acceptIfNonNull(obj, buf::append);
43434339
}
43444340

43454341
return buf.toString();
@@ -4374,18 +4370,12 @@ public static String join(final Iterator<?> iterator, final String separator) {
43744370

43754371
// two or more elements
43764372
final StringBuilder buf = new StringBuilder(STRING_BUILDER_SIZE); // Java default is 16, probably too small
4377-
if (first != null) {
4378-
buf.append(first);
4379-
}
4373+
ObjectUtils.acceptIfNonNull(first, buf::append);
43804374

43814375
while (iterator.hasNext()) {
4382-
if (separator != null) {
4383-
buf.append(separator);
4384-
}
4376+
ObjectUtils.acceptIfNonNull(separator, buf::append);
43854377
final Object obj = iterator.next();
4386-
if (obj != null) {
4387-
buf.append(obj);
4388-
}
4378+
ObjectUtils.acceptIfNonNull(obj, buf::append);
43894379
}
43904380
return buf.toString();
43914381
}
@@ -4611,14 +4601,10 @@ public static String join(final Object[] array, final char separator, final int
46114601
return EMPTY;
46124602
}
46134603
final StringBuilder buf = newStringBuilder(noOfItems);
4614-
if (array[startIndex] != null) {
4615-
buf.append(array[startIndex]);
4616-
}
4604+
ObjectUtils.acceptIfNonNull(array[startIndex], buf::append);
46174605
for (int i = startIndex + 1; i < endIndex; i++) {
46184606
buf.append(separator);
4619-
if (array[i] != null) {
4620-
buf.append(array[i]);
4621-
}
4607+
ObjectUtils.acceptIfNonNull(array[i], buf::append);
46224608
}
46234609
return buf.toString();
46244610
}
@@ -4705,16 +4691,12 @@ public static String join(final Object[] array, String separator, final int star
47054691

47064692
final StringBuilder buf = newStringBuilder(noOfItems);
47074693

4708-
if (array[startIndex] != null) {
4709-
buf.append(array[startIndex]);
4710-
}
4694+
ObjectUtils.acceptIfNonNull(array[startIndex], buf::append);
47114695

47124696
for (int i = startIndex + 1; i < endIndex; i++) {
47134697
buf.append(separator);
47144698

4715-
if (array[i] != null) {
4716-
buf.append(array[i]);
4717-
}
4699+
ObjectUtils.acceptIfNonNull(array[i], buf::append);
47184700
}
47194701
return buf.toString();
47204702
}

src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.commons.lang3.ArraySorter;
3030
import org.apache.commons.lang3.ArrayUtils;
3131
import org.apache.commons.lang3.ClassUtils;
32+
import org.apache.commons.lang3.ObjectUtils;
3233
import org.apache.commons.lang3.Validate;
3334

3435
/**
@@ -413,9 +414,7 @@ static String[] toNoNullStringArray(final Collection<String> collection) {
413414
static String[] toNoNullStringArray(final Object[] array) {
414415
final List<String> list = new ArrayList<>(array.length);
415416
for (final Object e : array) {
416-
if (e != null) {
417-
list.add(e.toString());
418-
}
417+
ObjectUtils.acceptIfNonNull(e, o -> list.add(e.toString()));
419418
}
420419
return list.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
421420
}

src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.concurrent.ThreadFactory;
2121
import java.util.concurrent.atomic.AtomicLong;
2222

23+
import org.apache.commons.lang3.ObjectUtils;
2324
import org.apache.commons.lang3.Validate;
2425

2526
/**
@@ -224,17 +225,11 @@ private void initializeThread(final Thread thread) {
224225
thread.setName(String.format(getNamingPattern(), count));
225226
}
226227

227-
if (getUncaughtExceptionHandler() != null) {
228-
thread.setUncaughtExceptionHandler(getUncaughtExceptionHandler());
229-
}
228+
ObjectUtils.acceptIfNonNull(getUncaughtExceptionHandler(), thread::setUncaughtExceptionHandler);
230229

231-
if (getPriority() != null) {
232-
thread.setPriority(getPriority().intValue());
233-
}
230+
ObjectUtils.acceptIfNonNull(getPriority(), p -> thread.setPriority(p.intValue()));
234231

235-
if (getDaemonFlag() != null) {
236-
thread.setDaemon(getDaemonFlag().booleanValue());
237-
}
232+
ObjectUtils.acceptIfNonNull(getDaemonFlag(), d -> thread.setDaemon(d.booleanValue()));
238233
}
239234

240235
/**

0 commit comments

Comments
 (0)