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

Same method filtering in ConstructorResolver and getTypeForFactoryMethod

Browse Source 
Issue: SPR-16999
This commit is contained in:
Juergen Hoeller
2018-07-03 15:53:17 +02:00
parent dcbaecea2a
commit f2787cfb35
2 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -724,19 +724,18 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
int minNrOfArgs = int minNrOfArgs =
(mbd.hasConstructorArgumentValues() ? mbd.getConstructorArgumentValues().getArgumentCount() : 0); (mbd.hasConstructorArgumentValues() ? mbd.getConstructorArgumentValues().getArgumentCount() : 0);
Method[] candidates = ReflectionUtils.getUniqueDeclaredMethods(factoryClass); Method[] candidates = ReflectionUtils.getUniqueDeclaredMethods(factoryClass);
for (Method factoryMethod : candidates) { for (Method candidate : candidates) {
if (Modifier.isStatic(factoryMethod.getModifiers()) == isStatic && if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate) &&
factoryMethod.getName().equals(mbd.getFactoryMethodName()) && candidate.getParameterCount() >= minNrOfArgs) {
factoryMethod.getParameterCount() >= minNrOfArgs) {
// Declared type variables to inspect? // Declared type variables to inspect?
if (factoryMethod.getTypeParameters().length > 0) { if (candidate.getTypeParameters().length > 0) {
try { try {
// Fully resolve parameter names and argument values. // Fully resolve parameter names and argument values.
Class<?>[] paramTypes = factoryMethod.getParameterTypes(); Class<?>[] paramTypes = candidate.getParameterTypes();
String[] paramNames = null; String[] paramNames = null;
ParameterNameDiscoverer pnd = getParameterNameDiscoverer(); ParameterNameDiscoverer pnd = getParameterNameDiscoverer();
if (pnd != null) { if (pnd != null) {
paramNames = pnd.getParameterNames(factoryMethod); paramNames = pnd.getParameterNames(candidate);
} }
ConstructorArgumentValues cav = mbd.getConstructorArgumentValues(); ConstructorArgumentValues cav = mbd.getConstructorArgumentValues();
Set<ConstructorArgumentValues.ValueHolder> usedValueHolders = new HashSet<>(paramTypes.length); Set<ConstructorArgumentValues.ValueHolder> usedValueHolders = new HashSet<>(paramTypes.length);
@@ -753,9 +752,9 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
} }
} }
Class<?> returnType = AutowireUtils.resolveReturnTypeForFactoryMethod( Class<?> returnType = AutowireUtils.resolveReturnTypeForFactoryMethod(
factoryMethod, args, getBeanClassLoader()); candidate, args, getBeanClassLoader());
uniqueCandidate = (commonType == null && returnType == factoryMethod.getReturnType() ? uniqueCandidate = (commonType == null && returnType == candidate.getReturnType() ?
factoryMethod : null); candidate : null);
commonType = ClassUtils.determineCommonAncestor(returnType, commonType); commonType = ClassUtils.determineCommonAncestor(returnType, commonType);
if (commonType == null) { if (commonType == null) {
// Ambiguous return types found: return null to indicate "not determinable". // Ambiguous return types found: return null to indicate "not determinable".
@@ -769,8 +768,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
} }
} }
else { else {
uniqueCandidate = (commonType == null ? factoryMethod : null); uniqueCandidate = (commonType == null ? candidate : null);
commonType = ClassUtils.determineCommonAncestor(factoryMethod.getReturnType(), commonType); commonType = ClassUtils.determineCommonAncestor(candidate.getReturnType(), commonType);
if (commonType == null) { if (commonType == null) {
// Ambiguous return types found: return null to indicate "not determinable". // Ambiguous return types found: return null to indicate "not determinable".
return null; return null;

27
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
View File

@@ -22,6 +22,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.junit.Before; import org.junit.Before;
@@ -809,6 +810,15 @@ public class ConfigurationClassPostProcessorTests {
assertSame(ctx.getBean(TestBean.class), bean.testBeans.get(0)); assertSame(ctx.getBean(TestBean.class), bean.testBeans.get(0));
} }
@Test
public void testMapInjectionFromSameConfigurationClass() {
ApplicationContext ctx = new AnnotationConfigApplicationContext(MapInjectionConfiguration.class);
MapInjectionConfiguration bean = ctx.getBean(MapInjectionConfiguration.class);
assertNotNull(bean.testBeans);
assertEquals(1, bean.testBeans.size());
assertSame(ctx.getBean(Runnable.class), bean.testBeans.get("testBean"));
}
@Test @Test
public void testBeanLookupFromSameConfigurationClass() { public void testBeanLookupFromSameConfigurationClass() {
ApplicationContext ctx = new AnnotationConfigApplicationContext(BeanLookupConfiguration.class); ApplicationContext ctx = new AnnotationConfigApplicationContext(BeanLookupConfiguration.class);
@@ -1566,6 +1576,23 @@ public class ConfigurationClassPostProcessorTests {
} }
} }
@Configuration
public static class MapInjectionConfiguration {
@Autowired
private Map<String, Runnable> testBeans;
@Bean
Runnable testBean() {
return () -> {};
}
// Unrelated, not to be considered as a factory method
private boolean testBean(boolean param) {
return param;
}
}
@Configuration @Configuration
static abstract class BeanLookupConfiguration { static abstract class BeanLookupConfiguration {