Fix nullability @⁠Contract for SupplierUtils.resolve(Supplier)

sbrannen · sbrannen · commit 9782dfb620b9 · 2025-06-03T13:15:58.000+02:00
Closes gh-34987
diff --git a/spring-core/src/main/java/org/springframework/util/function/SupplierUtils.java b/spring-core/src/main/java/org/springframework/util/function/SupplierUtils.java
@@ -37,7 +37,7 @@ public abstract class SupplierUtils {
 	 * @param supplier the supplier to resolve
 	 * @return the supplier's result, or {@code null} if none
 	 */
-	@Contract("null -> null; !null -> !null")
+	@Contract("null -> null")
 	public static <T> @Nullable T resolve(@Nullable Supplier<T> supplier) {
 		return (supplier != null ? supplier.get() : null);
 	}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public abstract class SupplierUtils {`
`37`	`37`	`* @param supplier the supplier to resolve`
`38`	`38`	`* @return the supplier's result, or {@code null} if none`
`39`	`39`	`*/`
`40`		`- @Contract("null -> null; !null -> !null")`
	`40`	`+ @Contract("null -> null")`
`41`	`41`	`public static <T> @Nullable T resolve(@Nullable Supplier<T> supplier) {`
`42`	`42`	`return (supplier != null ? supplier.get() : null);`
`43`	`43`	`}`