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

Add RootBeanDefinition constructor that accepts a ResolvableType 

Add a new convenience constructor to `RootBeanDefinition` that allow
it to be created with a `ResolvableType`.

Closes gh-28418
This commit is contained in:
Phillip Webb 2022-04-13 17:09:17 -07:00
parent 4b82546b97
commit d31eb4c0f1
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 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.
@ -125,8 +125,7 @@ public final class BeanDefinitionBuilder {
* @since 5.3.9 * @since 5.3.9
*/ */
public static <T> BeanDefinitionBuilder rootBeanDefinition(ResolvableType beanType, Supplier<T> instanceSupplier) { public static <T> BeanDefinitionBuilder rootBeanDefinition(ResolvableType beanType, Supplier<T> instanceSupplier) {
RootBeanDefinition beanDefinition = new RootBeanDefinition(); RootBeanDefinition beanDefinition = new RootBeanDefinition(beanType);
beanDefinition.setTargetType(beanType);
beanDefinition.setInstanceSupplier(instanceSupplier); beanDefinition.setInstanceSupplier(instanceSupplier);
return new BeanDefinitionBuilder(beanDefinition); return new BeanDefinitionBuilder(beanDefinition);
} }

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

@ -139,7 +139,6 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
* @see #setPropertyValues * @see #setPropertyValues
*/ */
public RootBeanDefinition() { public RootBeanDefinition() {
super();
} }
/** /**
@ -148,10 +147,18 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
* @see #setBeanClass * @see #setBeanClass
*/ */
public RootBeanDefinition(@Nullable Class<?> beanClass) { public RootBeanDefinition(@Nullable Class<?> beanClass) {
super();
setBeanClass(beanClass); setBeanClass(beanClass);
} }
/**
* Create a new RootBeanDefinition for a singleton.
* @param beanType the type of bean to instantiate
* @see #setTargetType(ResolvableType)
*/
public RootBeanDefinition(@Nullable ResolvableType beanType) {
setTargetType(beanType);
}
/** /**
* Create a new RootBeanDefinition for a singleton bean, constructing each instance * Create a new RootBeanDefinition for a singleton bean, constructing each instance
* through calling the given supplier (possibly a lambda or method reference). * through calling the given supplier (possibly a lambda or method reference).
@ -193,7 +200,6 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
* (not applicable to autowiring a constructor, thus ignored there) * (not applicable to autowiring a constructor, thus ignored there)
*/ */
public RootBeanDefinition(@Nullable Class<?> beanClass, int autowireMode, boolean dependencyCheck) { public RootBeanDefinition(@Nullable Class<?> beanClass, int autowireMode, boolean dependencyCheck) {
super();
setBeanClass(beanClass); setBeanClass(beanClass);
setAutowireMode(autowireMode); setAutowireMode(autowireMode);
if (dependencyCheck && getResolvedAutowireMode() != AUTOWIRE_CONSTRUCTOR) { if (dependencyCheck && getResolvedAutowireMode() != AUTOWIRE_CONSTRUCTOR) {