Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
9895e44d
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,体验更适合开发者的 AI 搜索 >>
提交
9895e44d
编写于
2月 05, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
643a68f8
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
15 addition
and
15 deletion
+15
-15
spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
...src/main/java/org/springframework/util/MimeTypeUtils.java
+4
-5
spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
...va/org/springframework/expression/spel/ast/InlineMap.java
+6
-6
spring-expression/src/main/java/org/springframework/expression/spel/ast/ValueRef.java
...ava/org/springframework/expression/spel/ast/ValueRef.java
+5
-4
未找到文件。
spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
浏览文件 @
9895e44d
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -31,7 +31,6 @@ import java.util.Random;
import
java.util.stream.Collectors
;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.MimeType.SpecificityComparator
;
/**
* Miscellaneous {@link MimeType} utility methods.
...
...
@@ -52,7 +51,7 @@ public abstract class MimeTypeUtils {
/**
* Comparator used by {@link #sortBySpecificity(List)}.
*/
public
static
final
Comparator
<
MimeType
>
SPECIFICITY_COMPARATOR
=
new
SpecificityComparator
<>();
public
static
final
Comparator
<
MimeType
>
SPECIFICITY_COMPARATOR
=
new
MimeType
.
SpecificityComparator
<>();
/**
* Public constant mime type that includes all media ranges (i.e. "*/*").
...
...
@@ -154,10 +153,10 @@ public abstract class MimeTypeUtils {
*/
public
static
final
String
TEXT_XML_VALUE
=
"text/xml"
;
@Nullable
private
static
volatile
Random
random
;
static
{
ALL
=
MimeType
.
valueOf
(
ALL_VALUE
);
APPLICATION_JSON
=
MimeType
.
valueOf
(
APPLICATION_JSON_VALUE
);
...
...
@@ -263,6 +262,7 @@ public abstract class MimeTypeUtils {
.
map
(
MimeTypeUtils:
:
parseMimeType
).
collect
(
Collectors
.
toList
());
}
/**
* Tokenize the given comma-separated string of {@code MimeType} objects
* into a {@code List<String>}. Unlike simple tokenization by ",", this
...
...
@@ -318,7 +318,6 @@ public abstract class MimeTypeUtils {
return
builder
.
toString
();
}
/**
* Sorts the given list of {@code MimeType} objects by specificity.
* <p>Given two mime types:
...
...
spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
浏览文件 @
9895e44d
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -47,7 +47,7 @@ public class InlineMap extends SpelNodeImpl {
/**
* If all the components of the
list
are constants, or lists/maps that themselves
* If all the components of the
map
are constants, or lists/maps that themselves
* contain constants, then a constant list can be built to represent this node.
* This will speed up later getValue calls and reduce the amount of garbage created.
*/
...
...
@@ -70,14 +70,14 @@ public class InlineMap extends SpelNodeImpl {
break
;
}
}
else
if
(!(
(
c
%
2
)==
0
&&
(
child
instanceof
PropertyOrFieldReference
)
))
{
else
if
(!(
c
%
2
==
0
&&
child
instanceof
PropertyOrFieldReference
))
{
isConstant
=
false
;
break
;
}
}
}
if
(
isConstant
)
{
Map
<
Object
,
Object
>
constantMap
=
new
LinkedHashMap
<>();
Map
<
Object
,
Object
>
constantMap
=
new
LinkedHashMap
<>();
int
childCount
=
getChildCount
();
for
(
int
c
=
0
;
c
<
childCount
;
c
++)
{
SpelNode
keyChild
=
getChild
(
c
++);
...
...
@@ -159,9 +159,9 @@ public class InlineMap extends SpelNodeImpl {
@SuppressWarnings
(
"unchecked"
)
@Nullable
public
Map
<
Object
,
Object
>
getConstantValue
()
{
public
Map
<
Object
,
Object
>
getConstantValue
()
{
Assert
.
state
(
this
.
constant
!=
null
,
"No constant"
);
return
(
Map
<
Object
,
Object
>)
this
.
constant
.
getValue
();
return
(
Map
<
Object
,
Object
>)
this
.
constant
.
getValue
();
}
}
spring-expression/src/main/java/org/springframework/expression/spel/ast/ValueRef.java
浏览文件 @
9895e44d
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -24,8 +24,8 @@ import org.springframework.lang.Nullable;
/**
* Represents a reference to a value. With a reference it is possible to get or set the
* value. Passing around value references rather than the values themselves can avoid
* incorrect duplication of operand evaluation. For example in 'list[index++]++' without
a
* value reference for 'list[index++]' it would be necessary to evaluate list[index++]
* incorrect duplication of operand evaluation. For example in 'list[index++]++' without
*
a
value reference for 'list[index++]' it would be necessary to evaluate list[index++]
* twice (once to get the value, once to determine where the value goes) and that would
* double increment index.
*
...
...
@@ -103,7 +103,8 @@ public interface ValueRef {
@Override
public
void
setValue
(
@Nullable
Object
newValue
)
{
throw
new
SpelEvaluationException
(
this
.
node
.
pos
,
SpelMessage
.
NOT_ASSIGNABLE
,
this
.
node
.
toStringAST
());
throw
new
SpelEvaluationException
(
this
.
node
.
getStartPosition
(),
SpelMessage
.
NOT_ASSIGNABLE
,
this
.
node
.
toStringAST
());
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录