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

Adapt to upstream Spring Framework changes

Browse Source
This commit is contained in:
Phillip Webb
2025-05-19 12:05:08 -07:00
parent 00e4ca2201
commit 8081dfe8cf
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientCustomizerHttpServiceGroupConfigurer.java
View File

@@ -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<WebClient.Builder> 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));
}

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/reactive/service/WebClientPropertiesHttpServiceGroupConfigurer.java
View File

@@ -77,7 +77,7 @@ class WebClientPropertiesHttpServiceGroupConfigurer implements WebClientHttpServ
@Override
public void configureGroups(Groups<WebClient.Builder> groups) {
groups.configureClient(this::configureClient);
groups.forEachClient(this::configureClient);
}
private void configureClient(HttpServiceGroup group, WebClient.Builder builder) {

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientCustomizerHttpServiceGroupConfigurer.java
View File

@@ -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<RestClient.Builder> 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));
}

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/client/service/RestClientPropertiesHttpServiceGroupConfigurer.java
View File

@@ -74,7 +74,7 @@ class RestClientPropertiesHttpServiceGroupConfigurer implements RestClientHttpSe
@Override
public void configureGroups(Groups<RestClient.Builder> groups) {
groups.configureClient(this::configureClient);
groups.forEachClient(this::configureClient);
}
private void configureClient(HttpServiceGroup group, RestClient.Builder builder) {

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

@@ -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"));
}
}

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

@@ -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<HttpServiceGroup, Builder>) 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"));
}
}