Repositories now allows lookup of parent repositories for sub-types.

When inheritance is used for aggregates, lookups of the repository for a Child aggregate instance have so far failed to return a repository registered for the Parent. Client code had to consider that scenario explicitly.

This commit introduces an additional lookup step in case we cannot find a repository for an aggregate type immediately. In this case, we then check for assignability of any of the known aggregate types we have registered repositories for and the type requested. I.e. for a request for the repository of Child, a repository, explicitly registered to manage Child instances would still be used. In the sole presence of a repository managing Parent instances, that would be returned for the request for Child, too.

Original pull request: #2406.

src/main/java/org/springframework/data/repository/support/Repositories.java

@@ -39,6 +39,7 @@ import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.util.ProxyUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ConcurrentLruCache;
 
 /**
  * Wrapper class to access repository instances obtained from a {@link ListableBeanFactory}.
@@ -58,6 +59,8 @@ public class Repositories implements Iterable<Class<?>> {
 	private final Optional<BeanFactory> beanFactory;
 	private final Map<Class<?>, String> repositoryBeanNames;
 	private final Map<Class<?>, RepositoryFactoryInformation<Object, Object>> repositoryFactoryInfos;
+	private final ConcurrentLruCache<Class<?>, Class<?>> domainTypeMapping = new ConcurrentLruCache<>(64,
+			this::getRepositoryDomainTypeFor);
 
 	/**
 	 * Constructor to create the {@link #NONE} instance.
@@ -124,7 +127,7 @@ public class Repositories implements Iterable<Class<?>> {
 
 		Assert.notNull(domainClass, DOMAIN_TYPE_MUST_NOT_BE_NULL);
 
-		Class<?> userClass = ProxyUtils.getUserClass(domainClass);
+		Class<?> userClass = domainTypeMapping.get(ProxyUtils.getUserClass(domainClass));
 
 		return repositoryFactoryInfos.containsKey(userClass);
 	}
@@ -139,7 +142,7 @@ public class Repositories implements Iterable<Class<?>> {
 
 		Assert.notNull(domainClass, DOMAIN_TYPE_MUST_NOT_BE_NULL);
 
-		Class<?> userClass = ProxyUtils.getUserClass(domainClass);
+		Class<?> userClass = domainTypeMapping.get(ProxyUtils.getUserClass(domainClass));
 		Optional<String> repositoryBeanName = Optional.ofNullable(repositoryBeanNames.get(userClass));
 
 		return beanFactory.flatMap(it -> repositoryBeanName.map(it::getBean));
@@ -157,7 +160,7 @@ public class Repositories implements Iterable<Class<?>> {
 
 		Assert.notNull(domainClass, DOMAIN_TYPE_MUST_NOT_BE_NULL);
 
-		Class<?> userType = ProxyUtils.getUserClass(domainClass);
+		Class<?> userType = domainTypeMapping.get(ProxyUtils.getUserClass(domainClass));
 		RepositoryFactoryInformation<Object, Object> repositoryInfo = repositoryFactoryInfos.get(userType);
 
 		if (repositoryInfo != null) {
@@ -303,6 +306,33 @@ public class Repositories implements Iterable<Class<?>> {
 		this.repositoryBeanNames.put(type, name);
 	}
 
+	/**
+	 * Returns the repository domain type for which to look up the repository. The input can either be a repository
+	 * managed type directly. Or it can be a sub-type of a repository managed one, in which case we check the domain types
+	 * we have repositories registered for for assignability.
+	 *
+	 * @param domainType must not be {@literal null}.
+	 * @return
+	 */
+	private Class<?> getRepositoryDomainTypeFor(Class<?> domainType) {
+
+		Assert.notNull(domainType, "Domain type must not be null!");
+
+		Set<Class<?>> declaredTypes = repositoryBeanNames.keySet();
+
+		if (declaredTypes.contains(domainType)) {
+			return domainType;
+		}
+
+		for (Class<?> declaredType : declaredTypes) {
+			if (declaredType.isAssignableFrom(domainType)) {
+				return declaredType;
+			}
+		}
+
+		return domainType;
+	}
+
 	/**
 	 * Null-object to avoid nasty {@literal null} checks in cache lookups.
 	 *

src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java

@@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -206,6 +205,47 @@ class RepositoriesUnitTests {
 		});
 	}
 
+	@Test // GH-2406
+	void exposesParentRepositoryForChildIfOnlyParentRepositoryIsRegistered() {
+
+		Repositories repositories = bootstrapRepositories(ParentRepository.class);
+
+		assertRepositoryAvailableFor(repositories, Child.class, ParentRepository.class);
+	}
+
+	@Test // GH-2406
+	void usesChildRepositoryIfRegistered() {
+
+		Repositories repositories = bootstrapRepositories(ParentRepository.class, ChildRepository.class);
+
+		assertRepositoryAvailableFor(repositories, Child.class, ChildRepository.class);
+	}
+
+	private void assertRepositoryAvailableFor(Repositories repositories, Class<?> domainTypem,
+			Class<?> repositoryInterface) {
+
+		assertThat(repositories.hasRepositoryFor(domainTypem)).isTrue();
+		assertThat(repositories.getRepositoryFor(domainTypem))
+				.hasValueSatisfying(it -> assertThat(it).isInstanceOf(repositoryInterface));
+		assertThat(repositories.getRepositoryInformationFor(domainTypem))
+				.hasValueSatisfying(it -> assertThat(it.getRepositoryInterface()).isEqualTo(repositoryInterface));
+	}
+
+	private Repositories bootstrapRepositories(Class<?>... repositoryInterfaces) {
+
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+
+		for (Class<?> repositoryInterface : repositoryInterfaces) {
+			beanFactory.registerBeanDefinition(repositoryInterface.getName(),
+					getRepositoryBeanDefinition(repositoryInterface));
+		}
+
+		context = new GenericApplicationContext(beanFactory);
+		context.refresh();
+
+		return new Repositories(context);
+	}
+
 	class Person {}
 
 	class Address {}
@@ -301,4 +341,14 @@ class RepositoriesUnitTests {
 	interface PrimaryRepository extends Repository<SomeEntity, Long> {}
 
 	interface ThirdRepository extends Repository<SomeEntity, Long> {}
+
+	// GH-2406
+
+	static class Parent {}
+
+	static class Child extends Parent {}
+
+	interface ParentRepository extends Repository<Parent, Long> {}
+
+	interface ChildRepository extends Repository<Child, Long> {}
 }