Skip to content

Commit 544e575

Browse files
spencergibbspencergibb
committed
Updates for spring-boot 4 changes
1 parent 6790291 commit 544e575

File tree

25 files changed

+77
-61
lines changed

25 files changed

+77
-61
lines changed

‎spring-cloud-commons/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,16 @@
206206
<artifactId>spring-cloud-test-support</artifactId>
207207
<scope>test</scope>
208208
</dependency>
209+
<dependency>
210+
<groupId>org.springframework.boot</groupId>
211+
<artifactId>spring-boot-resttestclient</artifactId>
212+
<scope>test</scope>
213+
</dependency>
214+
<dependency>
215+
<groupId>org.springframework.boot</groupId>
216+
<artifactId>spring-boot-webmvc-test</artifactId>
217+
<scope>test</scope>
218+
</dependency>
209219
<dependency>
210220
<groupId>org.junit.platform</groupId>
211221
<artifactId>junit-platform-launcher</artifactId>

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
3232
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3333
import org.springframework.boot.context.properties.EnableConfigurationProperties;
34+
import org.springframework.boot.http.client.autoconfigure.service.HttpServiceClientProperties;
3435
import org.springframework.boot.restclient.RestTemplateBuilder;
35-
import org.springframework.boot.restclient.autoconfigure.service.HttpClientServiceProperties;
3636
import org.springframework.cloud.client.ServiceInstance;
3737
import org.springframework.cloud.client.loadbalancer.reactive.ReactiveLoadBalancer;
3838
import org.springframework.context.ApplicationContext;
@@ -129,7 +129,7 @@ static LoadBalancerRestTemplateBuilderBeanPostProcessor<DeferringLoadBalancerInt
129129
}
130130

131131
@Configuration(proxyBeanMethods = false)
132-
@ConditionalOnClass(HttpClientServiceProperties.class)
132+
@ConditionalOnClass(HttpServiceClientProperties.class)
133133
static class DeferringLoadBalancerInterceptorHttpClientConfig {
134134

135135
@Bean
@@ -140,11 +140,11 @@ public static DeferringLoadBalancerInterceptor deferringLoadBalancerInterceptor(
140140
}
141141

142142
@Bean
143-
@ConditionalOnBean({ HttpClientServiceProperties.class, ReactiveLoadBalancer.Factory.class })
143+
@ConditionalOnBean({ HttpServiceClientProperties.class, ReactiveLoadBalancer.Factory.class })
144144
@ConditionalOnMissingBean(LoadBalancerRestClientHttpServiceGroupConfigurer.class)
145145
LoadBalancerRestClientHttpServiceGroupConfigurer loadBalancerRestClientHttpServiceGroupConfigurer(
146146
ObjectProvider<DeferringLoadBalancerInterceptor> loadBalancerInterceptorProvider,
147-
HttpClientServiceProperties properties) {
147+
HttpServiceClientProperties properties) {
148148
return new LoadBalancerRestClientHttpServiceGroupConfigurer(loadBalancerInterceptorProvider, properties);
149149
}
150150

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRestClientHttpServiceGroupConfigurer.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import org.jspecify.annotations.NonNull;
2222

2323
import org.springframework.beans.factory.ObjectProvider;
24-
import org.springframework.boot.restclient.autoconfigure.service.HttpClientServiceProperties;
24+
import org.springframework.boot.http.client.autoconfigure.HttpClientProperties;
25+
import org.springframework.boot.http.client.autoconfigure.service.HttpServiceClientProperties;
2526
import org.springframework.util.function.SingletonSupplier;
2627
import org.springframework.web.client.RestClient;
2728
import org.springframework.web.client.support.RestClientHttpServiceGroupConfigurer;
@@ -42,7 +43,7 @@
4243
* @author Olga Maciaszek-Sharma
4344
* @since 5.0.0
4445
* @see RestClientHttpServiceGroupConfigurer
45-
* @see HttpClientServiceProperties
46+
* @see HttpServiceClientProperties
4647
*/
4748
public class LoadBalancerRestClientHttpServiceGroupConfigurer implements RestClientHttpServiceGroupConfigurer {
4849

@@ -51,11 +52,11 @@ public class LoadBalancerRestClientHttpServiceGroupConfigurer implements RestCli
5152

5253
private final SingletonSupplier<DeferringLoadBalancerInterceptor> loadBalancerInterceptorSupplier;
5354

54-
private final HttpClientServiceProperties clientServiceProperties;
55+
private final HttpServiceClientProperties clientServiceProperties;
5556

5657
public LoadBalancerRestClientHttpServiceGroupConfigurer(
5758
ObjectProvider<DeferringLoadBalancerInterceptor> loadBalancerInterceptorProvider,
58-
HttpClientServiceProperties clientServiceProperties) {
59+
HttpServiceClientProperties clientServiceProperties) {
5960
this.loadBalancerInterceptorSupplier = SingletonSupplier
6061
.ofNullable(loadBalancerInterceptorProvider::getIfAvailable);
6162
this.clientServiceProperties = clientServiceProperties;
@@ -71,7 +72,7 @@ public void configureGroups(@NonNull Groups<RestClient.Builder> groups) {
7172

7273
groups.forEachGroup((group, clientBuilder, factoryBuilder) -> {
7374
String groupName = group.name();
74-
HttpClientServiceProperties.Group groupProperties = clientServiceProperties.getGroup().get(groupName);
75+
HttpClientProperties groupProperties = clientServiceProperties.get(groupName);
7576
String baseUrlString = groupProperties == null ? null : groupProperties.getBaseUrl();
7677
URI existingBaseUrl = baseUrlString == null ? null : URI.create(baseUrlString);
7778
if (existingBaseUrl == null) {

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
25-
import org.springframework.boot.webclient.autoconfigure.service.ReactiveHttpClientServiceProperties;
25+
import org.springframework.boot.http.client.autoconfigure.service.HttpServiceClientProperties;
2626
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
2727
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
2828
import org.springframework.context.ApplicationContext;
@@ -71,16 +71,16 @@ static DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFun
7171
}
7272

7373
@Configuration(proxyBeanMethods = false)
74-
@ConditionalOnClass(ReactiveHttpClientServiceProperties.class)
74+
@ConditionalOnClass(HttpServiceClientProperties.class)
7575
@ConditionalOnBean(ReactiveLoadBalancer.Factory.class)
7676
protected static class ReactorDeferringLoadBalancerFilterHttpClientConfig {
7777

7878
@Bean
79-
@ConditionalOnBean({ ReactiveHttpClientServiceProperties.class, ReactiveLoadBalancer.Factory.class })
79+
@ConditionalOnBean({ HttpServiceClientProperties.class, ReactiveLoadBalancer.Factory.class })
8080
@ConditionalOnMissingBean(LoadBalancerWebClientHttpServiceGroupConfigurer.class)
8181
LoadBalancerWebClientHttpServiceGroupConfigurer loadBalancerWebClientHttpServiceGroupConfigurer(
8282
ObjectProvider<DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction>> deferringExchangeFilterFunction,
83-
ReactiveHttpClientServiceProperties properties) {
83+
HttpServiceClientProperties properties) {
8484
return new LoadBalancerWebClientHttpServiceGroupConfigurer(deferringExchangeFilterFunction, properties);
8585
}
8686

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerWebClientHttpServiceGroupConfigurer.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.net.URI;
2020

2121
import org.springframework.beans.factory.ObjectProvider;
22-
import org.springframework.boot.restclient.autoconfigure.service.HttpClientServiceProperties;
23-
import org.springframework.boot.webclient.autoconfigure.service.ReactiveHttpClientServiceProperties;
22+
import org.springframework.boot.http.client.autoconfigure.HttpClientProperties;
23+
import org.springframework.boot.http.client.autoconfigure.service.HttpServiceClientProperties;
2424
import org.springframework.util.function.SingletonSupplier;
2525
import org.springframework.web.reactive.function.client.WebClient;
2626
import org.springframework.web.reactive.function.client.support.WebClientHttpServiceGroupConfigurer;
@@ -41,7 +41,7 @@
4141
* @author Olga Maciaszek-Sharma
4242
* @since 5.0.0
4343
* @see WebClient.Builder
44-
* @see HttpClientServiceProperties
44+
* @see HttpServiceClientProperties
4545
*/
4646
public class LoadBalancerWebClientHttpServiceGroupConfigurer implements WebClientHttpServiceGroupConfigurer {
4747

@@ -50,14 +50,14 @@ public class LoadBalancerWebClientHttpServiceGroupConfigurer implements WebClien
5050

5151
private final SingletonSupplier<DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction>> loadBalancerFilterFunctionSupplier;
5252

53-
private final ReactiveHttpClientServiceProperties clientServiceProperties;
53+
private final HttpServiceClientProperties httpServiceClientProperties;
5454

5555
public LoadBalancerWebClientHttpServiceGroupConfigurer(
5656
ObjectProvider<DeferringLoadBalancerExchangeFilterFunction<LoadBalancedExchangeFilterFunction>> exchangeFilterFunctionProvider,
57-
ReactiveHttpClientServiceProperties clientServiceProperties) {
57+
HttpServiceClientProperties httpServiceClientProperties) {
5858
this.loadBalancerFilterFunctionSupplier = SingletonSupplier
5959
.ofNullable(exchangeFilterFunctionProvider::getIfAvailable);
60-
this.clientServiceProperties = clientServiceProperties;
60+
this.httpServiceClientProperties = httpServiceClientProperties;
6161
}
6262

6363
@Override
@@ -70,8 +70,7 @@ public void configureGroups(Groups<WebClient.Builder> groups) {
7070
}
7171
groups.forEachGroup((group, clientBuilder, factoryBuilder) -> {
7272
String groupName = group.name();
73-
ReactiveHttpClientServiceProperties.Group groupProperties = clientServiceProperties.getGroup()
74-
.get(groupName);
73+
HttpClientProperties groupProperties = httpServiceClientProperties.get(groupName);
7574
String baseUrlString = groupProperties == null ? null : groupProperties.getBaseUrl();
7675
URI existingBaseUrl = baseUrlString == null ? null : URI.create(baseUrlString);
7776
if (existingBaseUrl == null) {

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import org.junit.jupiter.api.Test;
2020

21-
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
2221
import org.springframework.boot.autoconfigure.AutoConfigurations;
22+
import org.springframework.boot.health.autoconfigure.actuate.endpoint.HealthEndpointAutoConfiguration;
2323
import org.springframework.boot.test.context.FilteredClassLoader;
2424
import org.springframework.boot.test.context.TestConfiguration;
2525
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/ManagementServerPortUtilsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static org.assertj.core.api.BDDAssertions.then;
2929

30-
@ClassPathExclusions({ "spring-boot-actuator-autoconfigure-*" })
30+
@ClassPathExclusions({ "spring-boot-actuator-*" })
3131
public class ManagementServerPortUtilsTests {
3232

3333
@Test

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.springframework.beans.factory.annotation.Autowired;
2222
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2323
import org.springframework.boot.test.context.SpringBootTest;
24-
import org.springframework.boot.web.server.test.LocalServerPort;
24+
import org.springframework.boot.test.web.server.LocalServerPort;
2525
import org.springframework.context.annotation.Configuration;
2626

2727
import static org.assertj.core.api.BDDAssertions.then;

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.springframework.beans.factory.annotation.Autowired;
2222
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2323
import org.springframework.boot.test.context.SpringBootTest;
24-
import org.springframework.boot.web.server.test.LocalServerPort;
24+
import org.springframework.boot.test.web.server.LocalServerPort;
2525
import org.springframework.context.annotation.Configuration;
2626

2727
import static org.assertj.core.api.BDDAssertions.then;

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.boot.autoconfigure.AutoConfigurations;
28-
import org.springframework.boot.restclient.autoconfigure.service.HttpClientServiceProperties;
28+
import org.springframework.boot.http.client.autoconfigure.service.HttpServiceClientProperties;
2929
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3030
import org.springframework.cloud.client.DefaultServiceInstance;
3131
import org.springframework.cloud.client.ServiceInstance;
@@ -191,8 +191,8 @@ RestClient.Builder loadBalancedRestClientBuilder() {
191191
}
192192

193193
@Bean
194-
HttpClientServiceProperties httpClientServiceProperties() {
195-
return new HttpClientServiceProperties();
194+
HttpServiceClientProperties httpServiceClientProperties() {
195+
return new HttpServiceClientProperties();
196196
}
197197

198198
}

0 commit comments

Comments
 (0)