From 2e4566bd3dd83bfe7a7d5293797b43a77c493c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 17 Nov 2025 09:42:06 +0100 Subject: [PATCH] Polish --- .../boot/http/client/HttpClientSettings.java | 10 +--------- .../autoconfigure/HttpClientAutoConfiguration.java | 12 ++++-------- .../HttpClientSettingsPropertyMapper.java | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java index 40597060f5b..5f35ff04e43 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java @@ -23,7 +23,7 @@ import org.jspecify.annotations.Nullable; import org.springframework.boot.ssl.SslBundle; /** - * Settings that can be applied when creating a imperative or reactive HTTP client. + * Settings that can be applied when creating an imperative or reactive HTTP client. * * @param redirects the follow redirect strategy to use or null to redirect whenever the * underlying library allows it @@ -38,14 +38,6 @@ public record HttpClientSettings(@Nullable HttpRedirects redirects, @Nullable Du private static final HttpClientSettings defaults = new HttpClientSettings(null, null, null, null); - public HttpClientSettings(@Nullable HttpRedirects redirects, @Nullable Duration connectTimeout, - @Nullable Duration readTimeout, @Nullable SslBundle sslBundle) { - this.redirects = redirects; - this.connectTimeout = connectTimeout; - this.readTimeout = readTimeout; - this.sslBundle = sslBundle; - } - /** * Return a new {@link HttpClientSettings} instance with an updated connect timeout * setting. diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientAutoConfiguration.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientAutoConfiguration.java index e5714a6b946..6cb2740759c 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientAutoConfiguration.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientAutoConfiguration.java @@ -36,16 +36,12 @@ import org.springframework.context.annotation.Bean; @EnableConfigurationProperties(HttpClientsProperties.class) public final class HttpClientAutoConfiguration { - private final HttpClientSettingsPropertyMapper propertyMapper; - - HttpClientAutoConfiguration(ObjectProvider sslBundles) { - this.propertyMapper = new HttpClientSettingsPropertyMapper(sslBundles.getIfAvailable(), null); - } - @Bean @ConditionalOnMissingBean - HttpClientSettings httpClientSettings(HttpClientsProperties properties) { - return this.propertyMapper.map(properties); + HttpClientSettings httpClientSettings(ObjectProvider sslBundles, HttpClientsProperties properties) { + HttpClientSettingsPropertyMapper propertyMapper = new HttpClientSettingsPropertyMapper( + sslBundles.getIfAvailable(), null); + return propertyMapper.map(properties); } } diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsPropertyMapper.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsPropertyMapper.java index dada8124427..0a0e8feeb08 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsPropertyMapper.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsPropertyMapper.java @@ -57,7 +57,7 @@ public class HttpClientSettingsPropertyMapper { return settings.orElse(this.settings); } - private @Nullable SslBundle getSslBundle(String name) { + private SslBundle getSslBundle(String name) { Assert.state(this.sslBundles != null, "No 'sslBundles' available"); return this.sslBundles.getBundle(name); }