From 39b4ecdf63c8ca794a9b820e9a4564318747d4d5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sat, 22 Jul 2017 08:11:26 +0100 Subject: [PATCH] Adapt to breaking change in Spring Data See gh-9834 --- .../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 d0118307346..10213185ae8 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 @@ -55,16 +55,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 registry) { StandardAnnotationMetadata metadata = new StandardAnnotationMetadata( getConfiguration(), true); return new AnnotationRepositoryConfigurationSource(metadata, getAnnotation(), - this.resourceLoader, this.environment) { + this.resourceLoader, this.environment, registry) { @Override public java.lang.Iterable getBasePackages() { return AbstractRepositoryConfigurationSourceSupport.this