Skip to content

Commit 552345f

Browse files
committed
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
1 parent fddc8bd commit 552345f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ public KafkaStreamsConfiguration kafkaStreamsConfiguration() {
754754

755755
}
756756

757-
@Configuration
757+
@Configuration(proxyBeanMethods = false)
758758
protected static class TestStreamsBuilderFactoryBeanConfiguration {
759759

760760
@Bean

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public FactoryBean<BasicJsonTester> basicJsonTesterFactoryBean() {
7575
null);
7676
}
7777

78-
@Configuration
78+
@Configuration(proxyBeanMethods = false)
7979
@ConditionalOnClass(ObjectMapper.class)
8080
static class JacksonJsonTestersConfiguration {
8181

@@ -89,7 +89,7 @@ public FactoryBean<JacksonTester<?>> jacksonTesterFactoryBean(
8989

9090
}
9191

92-
@Configuration
92+
@Configuration(proxyBeanMethods = false)
9393
@ConditionalOnClass(Gson.class)
9494
static class GsonJsonTestersConfiguration {
9595

@@ -102,7 +102,7 @@ public FactoryBean<GsonTester<?>> gsonTesterFactoryBean(Gson gson) {
102102

103103
}
104104

105-
@Configuration
105+
@Configuration(proxyBeanMethods = false)
106106
@ConditionalOnClass(Jsonb.class)
107107
static class JsonbJsonTesterConfiguration {
108108

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void test() {
4949
assertThat(this.restTemplate).isNotNull();
5050
}
5151

52-
@Configuration
52+
@Configuration(proxyBeanMethods = false)
5353
@ComponentScan("org.springframework.boot.test.web.client.scan")
5454
static class TestClassWithFactoryBean {
5555

0 commit comments

Comments
 (0)