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

DATACMNS-591 - RepositoryConfigurationDelegate now uses Environment and ResourceLoader everywhere.

Browse Source 
We now also use the Environment and ResourceLoader for the component scan to detect whether multiple Spring Data modules are on the classpath.
This commit is contained in:
Oliver Gierke
2014-11-24 22:38:48 +01:00
parent e14ba802a7
commit 806214e332
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java
View File

@@ -159,12 +159,13 @@ public class RepositoryConfigurationDelegate {
*/
private boolean multipleStoresDetected() {
ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false,
environment);
ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false);
scanner.setEnvironment(environment);
scanner.setResourceLoader(resourceLoader);
scanner.addIncludeFilter(new LenientAssignableTypeFilter(RepositoryFactorySupport.class));
int numberOfModulesFound = scanner.findCandidateComponents(MODULE_DETECTION_PACKAGE).size();
if (numberOfModulesFound > 1) {
if (scanner.findCandidateComponents(MODULE_DETECTION_PACKAGE).size() > 1) {
LOGGER.debug(MULTIPLE_MODULES);
return true;
}