From bab9cdb47f4ff75a3dc05a389efa517d51ed4ad4 Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Wed, 27 Aug 2025 13:42:06 +0200
Subject: [PATCH] Improve null-safety of module/spring-boot-restclient

See gh-46926
---
 .../autoconfigure/PropertiesRestClientCustomizer.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/autoconfigure/PropertiesRestClientCustomizer.java b/module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/autoconfigure/PropertiesRestClientCustomizer.java
index cf4224cdc93..db9dcf2d9fb 100644
--- a/module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/autoconfigure/PropertiesRestClientCustomizer.java
+++ b/module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/autoconfigure/PropertiesRestClientCustomizer.java
@@ -73,7 +73,10 @@ public class PropertiesRestClientCustomizer implements RestClientCustomizer {
 
 	@SuppressWarnings("NullAway") // Lambda isn't detected with the correct nullability
 	private void setDefaultApiVersion(Builder builder, PropertyMapper map, AbstractRestClientProperties properties) {
-		map.from(properties.getApiversion()).as(ApiversionProperties::getDefaultVersion).to(builder::defaultApiVersion);
+		map.from(properties.getApiversion())
+			.as(ApiversionProperties::getDefaultVersion)
+			.whenNonNull()
+			.to(builder::defaultApiVersion);
 	}
 
 	private Consumer<HttpHeaders> putAllHeaders(Map<String, List<String>> defaultHeaders) {