Skip to content

Commit be079d6

Browse files
committed
added AnnotationAttributes as a param
1 parent 33e568a commit be079d6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
7070
AnnotationAttributes mapperScanAttrs = AnnotationAttributes
7171
.fromMap(importingClassMetadata.getAnnotationAttributes(MapperScan.class.getName()));
7272
if (mapperScanAttrs != null) {
73-
registerBeanDefinitions(mapperScanAttrs, registry, generateBaseBeanName(importingClassMetadata, 0), getDefaultBasePackage(importingClassMetadata));
73+
registerBeanDefinitions(importingClassMetadata, mapperScanAttrs, registry, generateBaseBeanName(importingClassMetadata, 0));
7474
}
7575
}
7676

77-
void registerBeanDefinitions(AnnotationAttributes annoAttrs, BeanDefinitionRegistry registry, String beanName, String defaultBasePackage) {
77+
void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes annoAttrs, BeanDefinitionRegistry registry, String beanName) {
7878

7979
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class);
8080
builder.addPropertyValue("processPropertyPlaceHolders", true);
@@ -120,7 +120,7 @@ void registerBeanDefinitions(AnnotationAttributes annoAttrs, BeanDefinitionRegis
120120
.collect(Collectors.toList()));
121121

122122
if (basePackages.isEmpty()) {
123-
basePackages.add(defaultBasePackage);
123+
basePackages.add(getDefaultBasePackage(annoMeta));
124124
}
125125

126126
String lazyInitialization = annoAttrs.getString("lazyInitialization");
@@ -158,7 +158,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
158158
if (mapperScansAttrs != null) {
159159
AnnotationAttributes[] annotations = mapperScansAttrs.getAnnotationArray("value");
160160
for (int i = 0; i < annotations.length; i++) {
161-
registerBeanDefinitions(annotations[i], registry, generateBaseBeanName(importingClassMetadata, i), getDefaultBasePackage(importingClassMetadata));
161+
registerBeanDefinitions(importingClassMetadata, annotations[i], registry, generateBaseBeanName(importingClassMetadata, i));
162162
}
163163
}
164164
}

0 commit comments

Comments
 (0)