From 5a4ef50ef1d71f1a42edaee309b3e04fb754b13a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 26 Jun 2017 17:20:32 +0100 Subject: [PATCH] Adapt to API changes in Spring Data Commons --- .../AbstractRepositoryConfigurationSourceSupport.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java index e0e8e4123e6..5c91fb013d7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/AbstractRepositoryConfigurationSourceSupport.java @@ -56,16 +56,17 @@ public abstract class AbstractRepositoryConfigurationSourceSupport @Override public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { - new RepositoryConfigurationDelegate(getConfigurationSource(), this.resourceLoader, - this.environment).registerRepositoriesIn(registry, + new RepositoryConfigurationDelegate(getConfigurationSource(registry), + this.resourceLoader, this.environment).registerRepositoriesIn(registry, getRepositoryConfigurationExtension()); } - private AnnotationRepositoryConfigurationSource getConfigurationSource() { + private AnnotationRepositoryConfigurationSource getConfigurationSource( + BeanDefinitionRegistry beanDefinitionRegistry) { StandardAnnotationMetadata metadata = new StandardAnnotationMetadata( getConfiguration(), true); return new AnnotationRepositoryConfigurationSource(metadata, getAnnotation(), - this.resourceLoader, this.environment) { + this.resourceLoader, this.environment, beanDefinitionRegistry) { @Override public Streamable getBasePackages() { return AbstractRepositoryConfigurationSourceSupport.this