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

DATACMNS-1448 - Repositories now favors primary repositories.

Browse Source 
If multiple repositories pointing to a single domain type are found we now favor the one registered as primary bean definition. This allows allows reliable disambiguation on which repository is supposed to be used for generic repository interactions.

Related tickets: DATAREST-923.
This commit is contained in:
Oliver Drotbohm
2018-12-12 22:27:50 +01:00
parent 97390a1eef
commit d8705c1cca
2 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,8 @@ import java.util.Set;
import org.springframework.beans.factory.BeanFactory;
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.data.mapping.PersistentEntity;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.repository.core.EntityInformation;
@@ -91,7 +93,7 @@ public class Repositories implements Iterable<Class<?>> {
}
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@SuppressWarnings("rawtypes")
private synchronized void cacheRepositoryFactory(String name) {
RepositoryFactoryInformation repositoryFactoryInformation = beanFactory.get().getBean(name,
@@ -101,15 +103,13 @@ public class Repositories implements Iterable<Class<?>> {
RepositoryInformation information = repositoryFactoryInformation.getRepositoryInformation();
Set<Class<?>> alternativeDomainTypes = information.getAlternativeDomainTypes();
String beanName = BeanFactoryUtils.transformedBeanName(name);
Set<Class<?>> typesToRegister = new HashSet<>(alternativeDomainTypes.size() + 1);
typesToRegister.add(domainType);
typesToRegister.addAll(alternativeDomainTypes);
for (Class<?> type : typesToRegister) {
this.repositoryFactoryInfos.put(type, repositoryFactoryInformation);
this.repositoryBeanNames.put(type, beanName);
cacheFirstOrPrimary(type, repositoryFactoryInformation, BeanFactoryUtils.transformedBeanName(name));
}
}
@@ -263,6 +263,35 @@ public class Repositories implements Iterable<Class<?>> {
return repositoryFactoryInfos.keySet().iterator();
}
/**
* Caches the repository information for the given domain type or overrides existing information in case the bean name
* points to a primary bean definition.
*
* @param type must not be {@literal null}.
* @param information must not be {@literal null}.
* @param name must not be {@literal null}.
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
private void cacheFirstOrPrimary(Class<?> type, RepositoryFactoryInformation information, String name) {
if (repositoryBeanNames.containsKey(type)) {
Boolean presentAndPrimary = beanFactory //
.filter(ConfigurableListableBeanFactory.class::isInstance) //
.map(ConfigurableListableBeanFactory.class::cast) //
.map(it -> it.getBeanDefinition(name)) //
.map(BeanDefinition::isPrimary) //
.orElse(false);
if (!presentAndPrimary) {
return;
}
}
this.repositoryFactoryInfos.put(type, information);
this.repositoryBeanNames.put(type, name);
}
/**
* Null-object to avoid nasty {@literal null} checks in cache lookups.
*