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

DATAJPA-593 - Improved detection of custom implementations for CDI repositories.

Browse Source 
Adapted to API changes in CDI extension.

Related ticket: DATACMNS-565.
This commit is contained in:
Mark Paluch
2014-08-20 21:40:09 +02:00
committed by Oliver Gierke
parent ebb2be942a
commit 9dbb1d1390
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java
View File

@@ -25,6 +25,7 @@ import javax.persistence.EntityManager;
import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
import org.springframework.data.repository.cdi.CdiRepositoryBean;
import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
import org.springframework.util.Assert;
/**
@@ -46,12 +47,12 @@ class JpaRepositoryBean<T> extends CdiRepositoryBean<T> {
* @param entityManagerBean must not be {@literal null}.
* @param qualifiers must not be {@literal null}.
* @param repositoryType must not be {@literal null}.
* @param customImplementationBean can be {@literal null}.
* @param detector can be {@literal null}.
*/
JpaRepositoryBean(BeanManager beanManager, Bean<EntityManager> entityManagerBean, Set<Annotation> qualifiers,
Class<T> repositoryType, Bean<?> customImplementationBean) {
Class<T> repositoryType, CustomRepositoryImplementationDetector detector) {
super(qualifiers, repositoryType, beanManager, customImplementationBean);
super(qualifiers, repositoryType, beanManager, detector);
Assert.notNull(entityManagerBean);
this.entityManagerBean = entityManagerBean;

4
src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
View File

@@ -119,10 +119,8 @@ public class JpaRepositoryExtension extends CdiRepositoryExtensionSupport {
EntityManager.class.getName(), qualifiers));
}
Bean<?> customImplementationBean = getCustomImplementationBean(repositoryType, beanManager, qualifiers);
// Construct and return the repository bean.
return new JpaRepositoryBean<T>(beanManager, entityManagerBean, qualifiers, repositoryType,
customImplementationBean);
getCustomImplementationDetector());
}
}