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

DATACMNS-1215 - Fixed repository lookup for proxy domain classes.

Browse Source 
We now consistently use the user class for repository (metadata) lookup in Repositories.
This commit is contained in:
Oliver Gierke
2017-11-17 10:12:39 +01:00
parent 39c67e3fef
commit 1e5aad94cf
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,9 @@ public class Repositories implements Iterable<Class<?>> {
Assert.notNull(domainClass, DOMAIN_TYPE_MUST_NOT_BE_NULL);
return repositoryFactoryInfos.containsKey(domainClass);
Class<?> userClass = ClassUtils.getUserClass(domainClass);
return repositoryFactoryInfos.containsKey(userClass);
}
/**
@@ -135,7 +137,9 @@ public class Repositories implements Iterable<Class<?>> {
Assert.notNull(domainClass, DOMAIN_TYPE_MUST_NOT_BE_NULL);
Optional<String> repositoryBeanName = Optional.ofNullable(repositoryBeanNames.get(domainClass));
Class<?> userClass = ClassUtils.getUserClass(domainClass);
Optional<String> repositoryBeanName = Optional.ofNullable(repositoryBeanNames.get(userClass));
return beanFactory.flatMap(it -> repositoryBeanName.map(it::getBean));
}

18
src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java
View File

@@ -29,6 +29,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -140,6 +141,23 @@ public class RepositoriesUnitTests {
.hasValueSatisfying(it -> assertThat(it.getRepositoryInterface()).isEqualTo(PersonRepository.class));
}
@Test // DATACMNS-1215
public void exposesRepositoryForProxyType() {
ProxyFactory factory = new ProxyFactory();
factory.setTarget(new Person());
factory.setProxyTargetClass(true);
Object proxy = factory.getProxy();
assertThat(ClassUtils.isCglibProxy(proxy)).isTrue();
Repositories repositories = new Repositories(context);
assertThat(repositories.hasRepositoryFor(proxy.getClass())).isTrue();
assertThat(repositories.getRepositoryFor(proxy.getClass())).isNotEmpty();
}
class Person {}
class Address {}