Merge pull request #37746 from techiesarav

* pr/37746:
  Polish "Remove @ConditionalOnMissingBean from RestTemplateBuilderConfigurer"
  Remove @ConditionalOnMissingBean from RestTemplateBuilderConfigurer

Closes gh-37746

Author: mhalbritter

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestTemplateAutoConfiguration.java

@@ -45,7 +45,6 @@ public class RestTemplateAutoConfiguration {
 
 	@Bean
 	@Lazy
-	@ConditionalOnMissingBean
 	public RestTemplateBuilderConfigurer restTemplateBuilderConfigurer(
 			ObjectProvider<HttpMessageConverters> messageConverters,
 			ObjectProvider<RestTemplateCustomizer> restTemplateCustomizers,

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

@@ -21,6 +21,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.support.BeanDefinitionOverrideException;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
@@ -65,6 +66,14 @@ void restTemplateBuilderConfigurerShouldBeLazilyDefined() {
 			.isTrue());
 	}
 
+	@Test
+	void shouldFailOnCustomRestTemplateBuilderConfigurer() {
+		this.contextRunner.withUserConfiguration(RestTemplateCustomConfigurerConfig.class)
+			.run((context) -> assertThat(context).getFailure()
+				.isInstanceOf(BeanDefinitionOverrideException.class)
+				.hasMessageContaining("with name 'restTemplateBuilderConfigurer'"));
+	}
+
 	@Test
 	void restTemplateBuilderShouldBeLazilyDefined() {
 		this.contextRunner
@@ -263,6 +272,16 @@ RestTemplateRequestCustomizer<?> restTemplateRequestCustomizer() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class RestTemplateCustomConfigurerConfig {
+
+		@Bean
+		RestTemplateBuilderConfigurer restTemplateBuilderConfigurer() {
+			return new RestTemplateBuilderConfigurer();
+		}
+
+	}
+
 	static class CustomHttpMessageConverter extends StringHttpMessageConverter {
 
 	}