DATACMNS-634 - Polishing.

Simplified type traversal in Repositories.getRepositoryFactoryInfoFor(…) and unit tests.

Original pull request: #110.
This commit is contained in:
Oliver Gierke
2015-01-20 17:46:00 +01:00
parent 9f21cc2f28
commit 2c772d60de
2 changed files with 11 additions and 12 deletions

View File

@@ -134,18 +134,19 @@ public class Repositories implements Iterable<Class<?>> {
Assert.notNull(domainClass, DOMAIN_TYPE_MUST_NOT_BE_NULL);
Class<?> classToInspect = domainClass;
RepositoryFactoryInformation<Object, Serializable> repositoryInfo = repositoryFactoryInfos
.get(ClassUtils.getUserClass(classToInspect));
Class<?> userType = ClassUtils.getUserClass(domainClass);
RepositoryFactoryInformation<Object, Serializable> repositoryInfo = repositoryFactoryInfos.get(userType);
while (repositoryInfo == null && !classToInspect.equals(Object.class)) {
classToInspect = classToInspect.getSuperclass();
repositoryInfo = repositoryFactoryInfos.get(ClassUtils.getUserClass(classToInspect));
if (repositoryInfo != null) {
return repositoryInfo;
}
return repositoryInfo == null ? EMPTY_REPOSITORY_FACTORY_INFO : repositoryInfo;
}
if (!userType.equals(Object.class)) {
return getRepositoryFactoryInfoFor(userType.getSuperclass());
}
return EMPTY_REPOSITORY_FACTORY_INFO;
}
/**
* Returns the {@link EntityInformation} for the given domain class.