From 8081dfe8cf0be88fb1cbcebbd357375036112182 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 19 May 2025 12:05:08 -0700 Subject: [PATCH] Adapt to upstream Spring Framework changes --- .../WebClientCustomizerHttpServiceGroupConfigurer.java | 5 +++-- .../WebClientPropertiesHttpServiceGroupConfigurer.java | 2 +- .../RestClientCustomizerHttpServiceGroupConfigurer.java | 5 +++-- .../RestClientPropertiesHttpServiceGroupConfigurer.java | 2 +- .../ReactiveHttpServiceClientAutoConfigurationTests.java | 2 +- .../service/HttpServiceClientAutoConfigurationTests.java | 5 ++--- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientCustomizerHttpServiceGroupConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientCustomizerHttpServiceGroupConfigurer.java index 377107b4eb9..664e07c0388 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientCustomizerHttpServiceGroupConfigurer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientCustomizerHttpServiceGroupConfigurer.java @@ -23,6 +23,7 @@ import org.springframework.web.client.RestClient; import org.springframework.web.client.support.RestClientHttpServiceGroupConfigurer; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.support.WebClientHttpServiceGroupConfigurer; +import org.springframework.web.service.registry.HttpServiceGroup; /** * A {@link RestClientHttpServiceGroupConfigurer} to apply auto-configured @@ -51,10 +52,10 @@ class WebClientCustomizerHttpServiceGroupConfigurer implements WebClientHttpServ @Override public void configureGroups(Groups groups) { - groups.configureClient(this::configureClient); + groups.forEachClient(this::configureClient); } - private void configureClient(WebClient.Builder builder) { + private void configureClient(HttpServiceGroup group, WebClient.Builder builder) { this.customizers.orderedStream().forEach((customizer) -> customizer.customize(builder)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientPropertiesHttpServiceGroupConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientPropertiesHttpServiceGroupConfigurer.java index bf16ea16433..0b9aca551f8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientPropertiesHttpServiceGroupConfigurer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientPropertiesHttpServiceGroupConfigurer.java @@ -77,7 +77,7 @@ class WebClientPropertiesHttpServiceGroupConfigurer implements WebClientHttpServ @Override public void configureGroups(Groups groups) { - groups.configureClient(this::configureClient); + groups.forEachClient(this::configureClient); } private void configureClient(HttpServiceGroup group, WebClient.Builder builder) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientCustomizerHttpServiceGroupConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientCustomizerHttpServiceGroupConfigurer.java index 16f77e1eafd..60538c0783c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientCustomizerHttpServiceGroupConfigurer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientCustomizerHttpServiceGroupConfigurer.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.web.client.RestClientCustomizer; import org.springframework.web.client.RestClient; import org.springframework.web.client.support.RestClientHttpServiceGroupConfigurer; +import org.springframework.web.service.registry.HttpServiceGroup; /** * A {@link RestClientHttpServiceGroupConfigurer} to apply auto-configured @@ -48,10 +49,10 @@ class RestClientCustomizerHttpServiceGroupConfigurer implements RestClientHttpSe @Override public void configureGroups(Groups groups) { - groups.configureClient(this::configureClient); + groups.forEachClient(this::configureClient); } - private void configureClient(RestClient.Builder builder) { + private void configureClient(HttpServiceGroup group, RestClient.Builder builder) { this.customizers.orderedStream().forEach((customizer) -> customizer.customize(builder)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientPropertiesHttpServiceGroupConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientPropertiesHttpServiceGroupConfigurer.java index 2480b292b02..2a65d7a0373 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientPropertiesHttpServiceGroupConfigurer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientPropertiesHttpServiceGroupConfigurer.java @@ -74,7 +74,7 @@ class RestClientPropertiesHttpServiceGroupConfigurer implements RestClientHttpSe @Override public void configureGroups(Groups groups) { - groups.configureClient(this::configureClient); + groups.forEachClient(this::configureClient); } private void configureClient(HttpServiceGroup group, RestClient.Builder builder) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/reactive/service/ReactiveHttpServiceClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/reactive/service/ReactiveHttpServiceClientAutoConfigurationTests.java index c2cc722eaa1..09913dd354c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/reactive/service/ReactiveHttpServiceClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/reactive/service/ReactiveHttpServiceClientAutoConfigurationTests.java @@ -203,7 +203,7 @@ class ReactiveHttpServiceClientAutoConfigurationTests { @Bean WebClientHttpServiceGroupConfigurer restClientHttpServiceGroupConfigurer() { return (groups) -> groups.filterByName("one") - .configureClient((builder) -> builder.defaultHeader("customizedgroup", "true")); + .forEachClient((group, builder) -> builder.defaultHeader("customizedgroup", "true")); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/service/HttpServiceClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/service/HttpServiceClientAutoConfigurationTests.java index 8c099d470e7..cda4d969341 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/service/HttpServiceClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/client/service/HttpServiceClientAutoConfigurationTests.java @@ -22,7 +22,6 @@ import java.net.http.HttpClient; import java.net.http.HttpClient.Redirect; import java.util.HashMap; import java.util.Map; -import java.util.function.BiConsumer; import org.assertj.core.extractor.Extractors; import org.junit.jupiter.api.Test; @@ -176,7 +175,7 @@ class HttpServiceClientAutoConfigurationTests { @Bean RestClientHttpServiceGroupConfigurer mockServerConfigurer() { - return (groups) -> groups.configureClient((BiConsumer) this::addMock); + return (groups) -> groups.forEachClient(this::addMock); } private MockRestServiceServer addMock(HttpServiceGroup group, Builder client) { @@ -233,7 +232,7 @@ class HttpServiceClientAutoConfigurationTests { @Bean RestClientHttpServiceGroupConfigurer restClientHttpServiceGroupConfigurer() { return (groups) -> groups.filterByName("one") - .configureClient((builder) -> builder.defaultHeader("customizedgroup", "true")); + .forEachClient((group, builder) -> builder.defaultHeader("customizedgroup", "true")); } }