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

Use supplier-aligned type information for FactoryBean type resolution

Browse Source 
Issue: SPR-17063
This commit is contained in:
Juergen Hoeller
2018-07-19 13:14:20 +02:00
parent 0b60447c49
commit 52d124de6f
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
View File

@@ -796,6 +796,22 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
@Override
@Nullable
protected Class<?> getTypeForFactoryBean(String beanName, RootBeanDefinition mbd) {
if (mbd.getInstanceSupplier() != null) {
ResolvableType targetType = mbd.targetType;
if (targetType != null) {
Class<?> result = targetType.as(FactoryBean.class).getGeneric().resolve();
if (result != null) {
return result;
}
}
if (mbd.hasBeanClass()) {
Class<?> result = GenericTypeResolver.resolveTypeArgument(mbd.getBeanClass(), FactoryBean.class);
if (result != null) {
return result;
}
}
}
String factoryBeanName = mbd.getFactoryBeanName();
String factoryMethodName = mbd.getFactoryMethodName();