Adapt to upstream Spring Framework changes

Author: philwebb

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.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 @@ public int getOrder() {
 
 	@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));
 	}
 

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

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

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.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 @@ public int getOrder() {
 
 	@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));
 	}
 

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

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

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

@@ -203,7 +203,7 @@ static class HttpServiceGroupConfigurerConfiguration {
 		@Bean
 		WebClientHttpServiceGroupConfigurer restClientHttpServiceGroupConfigurer() {
 			return (groups) -> groups.filterByName("one")
-				.configureClient((builder) -> builder.defaultHeader("customizedgroup", "true"));
+				.forEachClient((group, builder) -> builder.defaultHeader("customizedgroup", "true"));
 		}
 
 	}

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.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 @@ static class MockRestServiceServerConfiguration {
 
 		@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 @@ static class HttpServiceGroupConfigurerConfiguration {
 		@Bean
 		RestClientHttpServiceGroupConfigurer restClientHttpServiceGroupConfigurer() {
 			return (groups) -> groups.filterByName("one")
-				.configureClient((builder) -> builder.defaultHeader("customizedgroup", "true"));
+				.forEachClient((group, builder) -> builder.defaultHeader("customizedgroup", "true"));
 		}
 
 	}