Merge branch '3.3.x' into 3.4.x

Closes gh-45373

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java

@@ -30,7 +30,6 @@
 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 @@ void shouldSupplyRestClientBuilderConfigurerWithAutoConfiguredHttpSettings() {
 			});
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class CodecConfiguration {
-
-		@Bean
-		CodecCustomizer myCodecCustomizer() {
-			return mock(CodecCustomizer.class);
-		}
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	static class RestClientCustomizerConfig {