From 77c53b422eb96a1108ae42eb6dc2dd0652216218 Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Mon, 22 Dec 2025 10:47:12 +0800
Subject: [PATCH] rename firstNotNull to defaultIfNull

---
 src/main/java/com/imyeyu/java/TimiJava.java | 24 +++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/imyeyu/java/TimiJava.java b/src/main/java/com/imyeyu/java/TimiJava.java
index 45d917f..ddd84f2 100644
--- a/src/main/java/com/imyeyu/java/TimiJava.java
+++ b/src/main/java/com/imyeyu/java/TimiJava.java
@@ -5,6 +5,7 @@ import java.io.StringWriter;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  *
@@ -69,24 +70,15 @@ public interface TimiJava {
 		return !isEmpty(object);
 	}
 
-	@SafeVarargs
-	static <T> T firstNotNull(T... objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] != null) {
-				return objects[i];
-			}
-		}
-		return null;
+	static <T> T defaultIfNull(T obj, T defaultObj) {
+		return Objects.requireNonNullElse(obj, defaultObj);
 	}
 
-	@SafeVarargs
-	static <T> T firstNotEmpty(T... objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (TimiJava.isNotEmpty(objects[i])) {
-				return objects[i];
-			}
+	static <T> T defaultIfEmpty(T obj, T defaultObj) {
+		if (isEmpty(obj)) {
+			return defaultObj;
 		}
-		return null;
+		return obj;
 	}
 
 	static String toString(Exception e) {
@@ -97,6 +89,6 @@ public interface TimiJava {
 	}
 
 	static <T> Iterable<T> safeIterable(Iterable<T> iterable) {
-		return firstNotNull(iterable, Collections::emptyIterator);
+		return defaultIfNull(iterable, Collections::emptyIterator);
 	}
 }