From 552345fcd1e30d5f8c2f40aaf4f634aee67ec28c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 10 May 2019 10:16:22 +0100 Subject: [PATCH] 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 --- .../autoconfigure/kafka/KafkaAutoConfigurationTests.java | 2 +- .../autoconfigure/json/JsonTestersAutoConfiguration.java | 6 +++--- ...stRestTemplateContextCustomizerWithFactoryBeanTests.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java index cee5c62933a..ae5aa6f431b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java @@ -754,7 +754,7 @@ public class KafkaAutoConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) protected static class TestStreamsBuilderFactoryBeanConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java index 26de5ff50b8..e8be570532f 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java @@ -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 { diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithFactoryBeanTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithFactoryBeanTests.java index f276553109f..ebc0d644ec4 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithFactoryBeanTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithFactoryBeanTests.java @@ -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 {