From 10868519e152e87d658b52fd23585c790dac9906 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 9 Jun 2017 13:53:11 +0100 Subject: [PATCH] Adapt to breaking API change 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 d011830734..e0e8e4123e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import org.springframework.core.type.StandardAnnotationMetadata; import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource; import org.springframework.data.repository.config.RepositoryConfigurationDelegate; import org.springframework.data.repository.config.RepositoryConfigurationExtension; +import org.springframework.data.util.Streamable; /** * Base {@link ImportBeanDefinitionRegistrar} used to auto-configure Spring Data @@ -66,15 +67,15 @@ public abstract class AbstractRepositoryConfigurationSourceSupport return new AnnotationRepositoryConfigurationSource(metadata, getAnnotation(), this.resourceLoader, this.environment) { @Override - public java.lang.Iterable getBasePackages() { + public Streamable getBasePackages() { return AbstractRepositoryConfigurationSourceSupport.this .getBasePackages(); } }; } - protected Iterable getBasePackages() { - return AutoConfigurationPackages.get(this.beanFactory); + protected Streamable getBasePackages() { + return Streamable.of(AutoConfigurationPackages.get(this.beanFactory)); } /**