update defaultIf* call

This commit is contained in:
Timi
2025-12-22 10:51:16 +08:00
parent 534f8eef81
commit 2a948a3c59

View File

@ -5,7 +5,6 @@ import java.io.StringWriter;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.Objects;
/** /**
* *
@ -71,14 +70,11 @@ public interface TimiJava {
} }
static <T> T defaultIfNull(T obj, T defaultObj) { static <T> T defaultIfNull(T obj, T defaultObj) {
return Objects.requireNonNullElse(obj, defaultObj); return firstNotNull(obj, defaultObj);
} }
static <T> T defaultIfEmpty(T obj, T defaultObj) { static <T> T defaultIfEmpty(T obj, T defaultObj) {
if (isEmpty(obj)) { return firstNotEmpty(obj, defaultObj);
return defaultObj;
}
return obj;
} }
@SafeVarargs @SafeVarargs