Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider primary repository definition in Repositories when created Repositories using ApplicationContext.

Browse Source 
Closes #1583.
Original pull request: #465.
This commit is contained in:
Mark Paluch
2021-02-15 15:57:30 +01:00
parent 7480fcf18a
commit 5d90fb9e6a
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/springframework/data/repository/support/Repositories.java
View File

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.repository.core.EntityInformation;
@@ -276,10 +277,20 @@ public class Repositories implements Iterable<Class<?>> {
if (repositoryBeanNames.containsKey(type)) {
Boolean presentAndPrimary = beanFactory //
.filter(ConfigurableListableBeanFactory.class::isInstance) //
.map(ConfigurableListableBeanFactory.class::cast) //
.map(it -> it.getBeanDefinition(name)) //
Optional<ConfigurableListableBeanFactory> factoryToUse = this.beanFactory.map(it -> {
if (it instanceof ConfigurableListableBeanFactory) {
return (ConfigurableListableBeanFactory) it;
}
if (it instanceof ConfigurableApplicationContext) {
return ((ConfigurableApplicationContext) it).getBeanFactory();
}
return null;
});
Boolean presentAndPrimary = factoryToUse.map(it -> it.getBeanDefinition(name)) //
.map(BeanDefinition::isPrimary) //
.orElse(false);