From 5d9b89c33931a397da47d9512bea65d5d4959cf3 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 24 Nov 2014 22:38:48 +0100 Subject: [PATCH] DATACMNS-591 - RepositoryConfigurationDelegate now uses Environment and ResourceLoader everywhere. We now also use the Environment and ResourceLoader for the component scan to detect whether multiple Spring Data modules are on the classpath. --- .../config/RepositoryConfigurationDelegate.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java index 237f37c6f..3af8983ce 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java @@ -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; }