@@ -70,11 +70,11 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
70
70
AnnotationAttributes mapperScanAttrs = AnnotationAttributes
71
71
.fromMap (importingClassMetadata .getAnnotationAttributes (MapperScan .class .getName ()));
72
72
if (mapperScanAttrs != null ) {
73
- registerBeanDefinitions (mapperScanAttrs , registry , generateBaseBeanName (importingClassMetadata , 0 ), getDefaultBasePackage ( importingClassMetadata ));
73
+ registerBeanDefinitions (importingClassMetadata , mapperScanAttrs , registry , generateBaseBeanName (importingClassMetadata , 0 ));
74
74
}
75
75
}
76
76
77
- void registerBeanDefinitions (AnnotationAttributes annoAttrs , BeanDefinitionRegistry registry , String beanName , String defaultBasePackage ) {
77
+ void registerBeanDefinitions (AnnotationMetadata annoMeta , AnnotationAttributes annoAttrs , BeanDefinitionRegistry registry , String beanName ) {
78
78
79
79
BeanDefinitionBuilder builder = BeanDefinitionBuilder .genericBeanDefinition (MapperScannerConfigurer .class );
80
80
builder .addPropertyValue ("processPropertyPlaceHolders" , true );
@@ -120,7 +120,7 @@ void registerBeanDefinitions(AnnotationAttributes annoAttrs, BeanDefinitionRegis
120
120
.collect (Collectors .toList ()));
121
121
122
122
if (basePackages .isEmpty ()) {
123
- basePackages .add (defaultBasePackage );
123
+ basePackages .add (getDefaultBasePackage ( annoMeta ) );
124
124
}
125
125
126
126
String lazyInitialization = annoAttrs .getString ("lazyInitialization" );
@@ -158,7 +158,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
158
158
if (mapperScansAttrs != null ) {
159
159
AnnotationAttributes [] annotations = mapperScansAttrs .getAnnotationArray ("value" );
160
160
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 ));
162
162
}
163
163
}
164
164
}
0 commit comments