Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
7e05c928
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,发现更多精彩内容 >>
提交
7e05c928
编写于
6月 30, 2009
作者:
A
Andy Clement
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support for concatenation with String via operator '+' - for Ramnivas.
上级
a32448da
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
4 deletion
+16
-4
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
.../java/org/springframework/expression/spel/ast/OpPlus.java
+8
-0
org.springframework.expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
...ingframework/expression/spel/OperatorOverloaderTests.java
+4
-1
org.springframework.expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
...va/org/springframework/expression/spel/OperatorTests.java
+4
-3
未找到文件。
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
浏览文件 @
7e05c928
...
...
@@ -73,6 +73,14 @@ public class OpPlus extends Operator {
}
}
else
if
(
operandOne
instanceof
String
&&
operandTwo
instanceof
String
)
{
return
new
TypedValue
(
new
StringBuilder
((
String
)
operandOne
).
append
((
String
)
operandTwo
).
toString
(),
STRING_TYPE_DESCRIPTOR
);
}
else
if
(
operandOne
instanceof
String
)
{
StringBuilder
result
=
new
StringBuilder
((
String
)
operandOne
);
result
.
append
((
operandTwo
==
null
?
"null"
:
operandTwo
.
toString
()));
return
new
TypedValue
(
result
.
toString
(),
STRING_TYPE_DESCRIPTOR
);
}
else
if
(
operandTwo
instanceof
String
)
{
StringBuilder
result
=
new
StringBuilder
((
operandOne
==
null
?
"null"
:
operandOne
.
toString
()));
result
.
append
((
String
)
operandTwo
);
return
new
TypedValue
(
result
.
toString
(),
STRING_TYPE_DESCRIPTOR
);
}
return
state
.
operate
(
Operation
.
ADD
,
operandOne
,
operandTwo
);
}
...
...
org.springframework.expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
浏览文件 @
7e05c928
...
...
@@ -55,7 +55,7 @@ public class OperatorOverloaderTests extends ExpressionTestCase {
@Test
public
void
testSimpleOperations
()
throws
Exception
{
// no built in support for this:
evaluateAndCheckError
(
"'abc'
+
true"
,
SpelMessage
.
OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES
);
evaluateAndCheckError
(
"'abc'
-
true"
,
SpelMessage
.
OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES
);
StandardEvaluationContext
eContext
=
TestScenarioCreator
.
getTestEvaluationContext
();
eContext
.
setOperatorOverloader
(
new
StringAndBooleanAddition
());
...
...
@@ -65,5 +65,8 @@ public class OperatorOverloaderTests extends ExpressionTestCase {
expr
=
(
SpelExpression
)
parser
.
parseExpression
(
"'abc'-true"
);
Assert
.
assertEquals
(
"abc"
,
expr
.
getValue
(
eContext
));
expr
=
(
SpelExpression
)
parser
.
parseExpression
(
"'abc'+null"
);
Assert
.
assertEquals
(
"abcnull"
,
expr
.
getValue
(
eContext
));
}
}
org.springframework.expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
浏览文件 @
7e05c928
...
...
@@ -153,9 +153,10 @@ public class OperatorTests extends ExpressionTestCase {
evaluate
(
"3.0f + 5.0f"
,
8.0d
,
Double
.
class
);
evaluate
(
"3.0d + 5.0d"
,
8.0d
,
Double
.
class
);
evaluateAndCheckError
(
"'ab' + 2"
,
SpelMessage
.
OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES
);
evaluateAndCheckError
(
"2+'a' "
,
SpelMessage
.
OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES
);
evaluateAndCheckError
(
"2+'ab'"
,
SpelMessage
.
OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES
);
evaluate
(
"'ab' + 2"
,
"ab2"
,
String
.
class
);
evaluate
(
"2 + 'a'"
,
"2a"
,
String
.
class
);
evaluate
(
"'ab' + null"
,
"abnull"
,
String
.
class
);
evaluate
(
"null + 'ab'"
,
"nullab"
,
String
.
class
);
// AST:
SpelExpression
expr
=
(
SpelExpression
)
parser
.
parseExpression
(
"+3"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录