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

DATACMNS-867 - Re-introduced CdiRepositoryBean.getDependencyInstance(…) with explicit type.

Browse Source
This commit is contained in:
Oliver Gierke
2016-10-11 15:53:07 +02:00
parent 8d22b3ae7c
commit 90683ed68a
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java
View File

@@ -142,13 +142,28 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
* Returns an instance of an the given {@link Bean}.
*
* @param bean the {@link Bean} about to create an instance for.
* @param type the expected type of the component instance created for that {@link Bean}.
* @return the actual component instance.
* @see Bean#getTypes()
*/
protected <S> S getDependencyInstance(Bean<S> bean) {
return getDependencyInstance(bean, bean.getBeanClass());
}
/**
* Returns an instance of an the given {@link Bean} and allows to be specific about the type that is about to be
* created.
*
* @param bean the {@link Bean} about to create an instance for.
* @param type the expected type of the component instance created for that {@link Bean}. We need to hand this
* parameter explicitly as the {@link Bean} might carry multiple types but the primary one might not be the
* first, i.e. the one returned by {@link Bean#getBeanClass()}.
* @return the actual component instance.
* @see Bean#getTypes()
*/
@SuppressWarnings("unchecked")
protected <S> S getDependencyInstance(Bean<S> bean) {
protected <S> S getDependencyInstance(Bean<S> bean, Class<?> type) {
CreationalContext<S> creationalContext = beanManager.createCreationalContext(bean);
return (S) beanManager.getReference(bean, bean.getBeanClass(), creationalContext);
return (S) beanManager.getReference(bean, type, creationalContext);
}
/**