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

Defensive handling of exceptions during factory method type checking

Browse Source 
Also using ClassUtils.forName in AutowireUtils now in order to accept all common class name formats.

Issue: SPR-11034
(cherry picked from commit 8c1767e)
This commit is contained in:
Juergen Hoeller
2013-10-28 13:25:45 +01:00
parent 094ff8883d
commit c8e8d6cd49
3 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -643,32 +643,39 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
factoryMethod.getParameterTypes().length >= minNrOfArgs) { factoryMethod.getParameterTypes().length >= minNrOfArgs) {
// No declared type variables to inspect, so just process the standard return type. // No declared type variables to inspect, so just process the standard return type.
if (factoryMethod.getTypeParameters().length > 0) { if (factoryMethod.getTypeParameters().length > 0) {
// Fully resolve parameter names and argument values. try {
Class<?>[] paramTypes = factoryMethod.getParameterTypes(); // Fully resolve parameter names and argument values.
String[] paramNames = null; Class<?>[] paramTypes = factoryMethod.getParameterTypes();
ParameterNameDiscoverer pnd = getParameterNameDiscoverer(); String[] paramNames = null;
if (pnd != null) { ParameterNameDiscoverer pnd = getParameterNameDiscoverer();
paramNames = pnd.getParameterNames(factoryMethod); if (pnd != null) {
} paramNames = pnd.getParameterNames(factoryMethod);
ConstructorArgumentValues cav = mbd.getConstructorArgumentValues();
Set<ConstructorArgumentValues.ValueHolder> usedValueHolders =
new HashSet<ConstructorArgumentValues.ValueHolder>(paramTypes.length);
Object[] args = new Object[paramTypes.length];
for (int i = 0; i < args.length; i++) {
ConstructorArgumentValues.ValueHolder valueHolder = cav.getArgumentValue(
i, paramTypes[i], (paramNames != null ? paramNames[i] : null), usedValueHolders);
if (valueHolder == null) {
valueHolder = cav.getGenericArgumentValue(null, null, usedValueHolders);
} }
if (valueHolder != null) { ConstructorArgumentValues cav = mbd.getConstructorArgumentValues();
args[i] = valueHolder.getValue(); Set<ConstructorArgumentValues.ValueHolder> usedValueHolders =
usedValueHolders.add(valueHolder); new HashSet<ConstructorArgumentValues.ValueHolder>(paramTypes.length);
Object[] args = new Object[paramTypes.length];
for (int i = 0; i < args.length; i++) {
ConstructorArgumentValues.ValueHolder valueHolder = cav.getArgumentValue(
i, paramTypes[i], (paramNames != null ? paramNames[i] : null), usedValueHolders);
if (valueHolder == null) {
valueHolder = cav.getGenericArgumentValue(null, null, usedValueHolders);
}
if (valueHolder != null) {
args[i] = valueHolder.getValue();
usedValueHolders.add(valueHolder);
}
}
Class<?> returnType = AutowireUtils.resolveReturnTypeForFactoryMethod(
factoryMethod, args, getBeanClassLoader());
if (returnType != null) {
returnTypes.add(returnType);
} }
} }
Class<?> returnType = AutowireUtils.resolveReturnTypeForFactoryMethod( catch (Throwable ex) {
factoryMethod, args, getBeanClassLoader()); if (logger.isDebugEnabled()) {
if (returnType != null) { logger.debug("Failed to resolve generic return type for factory method: " + ex);
returnTypes.add(returnType); }
} }
} }
else { else {

9
spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
View File

@@ -221,7 +221,8 @@ abstract class AutowireUtils {
return typedValue.resolveTargetType(classLoader); return typedValue.resolveTargetType(classLoader);
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
throw new IllegalStateException("Failed to resolve typed value", ex); throw new IllegalStateException("Failed to resolve value type [" +
typedValue.getTargetTypeName() + "] for factory method argument", ex);
} }
} }
// Only consider argument type if it is a simple value... // Only consider argument type if it is a simple value...
@@ -252,11 +253,11 @@ abstract class AutowireUtils {
} }
if (className != null) { if (className != null) {
try { try {
return classLoader.loadClass(className); return ClassUtils.forName(className, classLoader);
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
throw new IllegalStateException( throw new IllegalStateException("Could not resolve class name [" + arg +
"Could not resolve specified class name argument [" + arg + "]", ex); "] for factory method argument", ex);
} }
} }
// Consider adding logic to determine the class of the typeArg, if possible. // Consider adding logic to determine the class of the typeArg, if possible.

20
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
View File

@@ -660,8 +660,7 @@ public class BeanFactoryGenericsTests {
* public static <T> T mock(Class<T> classToMock) * public static <T> T mock(Class<T> classToMock)
* } * }
* </pre> * </pre>
* <p> * <p>See SPR-9493
* See SPR-9493
*/ */
@Test @Test
public void parameterizedStaticFactoryMethod() { public void parameterizedStaticFactoryMethod() {
@@ -736,6 +735,23 @@ public class BeanFactoryGenericsTests {
assertEquals(1, beans.size()); assertEquals(1, beans.size());
} }
@Test
public void parameterizedInstanceFactoryMethodWithInvalidClassName() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
bf.registerBeanDefinition("mocksControl", rbd);
rbd = new RootBeanDefinition();
rbd.setFactoryBeanName("mocksControl");
rbd.setFactoryMethodName("createMock");
rbd.getConstructorArgumentValues().addGenericArgumentValue("x");
bf.registerBeanDefinition("mock", rbd);
Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
assertEquals(0, beans.size());
}
@Test @Test
public void parameterizedInstanceFactoryMethodWithIndexedArgument() { public void parameterizedInstanceFactoryMethodWithIndexedArgument() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); DefaultListableBeanFactory bf = new DefaultListableBeanFactory();