Commit 552345fc authored by Andy Wilkinson's avatar Andy Wilkinson

Disable more @Bean method proxying

Previously, due to a quirk in Spring Framework, it was necessary to use bean method
proxying in @Configuration classes that define one or more FactoryBeans. This quirk has
now been addressed so this commit disables bean method proxying where it is now no longer
needed.

Closes gh-16533
parent fddc8bd8
......@@ -754,7 +754,7 @@ public class KafkaAutoConfigurationTests {
}
@Configuration
@Configuration(proxyBeanMethods = false)
protected static class TestStreamsBuilderFactoryBeanConfiguration {
@Bean
......
......@@ -75,7 +75,7 @@ public class JsonTestersAutoConfiguration {
null);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ObjectMapper.class)
static class JacksonJsonTestersConfiguration {
......@@ -89,7 +89,7 @@ public class JsonTestersAutoConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Gson.class)
static class GsonJsonTestersConfiguration {
......@@ -102,7 +102,7 @@ public class JsonTestersAutoConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Jsonb.class)
static class JsonbJsonTesterConfiguration {
......
......@@ -49,7 +49,7 @@ public class TestRestTemplateContextCustomizerWithFactoryBeanTests {
assertThat(this.restTemplate).isNotNull();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ComponentScan("org.springframework.boot.test.web.client.scan")
static class TestClassWithFactoryBean {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment