Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
7646895f
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
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,发现更多精彩内容 >>
提交
7646895f
编写于
11月 13, 2019
作者:
S
Sébastien Deleuze
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support Kotlin synthetic classes in MethodParameter and SpEL
Closes gh-23812
上级
f2b3953d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
49 addition
and
7 deletion
+49
-7
spring-core/src/main/java/org/springframework/core/MethodParameter.java
...c/main/java/org/springframework/core/MethodParameter.java
+17
-7
spring-expression/spring-expression.gradle
spring-expression/spring-expression.gradle
+4
-0
spring-expression/src/test/kotlin/org/springframework/expression/spel/KotlinSpelReproTests.kt
...g/springframework/expression/spel/KotlinSpelReproTests.kt
+28
-0
未找到文件。
spring-core/src/main/java/org/springframework/core/MethodParameter.java
浏览文件 @
7646895f
...
...
@@ -908,9 +908,14 @@ public class MethodParameter {
* functions via Kotlin reflection.
*/
static
private
Type
getGenericReturnType
(
Method
method
)
{
KFunction
<?>
function
=
ReflectJvmMapping
.
getKotlinFunction
(
method
);
if
(
function
!=
null
&&
function
.
isSuspend
())
{
return
ReflectJvmMapping
.
getJavaType
(
function
.
getReturnType
());
try
{
KFunction
<?>
function
=
ReflectJvmMapping
.
getKotlinFunction
(
method
);
if
(
function
!=
null
&&
function
.
isSuspend
())
{
return
ReflectJvmMapping
.
getJavaType
(
function
.
getReturnType
());
}
}
catch
(
UnsupportedOperationException
ex
)
{
// probably a synthetic class - let's use java reflection instead
}
return
method
.
getGenericReturnType
();
}
...
...
@@ -920,10 +925,15 @@ public class MethodParameter {
* functions via Kotlin reflection.
*/
static
private
Class
<?>
getReturnType
(
Method
method
)
{
KFunction
<?>
function
=
ReflectJvmMapping
.
getKotlinFunction
(
method
);
if
(
function
!=
null
&&
function
.
isSuspend
())
{
Type
paramType
=
ReflectJvmMapping
.
getJavaType
(
function
.
getReturnType
());
return
ResolvableType
.
forType
(
paramType
).
resolve
(
method
.
getReturnType
());
try
{
KFunction
<?>
function
=
ReflectJvmMapping
.
getKotlinFunction
(
method
);
if
(
function
!=
null
&&
function
.
isSuspend
())
{
Type
paramType
=
ReflectJvmMapping
.
getJavaType
(
function
.
getReturnType
());
return
ResolvableType
.
forType
(
paramType
).
resolve
(
method
.
getReturnType
());
}
}
catch
(
UnsupportedOperationException
ex
)
{
// probably a synthetic class - let's use java reflection instead
}
return
method
.
getReturnType
();
}
...
...
spring-expression/spring-expression.gradle
浏览文件 @
7646895f
description
=
"Spring Expression Language (SpEL)"
apply
plugin:
"kotlin"
dependencies
{
compile
(
project
(
":spring-core"
))
testCompile
(
"org.jetbrains.kotlin:kotlin-reflect"
)
testCompile
(
"org.jetbrains.kotlin:kotlin-stdlib"
)
}
spring-expression/src/test/kotlin/org/springframework/expression/spel/KotlinSpelReproTests.kt
0 → 100644
浏览文件 @
7646895f
package
org.springframework.expression.spel
import
org.assertj.core.api.Assertions.assertThat
import
org.junit.jupiter.api.Test
import
org.springframework.expression.ExpressionParser
import
org.springframework.expression.spel.standard.SpelExpressionParser
class
KotlinSpelReproTests
{
private
val
parser
:
ExpressionParser
=
SpelExpressionParser
()
private
val
context
=
TestScenarioCreator
.
getTestEvaluationContext
()
@Test
fun
`gh-23812
SpEL
cannot
invoke
Kotlin
synthetic
classes`
()
{
val
expr
=
parser
.
parseExpression
(
"new org.springframework.expression.spel.KotlinSpelReproTests\$Config().kotlinSupplier().invoke()"
)
assertThat
(
expr
.
getValue
(
context
)).
isEqualTo
(
"test"
)
}
class
Config
{
fun
kotlinSupplier
():
()
->
String
{
return
{
"test"
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录