Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Support comma-separated basePackage values in EntityScan"

Browse Source 
See gh-27355
This commit is contained in:
Madhura Bhave
2021-07-15 15:40:01 -07:00
parent 00b9a8811d
commit 7bae960d78
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java
View File

@@ -148,7 +148,7 @@ public class EntityScanPackages {
Collections.addAll(packagesToScan, tokenized);
}
for (Class<?> basePackageClass : attributes.getClassArray("basePackageClasses")) {
addResolvedPackage(ClassUtils.getPackageName(basePackageClass), packagesToScan);
packagesToScan.add(this.environment.resolvePlaceholders(ClassUtils.getPackageName(basePackageClass)));
}
if (packagesToScan.isEmpty()) {
String packageName = ClassUtils.getPackageName(metadata.getClassName());
@@ -158,10 +158,6 @@ public class EntityScanPackages {
return packagesToScan;
}
private void addResolvedPackage(String packageName, Set<String> packagesToScan) {
packagesToScan.add(this.environment.resolvePlaceholders(packageName));
}
}
static class EntityScanPackagesBeanDefinition extends GenericBeanDefinition {