Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor internals and use Stream

This commit is contained in:
Gary Gregory 2022-08-21 11:05:38 -04:00
parent ea2e58fc68
commit c2960c483f
1 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/org/apache/commons/lang3/ObjectUtils.java
View File

@ -33,12 +33,14 @@ import java.util.Objects;
import java.util.Optional;
import java.util.TreeSet;
import java.util.function.Supplier;
import java.util.stream.Stream;
import org.apache.commons.lang3.exception.CloneFailedException;
import org.apache.commons.lang3.function.Suppliers;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.lang3.text.StrBuilder;
import org.apache.commons.lang3.time.DurationUtils;
import org.apache.commons.lang3.stream.Streams;
/**
* <p>Operations on {@link Object}.</p>
@ -137,17 +139,7 @@ public class ObjectUtils {
* @since 3.5
*/
public static boolean allNotNull(final Object... values) {
if (values == null) {
return false;
}
for (final Object val : values) {
if (val == null) {
return false;
}
}
return true;
return values != null ? Stream.of(values).noneMatch(Objects::isNull) : false;
}
/**
@ -657,14 +649,7 @@ public class ObjectUtils {
*/
@SafeVarargs
public static <T> T firstNonNull(final T... values) {
if (values != null) {
for (final T val : values) {
if (val != null) {
return val;
}
}
}
return null;
return Streams.of(values).filter(Objects::nonNull).findFirst().orElse(null);
}
/**
@ -706,17 +691,7 @@ public class ObjectUtils {
*/
@SafeVarargs
public static <T> T getFirstNonNull(final Supplier<T>... suppliers) {
if (suppliers != null) {
for (final Supplier<T> supplier : suppliers) {
if (supplier != null) {
final T value = supplier.get();
if (value != null) {
return value;
}
}
}
}
return null;
return Streams.of(suppliers).map(s -> s != null ? s.get() : null).filter(Objects::nonNull).findFirst().orElse(null);
}
/**