From 9a5cd29e3c162b80351fc39c233e2c4b15d00a23 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Sat, 30 Dec 2017 11:39:05 +0100 Subject: [PATCH] DATACMNS-1238 - Optimize setting Environment on ClassPathScanningCandidateComponentProvider. In CustomRepositoryImplementationDetector, we now immediately hand the Environment to the constructor of ClassPathScanningCandidateComponentProvider instead of setting it afterwards. This prevents a default StandardEnvironment from being created in the previously used constructor. --- .../config/CustomRepositoryImplementationDetector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetector.java b/src/main/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetector.java index 09d18d288..63c37e57c 100644 --- a/src/main/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetector.java +++ b/src/main/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetector.java @@ -102,8 +102,8 @@ public class CustomRepositoryImplementationDetector { Pattern pattern = Pattern.compile(".*\\." + className); // Build classpath scanner and lookup bean definition - ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); - provider.setEnvironment(environment); + ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false, + environment); provider.setResourceLoader(resourceLoader); provider.setResourcePattern(String.format(CUSTOM_IMPLEMENTATION_RESOURCE_PATTERN, className)); provider.setMetadataReaderFactory(metadataReaderFactory);