Skip to content

Commit 2e65abd

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

File tree

3 files changed

+11
-27
lines changed

3 files changed

+11
-27
lines changed

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

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

43924392
// two or more elements
43934393
final StringBuilder buf = new StringBuilder(STRING_BUILDER_SIZE); // Java default is 16, probably too small
4394-
if (first != null) {
4395-
buf.append(first);
4396-
}
4394+
ObjectUtils.acceptIfNonNull(first, buf::append);
43974395

43984396
while (iterator.hasNext()) {
43994397
buf.append(separator);
44004398
final Object obj = iterator.next();
4401-
if (obj != null) {
4402-
buf.append(obj);
4403-
}
4399+
ObjectUtils.acceptIfNonNull(obj, buf::append);
44044400
}
44054401

44064402
return buf.toString();
@@ -4435,18 +4431,12 @@ public static String join(final Iterator<?> iterator, final String separator) {
44354431

44364432
// two or more elements
44374433
final StringBuilder buf = new StringBuilder(STRING_BUILDER_SIZE); // Java default is 16, probably too small
4438-
if (first != null) {
4439-
buf.append(first);
4440-
}
4434+
ObjectUtils.acceptIfNonNull(first, buf::append);
44414435

44424436
while (iterator.hasNext()) {
4443-
if (separator != null) {
4444-
buf.append(separator);
4445-
}
4437+
ObjectUtils.acceptIfNonNull(separator, buf::append);
44464438
final Object obj = iterator.next();
4447-
if (obj != null) {
4448-
buf.append(obj);
4449-
}
4439+
ObjectUtils.acceptIfNonNull(obj, buf::append);
44504440
}
44514441
return buf.toString();
44524442
}

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)