root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2017-01-16 23:08:44 +01:00
parent e59f4004eb
commit 46fc7fba8f
1 changed files with 12 additions and 4 deletions
Show Stats 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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -787,11 +787,12 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
@Override @Override
protected Class<?> getTypeForFactoryBean(String beanName, RootBeanDefinition mbd) { protected Class<?> getTypeForFactoryBean(String beanName, RootBeanDefinition mbd) {
String factoryBeanName = mbd.getFactoryBeanName(); String factoryBeanName = mbd.getFactoryBeanName();
final String factoryMethodName = mbd.getFactoryMethodName(); String factoryMethodName = mbd.getFactoryMethodName();
if (factoryBeanName != null) { if (factoryBeanName != null) {
if (factoryMethodName != null) { if (factoryMethodName != null) {
// Try to obtain the FactoryBean's object type without instantiating it at all. // Try to obtain the FactoryBean's object type from its factory method declaration
// without instantiating the containing bean at all.
BeanDefinition fbDef = getBeanDefinition(factoryBeanName); BeanDefinition fbDef = getBeanDefinition(factoryBeanName);
if (fbDef instanceof AbstractBeanDefinition) { if (fbDef instanceof AbstractBeanDefinition) {
AbstractBeanDefinition afbDef = (AbstractBeanDefinition) fbDef; AbstractBeanDefinition afbDef = (AbstractBeanDefinition) fbDef;
@ -811,6 +812,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
} }
} }
// Let's obtain a shortcut instance for an early getObjectType() call...
FactoryBean<?> fb = (mbd.isSingleton() ? FactoryBean<?> fb = (mbd.isSingleton() ?
getSingletonFactoryBeanForTypeCheck(beanName, mbd) : getSingletonFactoryBeanForTypeCheck(beanName, mbd) :
getNonSingletonFactoryBeanForTypeCheck(beanName, mbd)); getNonSingletonFactoryBeanForTypeCheck(beanName, mbd));
@ -849,12 +851,13 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
* @param factoryMethodName the name of the factory method * @param factoryMethodName the name of the factory method
* @return the common {@code FactoryBean} object type, or {@code null} if none * @return the common {@code FactoryBean} object type, or {@code null} if none
*/ */
private Class<?> getTypeForFactoryBeanFromMethod(Class<?> beanClass, String factoryMethodName) { private Class<?> getTypeForFactoryBeanFromMethod(Class<?> beanClass, final String factoryMethodName) {
class Holder { Class<?> value = null; } class Holder { Class<?> value = null; }
final Holder objectType = new Holder(); final Holder objectType = new Holder();
// CGLIB subclass methods hide generic parameters; look at the original user class. // CGLIB subclass methods hide generic parameters; look at the original user class.
Class<?> fbClass = ClassUtils.getUserClass(beanClass); Class<?> fbClass = ClassUtils.getUserClass(beanClass);
// Find the given factory method, taking into account that in the case of // Find the given factory method, taking into account that in the case of
// @Bean methods, there may be parameters present. // @Bean methods, there may be parameters present.
ReflectionUtils.doWithMethods(fbClass, ReflectionUtils.doWithMethods(fbClass,
@ -871,6 +874,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
} }
} }
}); });
return (objectType.value != null && Object.class != objectType.value ? objectType.value : null); return (objectType.value != null && Object.class != objectType.value ? objectType.value : null);
} }
@ -921,6 +925,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
(mbd.getFactoryBeanName() != null && isSingletonCurrentlyInCreation(mbd.getFactoryBeanName()))) { (mbd.getFactoryBeanName() != null && isSingletonCurrentlyInCreation(mbd.getFactoryBeanName()))) {
return null; return null;
} }
Object instance = null; Object instance = null;
try { try {
// Mark this bean as currently in creation, even if just partially. // Mark this bean as currently in creation, even if just partially.
@ -936,6 +941,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
// Finished partial creation of this bean. // Finished partial creation of this bean.
afterSingletonCreation(beanName); afterSingletonCreation(beanName);
} }
FactoryBean<?> fb = getFactoryBean(beanName, instance); FactoryBean<?> fb = getFactoryBean(beanName, instance);
if (bw != null) { if (bw != null) {
this.factoryBeanInstanceCache.put(beanName, bw); this.factoryBeanInstanceCache.put(beanName, bw);
@ -956,6 +962,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
if (isPrototypeCurrentlyInCreation(beanName)) { if (isPrototypeCurrentlyInCreation(beanName)) {
return null; return null;
} }
Object instance = null; Object instance = null;
try { try {
// Mark this bean as currently in creation, even if just partially. // Mark this bean as currently in creation, even if just partially.
@ -979,6 +986,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
// Finished partial creation of this bean. // Finished partial creation of this bean.
afterPrototypeCreation(beanName); afterPrototypeCreation(beanName);
} }
return getFactoryBean(beanName, instance); return getFactoryBean(beanName, instance);
} }