Merge pull request #762 from kazuki43zoo/gh-758

Set to proxyBeanMethods=false on Configuration class
mybatis · Nov 27, 2022 · fcd37dc · fcd37dc
2 parents 035b951 + c910db3
commit fcd37dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...nfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java b/...nfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java
@@ -80,7 +80,7 @@
  * @author Kazuki Shimizu
  * @author Eduardo Macarrón
  */
-@org.springframework.context.annotation.Configuration
+@org.springframework.context.annotation.Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ SqlSessionFactory.class, SqlSessionFactoryBean.class })
 @ConditionalOnSingleCandidate(DataSource.class)
 @EnableConfigurationProperties(MybatisProperties.class)
@@ -309,7 +309,7 @@ private String getBeanNameForType(Class<?> type, ListableBeanFactory factory) {
    * If mapper registering configuration or mapper scanning configuration not present, this configuration allow to scan
    * mappers based on the same component-scanning path as Spring Boot itself.
    */
-  @org.springframework.context.annotation.Configuration
+  @org.springframework.context.annotation.Configuration(proxyBeanMethods = false)
   @Import(AutoConfiguredMapperScannerRegistrar.class)
   @ConditionalOnMissingBean({ MapperFactoryBean.class, MapperScannerConfigurer.class })
   public static class MapperScannerRegistrarNotFoundConfiguration implements InitializingBean {

diff --git a/...in/java/org/mybatis/spring/boot/autoconfigure/MybatisLanguageDriverAutoConfiguration.java b/...in/java/org/mybatis/spring/boot/autoconfigure/MybatisLanguageDriverAutoConfiguration.java
@@ -37,7 +37,7 @@
  *
  * @since 2.1.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(LanguageDriver.class)
 public class MybatisLanguageDriverAutoConfiguration {
 
@@ -46,7 +46,7 @@ public class MybatisLanguageDriverAutoConfiguration {
   /**
    * Configuration class for mybatis-freemarker 1.1.x or under.
    */
-  @Configuration
+  @Configuration(proxyBeanMethods = false)
   @ConditionalOnClass(FreeMarkerLanguageDriver.class)
   @ConditionalOnMissingClass("org.mybatis.scripting.freemarker.FreeMarkerLanguageDriverConfig")
   public static class LegacyFreeMarkerConfiguration {
@@ -60,7 +60,7 @@ FreeMarkerLanguageDriver freeMarkerLanguageDriver() {
   /**
    * Configuration class for mybatis-freemarker 1.2.x or above.
    */
-  @Configuration
+  @Configuration(proxyBeanMethods = false)
   @ConditionalOnClass({ FreeMarkerLanguageDriver.class, FreeMarkerLanguageDriverConfig.class })
   public static class FreeMarkerConfiguration {
     @Bean
@@ -80,7 +80,7 @@ public FreeMarkerLanguageDriverConfig freeMarkerLanguageDriverConfig() {
   /**
    * Configuration class for mybatis-velocity 2.0 or under.
    */
-  @Configuration
+  @Configuration(proxyBeanMethods = false)
   @ConditionalOnClass(org.mybatis.scripting.velocity.Driver.class)
   @ConditionalOnMissingClass("org.mybatis.scripting.velocity.VelocityLanguageDriverConfig")
   @SuppressWarnings("deprecation")
@@ -95,7 +95,7 @@ org.mybatis.scripting.velocity.Driver velocityLanguageDriver() {
   /**
    * Configuration class for mybatis-velocity 2.1.x or above.
    */
-  @Configuration
+  @Configuration(proxyBeanMethods = false)
   @ConditionalOnClass({ VelocityLanguageDriver.class, VelocityLanguageDriverConfig.class })
   public static class VelocityConfiguration {
     @Bean
@@ -112,7 +112,7 @@ public VelocityLanguageDriverConfig velocityLanguageDriverConfig() {
     }
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods = false)
   @ConditionalOnClass(ThymeleafLanguageDriver.class)
   public static class ThymeleafConfiguration {
     @Bean