Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
274eab7c
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 搜索 >>
提交
274eab7c
编写于
8月 21, 2019
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '5.1.x'
上级
78abc274
a7bb5ca4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
23 deletion
+26
-23
spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
.../java/org/springframework/mock/web/HeaderValueHolder.java
+4
-1
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
.../org/springframework/mock/web/MockHttpServletRequest.java
+5
-5
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
...org/springframework/mock/web/MockHttpServletResponse.java
+6
-6
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
...springframework/mock/web/test/MockHttpServletRequest.java
+5
-5
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
...pringframework/mock/web/test/MockHttpServletResponse.java
+6
-6
未找到文件。
spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
浏览文件 @
274eab7c
/*
* 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.
...
...
@@ -91,8 +91,11 @@ class HeaderValueHolder {
* @param headers the Map of header names to HeaderValueHolders
* @param name the name of the desired header
* @return the corresponding HeaderValueHolder, or {@code null} if none found
* @deprecated as of 5.1.10 in favor of using
* {@link org.springframework.util.LinkedCaseInsensitiveMap}.
*/
@Nullable
@Deprecated
public
static
HeaderValueHolder
getByName
(
Map
<
String
,
HeaderValueHolder
>
headers
,
String
name
)
{
Assert
.
notNull
(
name
,
"Header name must not be null"
);
for
(
Map
.
Entry
<
String
,
HeaderValueHolder
>
entry
:
headers
.
entrySet
())
{
...
...
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
浏览文件 @
274eab7c
...
...
@@ -1038,7 +1038,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
}
private
void
doAddHeaderValue
(
String
name
,
@Nullable
Object
value
,
boolean
replace
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
Assert
.
notNull
(
value
,
"Header value must not be null"
);
if
(
header
==
null
||
replace
)
{
header
=
new
HeaderValueHolder
();
...
...
@@ -1078,7 +1078,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
*/
@Override
public
long
getDateHeader
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
Object
value
=
(
header
!=
null
?
header
.
getValue
()
:
null
);
if
(
value
instanceof
Date
)
{
return
((
Date
)
value
).
getTime
();
...
...
@@ -1115,13 +1115,13 @@ public class MockHttpServletRequest implements HttpServletRequest {
@Override
@Nullable
public
String
getHeader
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
return
(
header
!=
null
?
header
.
getStringValue
()
:
null
);
}
@Override
public
Enumeration
<
String
>
getHeaders
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
return
Collections
.
enumeration
(
header
!=
null
?
header
.
getStringValues
()
:
new
LinkedList
<>());
}
...
...
@@ -1132,7 +1132,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
@Override
public
int
getIntHeader
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
Object
value
=
(
header
!=
null
?
header
.
getValue
()
:
null
);
if
(
value
instanceof
Number
)
{
return
((
Number
)
value
).
intValue
();
...
...
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
浏览文件 @
274eab7c
...
...
@@ -409,7 +409,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
@Override
public
boolean
containsHeader
(
String
name
)
{
return
(
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
)
!=
null
);
return
(
this
.
headers
.
get
(
name
)
!=
null
);
}
/**
...
...
@@ -434,7 +434,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
@Override
@Nullable
public
String
getHeader
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
return
(
header
!=
null
?
header
.
getStringValue
()
:
null
);
}
...
...
@@ -448,7 +448,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
*/
@Override
public
List
<
String
>
getHeaders
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
if
(
header
!=
null
)
{
return
header
.
getStringValues
();
}
...
...
@@ -465,7 +465,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
*/
@Nullable
public
Object
getHeaderValue
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
return
(
header
!=
null
?
header
.
getValue
()
:
null
);
}
...
...
@@ -475,7 +475,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
* @return the associated header values, or an empty List if none
*/
public
List
<
Object
>
getHeaderValues
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
if
(
header
!=
null
)
{
return
header
.
getValues
();
}
...
...
@@ -643,7 +643,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
private
void
doAddHeaderValue
(
String
name
,
Object
value
,
boolean
replace
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
Assert
.
notNull
(
value
,
"Header value must not be null"
);
if
(
header
==
null
)
{
header
=
new
HeaderValueHolder
();
...
...
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
浏览文件 @
274eab7c
...
...
@@ -1038,7 +1038,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
}
private
void
doAddHeaderValue
(
String
name
,
@Nullable
Object
value
,
boolean
replace
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
Assert
.
notNull
(
value
,
"Header value must not be null"
);
if
(
header
==
null
||
replace
)
{
header
=
new
HeaderValueHolder
();
...
...
@@ -1078,7 +1078,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
*/
@Override
public
long
getDateHeader
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
Object
value
=
(
header
!=
null
?
header
.
getValue
()
:
null
);
if
(
value
instanceof
Date
)
{
return
((
Date
)
value
).
getTime
();
...
...
@@ -1115,13 +1115,13 @@ public class MockHttpServletRequest implements HttpServletRequest {
@Override
@Nullable
public
String
getHeader
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
return
(
header
!=
null
?
header
.
getStringValue
()
:
null
);
}
@Override
public
Enumeration
<
String
>
getHeaders
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
return
Collections
.
enumeration
(
header
!=
null
?
header
.
getStringValues
()
:
new
LinkedList
<>());
}
...
...
@@ -1132,7 +1132,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
@Override
public
int
getIntHeader
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
Object
value
=
(
header
!=
null
?
header
.
getValue
()
:
null
);
if
(
value
instanceof
Number
)
{
return
((
Number
)
value
).
intValue
();
...
...
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
浏览文件 @
274eab7c
...
...
@@ -409,7 +409,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
@Override
public
boolean
containsHeader
(
String
name
)
{
return
(
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
)
!=
null
);
return
(
this
.
headers
.
get
(
name
)
!=
null
);
}
/**
...
...
@@ -434,7 +434,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
@Override
@Nullable
public
String
getHeader
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
return
(
header
!=
null
?
header
.
getStringValue
()
:
null
);
}
...
...
@@ -448,7 +448,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
*/
@Override
public
List
<
String
>
getHeaders
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
if
(
header
!=
null
)
{
return
header
.
getStringValues
();
}
...
...
@@ -465,7 +465,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
*/
@Nullable
public
Object
getHeaderValue
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
return
(
header
!=
null
?
header
.
getValue
()
:
null
);
}
...
...
@@ -475,7 +475,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
* @return the associated header values, or an empty List if none
*/
public
List
<
Object
>
getHeaderValues
(
String
name
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
if
(
header
!=
null
)
{
return
header
.
getValues
();
}
...
...
@@ -643,7 +643,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
private
void
doAddHeaderValue
(
String
name
,
Object
value
,
boolean
replace
)
{
HeaderValueHolder
header
=
HeaderValueHolder
.
getByName
(
this
.
headers
,
name
);
HeaderValueHolder
header
=
this
.
headers
.
get
(
name
);
Assert
.
notNull
(
value
,
"Header value must not be null"
);
if
(
header
==
null
)
{
header
=
new
HeaderValueHolder
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录