Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
带水的鱼儿
spring-framework
提交
a90ed957
S
spring-framework
项目概览
带水的鱼儿
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a90ed957
编写于
7月 12, 2021
作者:
S
Stephane Nicoll
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support ResolvableType in BeanDefinitionBuilder
Closes gh-27160
上级
171b283e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
48 addition
and
1 deletion
+48
-1
spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
...ramework/beans/factory/support/BeanDefinitionBuilder.java
+26
-1
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
...ork/beans/factory/support/BeanDefinitionBuilderTests.java
+22
-0
未找到文件。
spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
浏览文件 @
a90ed957
...
...
@@ -21,6 +21,7 @@ import java.util.function.Supplier;
import
org.springframework.beans.factory.config.AutowiredPropertyMarker
;
import
org.springframework.beans.factory.config.BeanDefinitionCustomizer
;
import
org.springframework.beans.factory.config.RuntimeBeanReference
;
import
org.springframework.core.ResolvableType
;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.ObjectUtils
;
...
...
@@ -102,7 +103,7 @@ public final class BeanDefinitionBuilder {
* @param beanClass the {@code Class} of the bean that the definition is being created for
*/
public
static
BeanDefinitionBuilder
rootBeanDefinition
(
Class
<?>
beanClass
)
{
return
rootBeanDefinition
(
beanClass
,
null
);
return
rootBeanDefinition
(
beanClass
,
(
String
)
null
);
}
/**
...
...
@@ -117,6 +118,30 @@ public final class BeanDefinitionBuilder {
return
builder
;
}
/**
* Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}.
* @param beanType the {@link ResolvableType type} of the bean that the definition is being created for
* @param instanceSupplier a callback for creating an instance of the bean
* @since 5.3.9
*/
public
static
<
T
>
BeanDefinitionBuilder
rootBeanDefinition
(
ResolvableType
beanType
,
Supplier
<
T
>
instanceSupplier
)
{
RootBeanDefinition
beanDefinition
=
new
RootBeanDefinition
();
beanDefinition
.
setTargetType
(
beanType
);
beanDefinition
.
setInstanceSupplier
(
instanceSupplier
);
return
new
BeanDefinitionBuilder
(
beanDefinition
);
}
/**
* Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}.
* @param beanClass the {@code Class} of the bean that the definition is being created for
* @param instanceSupplier a callback for creating an instance of the bean
* @since 5.3.9
* @see #rootBeanDefinition(ResolvableType, Supplier)
*/
public
static
<
T
>
BeanDefinitionBuilder
rootBeanDefinition
(
Class
<
T
>
beanClass
,
Supplier
<
T
>
instanceSupplier
)
{
return
rootBeanDefinition
(
ResolvableType
.
forClass
(
beanClass
),
instanceSupplier
);
}
/**
* Create a new {@code BeanDefinitionBuilder} used to construct a {@link ChildBeanDefinition}.
* @param parentName the name of the parent bean
...
...
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
浏览文件 @
a90ed957
...
...
@@ -17,11 +17,13 @@
package
org.springframework.beans.factory.support
;
import
java.util.Arrays
;
import
java.util.function.Function
;
import
org.junit.jupiter.api.Test
;
import
org.springframework.beans.factory.config.BeanDefinition
;
import
org.springframework.beans.testfixture.beans.TestBean
;
import
org.springframework.core.ResolvableType
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
...
@@ -75,6 +77,26 @@ class BeanDefinitionBuilderTests {
assertThat
(
rbd
.
getFactoryMethodName
()).
isEqualTo
(
"create"
);
}
@Test
void
builderWithResolvableTypeAndInstanceSupplier
()
{
ResolvableType
type
=
ResolvableType
.
forClassWithGenerics
(
Function
.
class
,
Integer
.
class
,
String
.
class
);
Function
<
Integer
,
String
>
function
=
i
->
"value "
+
i
;
RootBeanDefinition
rbd
=
(
RootBeanDefinition
)
BeanDefinitionBuilder
.
rootBeanDefinition
(
type
,
()
->
function
).
getBeanDefinition
();
assertThat
(
rbd
.
getResolvableType
()).
isEqualTo
(
type
);
assertThat
(
rbd
.
getInstanceSupplier
()).
isNotNull
();
assertThat
(
rbd
.
getInstanceSupplier
().
get
()).
isInstanceOf
(
Function
.
class
);
}
@Test
void
builderWithBeanClassAndInstanceSupplier
()
{
RootBeanDefinition
rbd
=
(
RootBeanDefinition
)
BeanDefinitionBuilder
.
rootBeanDefinition
(
String
.
class
,
()
->
"test"
).
getBeanDefinition
();
assertThat
(
rbd
.
getResolvableType
().
resolve
()).
isEqualTo
(
String
.
class
);
assertThat
(
rbd
.
getInstanceSupplier
()).
isNotNull
();
assertThat
(
rbd
.
getInstanceSupplier
().
get
()).
isEqualTo
(
"test"
);
}
@Test
void
builderWithAutowireMode
()
{
assertThat
(
BeanDefinitionBuilder
.
rootBeanDefinition
(
TestBean
.
class
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录