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

RootBeanDefinition publicly exposes target type as ResolvableType

Browse Source 
Issue: SPR-17028
This commit is contained in:
Juergen Hoeller
2018-07-10 19:28:12 +02:00
parent a1d209726c
commit 3a4b5c2ade
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
View File

@@ -322,6 +322,19 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
return (targetType != null ? targetType.resolve() : null);
}
/**
* Return a {@link ResolvableType} for this bean definition,
* either from runtime-cached type information or from configuration-time
* {@link #setTargetType(ResolvableType)} or {@link #setBeanClass(Class)}.
* @since 5.1
* @see #getTargetType()
* @see #getBeanClass()
*/
public ResolvableType getResolvableType() {
ResolvableType targetType = this.targetType;
return (targetType != null ? targetType : ResolvableType.forClass(getBeanClass()));
}
/**
* Specify a factory method name that refers to a non-overloaded method.
*/

7
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
View File

@@ -2363,6 +2363,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
GenericInterface1Impl bean1 = (GenericInterface1Impl) bf.getBean("bean1");
GenericInterface2Impl bean2 = (GenericInterface2Impl) bf.getBean("bean2");
assertSame(bean2, bean1.gi2);
assertEquals(ResolvableType.forClass(GenericInterface1Impl.class), bd.getResolvableType());
}
@Test
@@ -2381,6 +2382,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
GenericInterface1Impl bean1 = (GenericInterface1Impl) bf.getBean("bean1");
GenericInterface2Impl bean2 = (GenericInterface2Impl) bf.getBean("bean2");
assertSame(bean2, bean1.gi2);
assertEquals(ResolvableType.forClass(GenericInterface1Impl.class), bd.getResolvableType());
}
@Test
@@ -2401,7 +2403,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
GenericInterface1Impl bean1 = (GenericInterface1Impl) bf.getBean("bean1");
GenericInterface2Impl bean2 = (GenericInterface2Impl) bf.getBean("bean2");
assertSame(bean2, bean1.gi2);
assertArrayEquals(new String[] {"bean1"}, bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(GenericInterface1.class, String.class)));
assertArrayEquals(new String[] {"bean2"}, bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(GenericInterface2.class, String.class)));
}
@@ -2428,7 +2429,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
}
@Test
public void testGenericsBasedInjectionWithBeanDefinitionTargetResolvableType() throws Exception {
public void testGenericsBasedInjectionWithBeanDefinitionTargetResolvableType() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
bf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
@@ -2443,6 +2444,8 @@ public class AutowiredAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("bean3", new RootBeanDefinition(MultiGenericFieldInjection.class));
assertEquals("bean1 a bean2 123", bf.getBean("bean3").toString());
assertEquals(ResolvableType.forClassWithGenerics(GenericInterface2Bean.class, String.class), bd1.getResolvableType());
assertEquals(ResolvableType.forClassWithGenerics(GenericInterface2Bean.class, Integer.class), bd2.getResolvableType());
}
@Test