Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove settings suffix from http client properties

Browse Source 
Remove `spring.http.client` deprecation and change
`spring.http.reactiveclient.settings` to `spring.http.reactiveclient`.

Closes gh-45507
This commit is contained in:
Phillip Webb
2025-05-12 17:16:25 -07:00
parent 2923e66143
commit 48ed394679
9 changed files with 25 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/HttpClientAutoConfigurationTests.java
View File

@@ -69,9 +69,8 @@ class HttpClientAutoConfigurationTests {
@Test
void configuresClientHttpRequestFactorySettings() {
this.contextRunner.withPropertyValues(sslPropertyValues().toArray(String[]::new))
.withPropertyValues("spring.http.client.settings.redirects=dont-follow",
"spring.http.client.settings.connect-timeout=10s", "spring.http.client.settings.read-timeout=20s",
"spring.http.client.settings.ssl.bundle=test")
.withPropertyValues("spring.http.client.redirects=dont-follow", "spring.http.client.connect-timeout=10s",
"spring.http.client.read-timeout=20s", "spring.http.client.ssl.bundle=test")
.run((context) -> {
ClientHttpRequestFactorySettings settings = context.getBean(ClientHttpRequestFactorySettings.class);
assertThat(settings.redirects()).isEqualTo(Redirects.DONT_FOLLOW);

11
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/reactive/ClientHttpConnectorAutoConfigurationTests.java
View File

@@ -123,7 +123,7 @@ class ClientHttpConnectorAutoConfigurationTests {
@Test
void configuresDefinedClientHttpConnectorBuilder() {
this.contextRunner.withPropertyValues("spring.http.reactiveclient.settings.connector=jetty")
this.contextRunner.withPropertyValues("spring.http.reactiveclient.connector=jetty")
.run((context) -> assertThat(context.getBean(ClientHttpConnectorBuilder.class))
.isInstanceOf(JettyClientHttpConnectorBuilder.class));
}
@@ -131,10 +131,9 @@ class ClientHttpConnectorAutoConfigurationTests {
@Test
void configuresClientHttpConnectorSettings() {
this.contextRunner.withPropertyValues(sslPropertyValues().toArray(String[]::new))
.withPropertyValues("spring.http.reactiveclient.settings.redirects=dont-follow",
"spring.http.reactiveclient.settings.connect-timeout=10s",
"spring.http.reactiveclient.settings.read-timeout=20s",
"spring.http.reactiveclient.settings.ssl.bundle=test")
.withPropertyValues("spring.http.reactiveclient.redirects=dont-follow",
"spring.http.reactiveclient.connect-timeout=10s", "spring.http.reactiveclient.read-timeout=20s",
"spring.http.reactiveclient.ssl.bundle=test")
.run((context) -> {
ClientHttpConnectorSettings settings = context.getBean(ClientHttpConnectorSettings.class);
assertThat(settings.redirects()).isEqualTo(HttpRedirects.DONT_FOLLOW);
@@ -156,7 +155,7 @@ class ClientHttpConnectorAutoConfigurationTests {
@Test
void clientHttpConnectorBuilderCustomizersAreApplied() {
this.contextRunner.withPropertyValues("spring.http.reactiveclient.settings.connector=jdk")
this.contextRunner.withPropertyValues("spring.http.reactiveclient.connector=jdk")
.withUserConfiguration(ClientHttpConnectorBuilderCustomizersConfiguration.class)
.run((context) -> {
ClientHttpConnector connector = context.getBean(ClientHttpConnectorBuilder.class).build();

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/reactive/HttpReactiveClientSettingsPropertiesTests.java
View File

@@ -28,7 +28,7 @@ import org.springframework.boot.http.client.reactive.ReactorClientHttpConnectorB
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link HttpReactiveClientSettingsProperties}.
* Tests for {@link HttpReactiveClientProperties}.
*
* @author Phillip Webb
*/