Skip to content

Commit f272fb6

Browse files
committed
Improve null-safety of module/spring-boot-webclient
See gh-46926
1 parent bab9cdb commit f272fb6

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

module/spring-boot-webclient/src/main/java/org/springframework/boot/webclient/autoconfigure/PropertiesWebClientCustomizer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ public void customize(WebClient.Builder builder) {
7373

7474
@SuppressWarnings("NullAway") // Lambda isn't detected with the correct nullability
7575
private void setDefaultApiVersion(Builder builder, PropertyMapper map, AbstractWebClientProperties properties) {
76-
map.from(properties.getApiversion()).as(ApiversionProperties::getDefaultVersion).to(builder::defaultApiVersion);
76+
map.from(properties.getApiversion())
77+
.as(ApiversionProperties::getDefaultVersion)
78+
.whenNonNull()
79+
.to(builder::defaultApiVersion);
7780
}
7881

7982
private Consumer<HttpHeaders> putAllHeaders(Map<String, List<String>> defaultHeaders) {

0 commit comments

Comments
 (0)