add ObjectUtils.firstNonNull/getIfNull/getIfEmpty

Signed-off-by: Vincent Potucek <vpotucek@me.com>

Author: Vincent Potucek

spring-core/src/main/java/org/springframework/util/ObjectUtils.java

@@ -127,7 +127,7 @@ public static boolean isEmpty(@Nullable Object @Nullable [] array) {
 	 * @return An Optional containing the first non-null object, or an empty Optional if all objects are null.
 	 */
 	@SafeVarargs
-	public static <T> Optional<T> getNonNull(@Nullable final T... objects) {
+	public static <T> Optional<T> firstNonNull(@Nullable final T... objects) {
 		return Optional.ofNullable(objects)
 				.map(arr -> Arrays.stream(arr).filter(Objects::nonNull).findFirst())
 				.orElse(Optional.empty());

spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java

@@ -55,7 +55,7 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.springframework.util.ObjectUtils.getIfEmpty;
 import static org.springframework.util.ObjectUtils.getIfNull;
-import static org.springframework.util.ObjectUtils.getNonNull;
+import static org.springframework.util.ObjectUtils.firstNonNull;
 import static org.springframework.util.ObjectUtils.isEmpty;
 
 /**
@@ -148,20 +148,20 @@ void getIfEmptyObject() {
 	}
 
 	@Test
-	void getNonNullObject() {
+	void firstNonNullObject() {
 		String value = UUID.randomUUID().toString();
 		String backup = UUID.randomUUID().toString();
 
-		assertThat(getNonNull(backup, value, value)).contains(backup);
-		assertThat(getNonNull(value, null, backup)).contains(value);
-		assertThat(getNonNull(backup, value, null)).contains(backup);
-		assertThat(getNonNull(value, backup)).contains(value);
-		assertThat(getNonNull(null, null, value)).contains(value);
+		assertThat(firstNonNull(backup, value, value)).contains(backup);
+		assertThat(firstNonNull(value, null, backup)).contains(value);
+		assertThat(firstNonNull(backup, value, null)).contains(backup);
+		assertThat(firstNonNull(value, backup)).contains(value);
+		assertThat(firstNonNull(null, null, value)).contains(value);
 
 		String _null = null;
-		assertThat(getNonNull(null, null, _null)).isEmpty();
-		assertThat(getNonNull(null, "null", backup)).contains("null");
-		assertThat(getNonNull(null, null)).isEmpty();
+		assertThat(firstNonNull(null, null, _null)).isEmpty();
+		assertThat(firstNonNull(null, "null", backup)).contains("null");
+		assertThat(firstNonNull(null, null)).isEmpty();
 	}
 
 	@Test