Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
838855b1
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,发现更多精彩内容 >>
提交
838855b1
编写于
1月 16, 2014
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed accidental use of JDK 1.7+ Integer/Long.compare methods
Issue: SPR-11319
上级
11bc9d0a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
29 deletion
+36
-29
spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
...ework/expression/spel/support/StandardTypeComparator.java
+36
-29
未找到文件。
spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
浏览文件 @
838855b1
...
...
@@ -24,8 +24,8 @@ import org.springframework.expression.spel.SpelMessage;
import
org.springframework.util.NumberUtils
;
/**
* A simple basic
TypeComparator implementation. It supports comparison of numbers and
* types implementing Comparable.
* A simple basic
{@link TypeComparator} implementation.
*
It supports comparison of Numbers and
types implementing Comparable.
*
* @author Andy Clement
* @author Juergen Hoeller
...
...
@@ -34,15 +34,29 @@ import org.springframework.util.NumberUtils;
*/
public
class
StandardTypeComparator
implements
TypeComparator
{
@Override
public
boolean
canCompare
(
Object
left
,
Object
right
)
{
if
(
left
==
null
||
right
==
null
)
{
return
true
;
}
if
(
left
instanceof
Number
&&
right
instanceof
Number
)
{
return
true
;
}
if
(
left
instanceof
Comparable
)
{
return
true
;
}
return
false
;
}
@Override
@SuppressWarnings
(
"unchecked"
)
public
int
compare
(
Object
left
,
Object
right
)
throws
SpelEvaluationException
{
// If one is null, check if the other is
if
(
left
==
null
)
{
return
right
==
null
?
0
:
-
1
;
return
(
right
==
null
?
0
:
-
1
)
;
}
else
if
(
right
==
null
)
{
return
1
;
// left cannot be null
return
1
;
// left cannot be null at this point
}
// Basic number comparisons
...
...
@@ -55,48 +69,41 @@ public class StandardTypeComparator implements TypeComparator {
BigDecimal
rightBigDecimal
=
NumberUtils
.
convertNumberToTargetClass
(
rightNumber
,
BigDecimal
.
class
);
return
leftBigDecimal
.
compareTo
(
rightBigDecimal
);
}
if
(
leftNumber
instanceof
Double
||
rightNumber
instanceof
Double
)
{
else
if
(
leftNumber
instanceof
Double
||
rightNumber
instanceof
Double
)
{
return
Double
.
compare
(
leftNumber
.
doubleValue
(),
rightNumber
.
doubleValue
());
}
if
(
leftNumber
instanceof
Float
||
rightNumber
instanceof
Float
)
{
else
if
(
leftNumber
instanceof
Float
||
rightNumber
instanceof
Float
)
{
return
Float
.
compare
(
leftNumber
.
floatValue
(),
rightNumber
.
floatValue
());
}
if
(
leftNumber
instanceof
Long
||
rightNumber
instanceof
Long
)
{
return
Long
.
compare
(
leftNumber
.
longValue
(),
rightNumber
.
longValue
());
else
if
(
leftNumber
instanceof
Long
||
rightNumber
instanceof
Long
)
{
// Don't call Long.compare here - only available on JDK 1.7+
return
compare
(
leftNumber
.
longValue
(),
rightNumber
.
longValue
());
}
else
{
// Don't call Integer.compare here - only available on JDK 1.7+
return
compare
(
leftNumber
.
intValue
(),
rightNumber
.
intValue
());
}
return
Integer
.
compare
(
leftNumber
.
intValue
(),
rightNumber
.
intValue
());
}
try
{
if
(
left
instanceof
Comparable
)
{
return
((
Comparable
<
Object
>
)
left
).
compareTo
(
right
);
return
((
Comparable
)
left
).
compareTo
(
right
);
}
}
catch
(
ClassCastException
cce
)
{
throw
new
SpelEvaluationException
(
cce
,
SpelMessage
.
NOT_COMPARABLE
,
left
.
getClass
(),
right
.
getClass
());
}
catch
(
ClassCastException
ex
)
{
throw
new
SpelEvaluationException
(
ex
,
SpelMessage
.
NOT_COMPARABLE
,
left
.
getClass
(),
right
.
getClass
());
}
throw
new
SpelEvaluationException
(
SpelMessage
.
NOT_COMPARABLE
,
left
.
getClass
(),
right
.
getClass
());
}
@Override
public
boolean
canCompare
(
Object
left
,
Object
right
)
{
if
(
left
==
null
||
right
==
null
)
{
return
true
;
}
if
(
left
instanceof
Number
&&
right
instanceof
Number
)
{
return
true
;
}
if
(
left
instanceof
Comparable
)
{
return
true
;
}
private
static
int
compare
(
int
x
,
int
y
)
{
return
(
x
<
y
?
-
1
:
(
x
>
y
?
1
:
0
));
}
return
false
;
private
static
int
compare
(
long
x
,
long
y
)
{
return
(
x
<
y
?
-
1
:
(
x
>
y
?
1
:
0
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录