Skip to content

Commit 63328e1

Browse files
wilkinsonawilkinsona
committed
Rework HTTP client modules
1 parent c2bdbb0 commit 63328e1

File tree

212 files changed

+344
-1305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+344
-1305
lines changed

‎settings.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ include "spring-boot-project:spring-boot-gson"
7878
include "spring-boot-project:spring-boot-h2console"
7979
include "spring-boot-project:spring-boot-hateoas"
8080
include "spring-boot-project:spring-boot-hazelcast"
81-
include "spring-boot-project:spring-boot-http-converter"
8281
include "spring-boot-project:spring-boot-http-client"
83-
include "spring-boot-project:spring-boot-http-client-reactive"
82+
include "spring-boot-project:spring-boot-http-converter"
8483
include "spring-boot-project:spring-boot-http-codec"
8584
include "spring-boot-project:spring-boot-integration"
8685
include "spring-boot-project:spring-boot-integration-tests"
@@ -106,6 +105,8 @@ include "spring-boot-project:spring-boot-quartz"
106105
include "spring-boot-project:spring-boot-r2dbc"
107106
include "spring-boot-project:spring-boot-reactor"
108107
include "spring-boot-project:spring-boot-reactor-netty"
108+
include "spring-boot-project:spring-boot-restclient"
109+
include "spring-boot-project:spring-boot-restclient-test"
109110
include "spring-boot-project:spring-boot-rsocket"
110111
include "spring-boot-project:spring-boot-security"
111112
include "spring-boot-project:spring-boot-security-oauth2-authorization-server"
@@ -146,6 +147,7 @@ include "spring-boot-project:spring-boot-undertow"
146147
include "spring-boot-project:spring-boot-validation"
147148
include "spring-boot-project:spring-boot-web-server"
148149
include "spring-boot-project:spring-boot-web-server-test"
150+
include "spring-boot-project:spring-boot-webclient"
149151
include "spring-boot-project:spring-boot-webflux"
150152
include "spring-boot-project:spring-boot-webmvc"
151153
include "spring-boot-project:spring-boot-webservices"

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ dependencies {
4040
optional(project(":spring-boot-project:spring-boot-flyway"))
4141
optional(project(":spring-boot-project:spring-boot-hazelcast"))
4242
optional(project(":spring-boot-project:spring-boot-http-converter"))
43-
optional(project(":spring-boot-project:spring-boot-http-client"))
44-
optional(project(":spring-boot-project:spring-boot-http-client-reactive"))
4543
optional(project(":spring-boot-project:spring-boot-http-codec"))
4644
optional(project(":spring-boot-project:spring-boot-integration"))
4745
optional(project(":spring-boot-project:spring-boot-jackson"))
@@ -57,13 +55,15 @@ dependencies {
5755
optional(project(":spring-boot-project:spring-boot-quartz"))
5856
optional(project(":spring-boot-project:spring-boot-r2dbc"))
5957
optional(project(":spring-boot-project:spring-boot-reactor-netty"))
58+
optional(project(":spring-boot-project:spring-boot-restclient"))
6059
optional(project(":spring-boot-project:spring-boot-security-oauth2-client"))
6160
optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
6261
optional(project(":spring-boot-project:spring-boot-security-saml2"))
6362
optional(project(":spring-boot-project:spring-boot-session"))
6463
optional(project(":spring-boot-project:spring-boot-tomcat"))
6564
optional(project(":spring-boot-project:spring-boot-undertow"))
6665
optional(project(":spring-boot-project:spring-boot-validation"))
66+
optional(project(":spring-boot-project:spring-boot-webclient"))
6767
optional(project(":spring-boot-project:spring-boot-webflux"))
6868
optional(project(":spring-boot-project:spring-boot-webmvc"))
6969
optional("ch.qos.logback:logback-classic")
@@ -176,6 +176,7 @@ dependencies {
176176

177177
testImplementation(project(":spring-boot-project:spring-boot-data-rest"))
178178
testImplementation(project(":spring-boot-project:spring-boot-hateoas"))
179+
testImplementation(project(":spring-boot-project:spring-boot-restclient-test"))
179180
testImplementation(project(":spring-boot-project:spring-boot-test"))
180181
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
181182
testImplementation(project(":spring-boot-project:spring-boot-web-server-test"))

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
5151
import org.springframework.boot.cloud.CloudPlatform;
5252
import org.springframework.boot.info.GitProperties;
53-
import org.springframework.boot.web.client.RestTemplateBuilder;
53+
import org.springframework.boot.restclient.RestTemplateBuilder;
5454
import org.springframework.context.ApplicationContext;
5555
import org.springframework.context.annotation.Bean;
5656
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.AccessLevel;
2626
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryAuthorizationException;
2727
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryAuthorizationException.Reason;
28-
import org.springframework.boot.web.client.RestTemplateBuilder;
28+
import org.springframework.boot.restclient.RestTemplateBuilder;
2929
import org.springframework.http.HttpStatus;
3030
import org.springframework.http.RequestEntity;
3131
import org.springframework.util.Assert;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/HttpClientObservationsAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
* @since 3.0.0
5151
*/
5252
@AutoConfiguration(after = { ObservationAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class },
53-
afterName = { "org.springframework.boot.http.client.reactive.web.autoconfigure.WebClientAutoConfiguration",
54-
"org.springframework.boot.http.client.rest.autoconfigure.RestClientAutoConfiguration",
55-
"org.springframework.boot.http.client.rest.autoconfigure.RestTemplateAutoConfiguration" })
53+
afterName = { "org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration",
54+
"org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration",
55+
"org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration" })
5656
@ConditionalOnClass(Observation.class)
5757
@ConditionalOnBean(ObservationRegistry.class)
5858
@Import({ RestTemplateObservationConfiguration.class, WebClientObservationConfiguration.class,

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestClientObservationConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.springframework.boot.actuate.autoconfigure.observation.ObservationProperties;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
25-
import org.springframework.boot.http.client.rest.actuate.observation.ObservationRestClientCustomizer;
26-
import org.springframework.boot.web.client.RestClientCustomizer;
25+
import org.springframework.boot.restclient.RestClientCustomizer;
26+
import org.springframework.boot.restclient.actuate.observation.ObservationRestClientCustomizer;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
2929
import org.springframework.http.client.observation.ClientRequestObservationConvention;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestTemplateObservationConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.springframework.boot.actuate.autoconfigure.observation.ObservationProperties;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
25-
import org.springframework.boot.http.client.rest.actuate.observation.ObservationRestTemplateCustomizer;
26-
import org.springframework.boot.web.client.RestTemplateBuilder;
25+
import org.springframework.boot.restclient.RestTemplateBuilder;
26+
import org.springframework.boot.restclient.actuate.observation.ObservationRestTemplateCustomizer;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
2929
import org.springframework.http.client.observation.ClientRequestObservationConvention;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties;
2323
import org.springframework.boot.actuate.autoconfigure.observation.ObservationProperties;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
25-
import org.springframework.boot.http.client.reactive.web.actuate.observation.ObservationWebClientCustomizer;
25+
import org.springframework.boot.webclient.actuate.observation.ObservationWebClientCustomizer;
2626
import org.springframework.context.annotation.Bean;
2727
import org.springframework.context.annotation.Configuration;
2828
import org.springframework.web.reactive.function.client.ClientRequestObservationConvention;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* @author Moritz Halbritter
3939
* @since 3.0.0
4040
*/
41-
@AutoConfiguration(afterName = "org.springframework.boot.http.client.rest.autoconfigure.RestTemplateAutoConfiguration")
41+
@AutoConfiguration(afterName = "org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration")
4242
@ConditionalOnClass(Encoding.class)
4343
@Import({ SenderConfiguration.class, BraveConfiguration.class, OpenTelemetryConfiguration.class })
4444
@EnableConfigurationProperties(ZipkinProperties.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryReactiveHealthEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
import org.springframework.boot.actuate.health.HealthIndicator;
3333
import org.springframework.boot.autoconfigure.AutoConfigurations;
3434
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
35-
import org.springframework.boot.http.client.reactive.web.autoconfigure.WebClientAutoConfiguration;
3635
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3736
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3837
import org.springframework.boot.security.autoconfigure.reactive.ReactiveSecurityAutoConfiguration;
3938
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
39+
import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
4040
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
4141
import org.springframework.context.annotation.Bean;
4242
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.springframework.boot.autoconfigure.AutoConfigurations;
5151
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
5252
import org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration;
53-
import org.springframework.boot.http.client.reactive.web.autoconfigure.WebClientAutoConfiguration;
5453
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
5554
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
5655
import org.springframework.boot.security.autoconfigure.reactive.ReactiveSecurityAutoConfiguration;
@@ -60,7 +59,8 @@
6059
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
6160
import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
6261
import org.springframework.boot.testsupport.classpath.resources.WithResource;
63-
import org.springframework.boot.web.reactive.function.client.WebClientCustomizer;
62+
import org.springframework.boot.webclient.WebClientCustomizer;
63+
import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
6464
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
6565
import org.springframework.context.ApplicationContext;
6666
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
import org.springframework.boot.actuate.endpoint.web.WebOperationRequestPredicate;
4040
import org.springframework.boot.autoconfigure.AutoConfigurations;
4141
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
42-
import org.springframework.boot.http.client.rest.autoconfigure.RestTemplateAutoConfiguration;
4342
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
4443
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
44+
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
4545
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
4646
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4747
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryHealthEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import org.springframework.boot.actuate.health.HealthIndicator;
3232
import org.springframework.boot.autoconfigure.AutoConfigurations;
3333
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
34-
import org.springframework.boot.http.client.rest.autoconfigure.RestTemplateAutoConfiguration;
3534
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3635
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
36+
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
3737
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3939
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import org.springframework.boot.autoconfigure.AutoConfigurations;
3131
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3232
import org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration;
33-
import org.springframework.boot.http.client.rest.autoconfigure.RestTemplateAutoConfiguration;
3433
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3534
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
35+
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
3636
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
3737
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3838
import org.springframework.boot.testsupport.classpath.resources.WithResource;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityServiceTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
2525
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.AccessLevel;
2626
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryAuthorizationException;
2727
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryAuthorizationException.Reason;
28-
import org.springframework.boot.test.web.client.MockServerRestTemplateCustomizer;
29-
import org.springframework.boot.web.client.RestTemplateBuilder;
28+
import org.springframework.boot.restclient.RestTemplateBuilder;
29+
import org.springframework.boot.restclient.test.MockServerRestTemplateCustomizer;
3030
import org.springframework.http.HttpStatus;
3131
import org.springframework.http.MediaType;
3232
import org.springframework.test.util.ReflectionTestUtils;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@
4747
import org.springframework.boot.actuate.autoconfigure.observation.web.reactive.WebFluxObservationAutoConfiguration;
4848
import org.springframework.boot.actuate.autoconfigure.observation.web.servlet.WebMvcObservationAutoConfiguration;
4949
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
50-
import org.springframework.boot.http.client.rest.autoconfigure.RestTemplateAutoConfiguration;
5150
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
5251
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
52+
import org.springframework.boot.restclient.RestTemplateBuilder;
53+
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
5354
import org.springframework.boot.test.context.SpringBootTest;
5455
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
5556
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
56-
import org.springframework.boot.web.client.RestTemplateBuilder;
5757
import org.springframework.boot.web.server.test.client.TestRestTemplate;
5858
import org.springframework.boot.web.servlet.FilterRegistrationBean;
5959
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestClientObservationConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
2727
import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
29-
import org.springframework.boot.http.client.rest.actuate.observation.ObservationRestClientCustomizer;
30-
import org.springframework.boot.http.client.rest.autoconfigure.RestClientAutoConfiguration;
29+
import org.springframework.boot.restclient.actuate.observation.ObservationRestClientCustomizer;
30+
import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
31+
import org.springframework.boot.restclient.test.MockServerRestClientCustomizer;
3132
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
3233
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3334
import org.springframework.boot.test.system.CapturedOutput;
3435
import org.springframework.boot.test.system.OutputCaptureExtension;
35-
import org.springframework.boot.test.web.client.MockServerRestClientCustomizer;
3636
import org.springframework.context.annotation.Bean;
3737
import org.springframework.context.annotation.Configuration;
3838
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestClientObservationConfigurationWithoutMetricsTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
2525
import org.springframework.boot.autoconfigure.AutoConfigurations;
26-
import org.springframework.boot.http.client.rest.autoconfigure.RestClientAutoConfiguration;
26+
import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
27+
import org.springframework.boot.restclient.test.MockServerRestClientCustomizer;
2728
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
2829
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2930
import org.springframework.boot.test.system.OutputCaptureExtension;
30-
import org.springframework.boot.test.web.client.MockServerRestClientCustomizer;
3131
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
3232
import org.springframework.http.HttpStatus;
3333
import org.springframework.web.client.RestClient;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestTemplateObservationConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
2727
import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
29-
import org.springframework.boot.http.client.rest.actuate.observation.ObservationRestTemplateCustomizer;
30-
import org.springframework.boot.http.client.rest.autoconfigure.RestTemplateAutoConfiguration;
29+
import org.springframework.boot.restclient.RestTemplateBuilder;
30+
import org.springframework.boot.restclient.actuate.observation.ObservationRestTemplateCustomizer;
31+
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
3132
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
3233
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3334
import org.springframework.boot.test.system.CapturedOutput;
3435
import org.springframework.boot.test.system.OutputCaptureExtension;
35-
import org.springframework.boot.web.client.RestTemplateBuilder;
3636
import org.springframework.context.annotation.Bean;
3737
import org.springframework.context.annotation.Configuration;
3838
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestTemplateObservationConfigurationWithoutMetricsTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323

2424
import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
2525
import org.springframework.boot.autoconfigure.AutoConfigurations;
26-
import org.springframework.boot.http.client.rest.autoconfigure.RestTemplateAutoConfiguration;
26+
import org.springframework.boot.restclient.RestTemplateBuilder;
27+
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
2728
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
2829
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2930
import org.springframework.boot.test.system.OutputCaptureExtension;
3031
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
31-
import org.springframework.boot.web.client.RestTemplateBuilder;
3232
import org.springframework.http.HttpStatus;
3333
import org.springframework.test.web.client.MockRestServiceServer;
3434
import org.springframework.web.client.RestTemplate;

0 commit comments

Comments
 (0)