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

getTypeForFactoryBean suppresses instantiation failures for non-singleton FactoryBeans 

Issue: SPR-12786
This commit is contained in:
Juergen Hoeller 2015-03-06 11:52:27 +01:00
parent 0baf228db5
commit 9b25d6ad8b
2 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -897,6 +897,14 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
instance = bw.getWrappedInstance(); instance = bw.getWrappedInstance();
} }
} }
catch (BeanCreationException ex) {
// Can only happen when getting a FactoryBean.
if (logger.isDebugEnabled()) {
logger.debug("Bean creation exception on non-singleton FactoryBean type check: " + ex);
}
onSuppressedException(ex);
return null;
}
finally { finally {
// Finished partial creation of this bean. // Finished partial creation of this bean.
afterPrototypeCreation(beanName); afterPrototypeCreation(beanName);

51
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 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.
@ -1340,10 +1340,10 @@ public class DefaultListableBeanFactoryTests {
public void testDependsOnCycle() { public void testDependsOnCycle() {
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class); RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class);
bd1.setDependsOn(new String[] {"tb2"}); bd1.setDependsOn("tb2");
lbf.registerBeanDefinition("tb1", bd1); lbf.registerBeanDefinition("tb1", bd1);
RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class); RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
bd2.setDependsOn(new String[] {"tb1"}); bd2.setDependsOn("tb1");
lbf.registerBeanDefinition("tb2", bd2); lbf.registerBeanDefinition("tb2", bd2);
try { try {
lbf.preInstantiateSingletons(); lbf.preInstantiateSingletons();
@ -1361,13 +1361,13 @@ public class DefaultListableBeanFactoryTests {
public void testImplicitDependsOnCycle() { public void testImplicitDependsOnCycle() {
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class); RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class);
bd1.setDependsOn(new String[] {"tb2"}); bd1.setDependsOn("tb2");
lbf.registerBeanDefinition("tb1", bd1); lbf.registerBeanDefinition("tb1", bd1);
RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class); RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
bd2.setDependsOn(new String[] {"tb3"}); bd2.setDependsOn("tb3");
lbf.registerBeanDefinition("tb2", bd2); lbf.registerBeanDefinition("tb2", bd2);
RootBeanDefinition bd3 = new RootBeanDefinition(TestBean.class); RootBeanDefinition bd3 = new RootBeanDefinition(TestBean.class);
bd3.setDependsOn(new String[] {"tb1"}); bd3.setDependsOn("tb1");
lbf.registerBeanDefinition("tb3", bd3); lbf.registerBeanDefinition("tb3", bd3);
try { try {
lbf.preInstantiateSingletons(); lbf.preInstantiateSingletons();
@ -1540,7 +1540,7 @@ public class DefaultListableBeanFactoryTests {
} }
@Test @Test
public void testGetBeanByTypeInstanceWithPrimary() throws Exception { public void testGetBeanByTypeInstanceWithPrimary() {
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
RootBeanDefinition bd1 = createConstructorDependencyBeanDefinition(99); RootBeanDefinition bd1 = createConstructorDependencyBeanDefinition(99);
RootBeanDefinition bd2 = createConstructorDependencyBeanDefinition(43); RootBeanDefinition bd2 = createConstructorDependencyBeanDefinition(43);
@ -1553,7 +1553,7 @@ public class DefaultListableBeanFactoryTests {
} }
@Test @Test
public void testGetBeanByTypeInstanceWithMultiplePrimary() throws Exception { public void testGetBeanByTypeInstanceWithMultiplePrimary() {
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
RootBeanDefinition bd1 = createConstructorDependencyBeanDefinition(99); RootBeanDefinition bd1 = createConstructorDependencyBeanDefinition(99);
RootBeanDefinition bd2 = createConstructorDependencyBeanDefinition(43); RootBeanDefinition bd2 = createConstructorDependencyBeanDefinition(43);
@ -1584,16 +1584,35 @@ public class DefaultListableBeanFactoryTests {
try { try {
lbf.getBean(TestBean.class, 67); lbf.getBean(TestBean.class, 67);
fail("Should have thrown NoSuchBeanDefinitionException"); fail("Should have thrown NoSuchBeanDefinitionException");
} catch (NoSuchBeanDefinitionException ex) { }
catch (NoSuchBeanDefinitionException ex) {
// expected // expected
} }
} }
private RootBeanDefinition createConstructorDependencyBeanDefinition(int age) { @Test
public void testGetBeanWithArgsNotCreatedForFactoryBeanChecking() {
DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
RootBeanDefinition bd1 = new RootBeanDefinition(ConstructorDependency.class); RootBeanDefinition bd1 = new RootBeanDefinition(ConstructorDependency.class);
bd1.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); bd1.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
bd1.getConstructorArgumentValues().addGenericArgumentValue(String.valueOf(age)); lbf.registerBeanDefinition("bd1", bd1);
return bd1; RootBeanDefinition bd2 = new RootBeanDefinition(ConstructorDependencyFactoryBean.class);
bd2.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
lbf.registerBeanDefinition("bd2", bd2);
ConstructorDependency bean = lbf.getBean(ConstructorDependency.class, 42);
assertThat(bean.beanName, equalTo("bd1"));
assertThat(bean.spouseAge, equalTo(42));
assertEquals(1, lbf.getBeanNamesForType(ConstructorDependency.class).length);
assertEquals(1, lbf.getBeanNamesForType(ConstructorDependencyFactoryBean.class).length);
}
private RootBeanDefinition createConstructorDependencyBeanDefinition(int age) {
RootBeanDefinition bd = new RootBeanDefinition(ConstructorDependency.class);
bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
bd.getConstructorArgumentValues().addGenericArgumentValue(String.valueOf(age));
return bd;
} }
@Test @Test
@ -1664,8 +1683,8 @@ public class DefaultListableBeanFactoryTests {
} }
catch (UnsatisfiedDependencyException ex) { catch (UnsatisfiedDependencyException ex) {
// expected // expected
assertTrue(ex.getMessage().indexOf("test") != -1); assertTrue(ex.getMessage().contains("test"));
assertTrue(ex.getMessage().indexOf("spouse") != -1); assertTrue(ex.getMessage().contains("spouse"));
} }
} }
@ -1682,8 +1701,8 @@ public class DefaultListableBeanFactoryTests {
} }
catch (UnsatisfiedDependencyException ex) { catch (UnsatisfiedDependencyException ex) {
// expected // expected
assertTrue(ex.getMessage().indexOf("test") != -1); assertTrue(ex.getMessage().contains("test"));
assertTrue(ex.getMessage().indexOf("spouse") != -1); assertTrue(ex.getMessage().contains("spouse"));
} }
} }