Merge branch '3.3.x' into 3.4.x

Closes gh-45373
This commit is contained in:
Andy Wilkinson
2025-05-06 13:53:25 +01:00

View File

@@ -30,7 +30,6 @@ import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Red
import org.springframework.boot.ssl.SslBundles;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.web.client.RestClientCustomizer;
import org.springframework.boot.web.codec.CodecCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
@@ -225,16 +224,6 @@ class RestClientAutoConfigurationTests {
});
}
@Configuration(proxyBeanMethods = false)
static class CodecConfiguration {
@Bean
CodecCustomizer myCodecCustomizer() {
return mock(CodecCustomizer.class);
}
}
@Configuration(proxyBeanMethods = false)
static class RestClientCustomizerConfig {