Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set to proxyBeanMethods=false on Configuration class #762

Merged
merged 1 commit into from
Nov 27, 2022
Merged

Set to proxyBeanMethods=false on Configuration class #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...nfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions ...in/java/org/mybatis/spring/boot/autoconfigure/MybatisLanguageDriverAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*
* @since 2.1.0
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(LanguageDriver.class)
public class MybatisLanguageDriverAutoConfiguration {

Expand All @@ -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 {
Expand All @@ -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
Expand All @@ -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")
Expand All @@ -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
Expand All @@ -112,7 +112,7 @@ public VelocityLanguageDriverConfig velocityLanguageDriverConfig() {
}
}

@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ThymeleafLanguageDriver.class)
public static class ThymeleafConfiguration {
@Bean
Expand Down