Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Meiracle
spring-framework
提交
8ac39a50
S
spring-framework
项目概览
Meiracle
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
8ac39a50
编写于
12月 03, 2020
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ServletServerHttpResponse reflects Content-Type override
Closes gh-25490
上级
d82cb154
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
16 deletion
+33
-16
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
...pringframework/http/server/ServletServerHttpResponse.java
+14
-5
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
...framework/http/server/ServletServerHttpResponseTests.java
+19
-11
未找到文件。
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
浏览文件 @
8ac39a50
...
...
@@ -20,6 +20,7 @@ import java.io.IOException;
import
java.io.OutputStream
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -152,12 +153,14 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
@Override
@Nullable
public
String
getFirst
(
String
headerName
)
{
String
value
=
servletResponse
.
getHeader
(
headerName
);
if
(
value
!=
null
)
{
return
value
;
if
(
headerName
.
equalsIgnoreCase
(
CONTENT_TYPE
))
{
// Content-Type is written as an override so check super first
String
value
=
super
.
getFirst
(
headerName
);
return
(
value
!=
null
?
value
:
servletResponse
.
getHeader
(
headerName
));
}
else
{
return
super
.
getFirst
(
headerName
);
String
value
=
servletResponse
.
getHeader
(
headerName
);
return
(
value
!=
null
?
value
:
super
.
getFirst
(
headerName
));
}
}
...
...
@@ -165,7 +168,13 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
public
List
<
String
>
get
(
Object
key
)
{
Assert
.
isInstanceOf
(
String
.
class
,
key
,
"Key must be a String-based header name"
);
Collection
<
String
>
values1
=
servletResponse
.
getHeaders
((
String
)
key
);
String
headerName
=
(
String
)
key
;
if
(
headerName
.
equalsIgnoreCase
(
CONTENT_TYPE
))
{
// Content-Type is written as an override so don't merge
return
Collections
.
singletonList
(
getFirst
(
headerName
));
}
Collection
<
String
>
values1
=
servletResponse
.
getHeaders
(
headerName
);
if
(
headersWritten
)
{
return
new
ArrayList
<>(
values1
);
}
...
...
spring-web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
浏览文件 @
8ac39a50
/*
* Copyright 2002-20
19
the original author or authors.
* Copyright 2002-20
20
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.
...
...
@@ -17,7 +17,6 @@
package
org.springframework.http.server
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Collections
;
import
java.util.List
;
import
org.junit.jupiter.api.BeforeEach
;
...
...
@@ -44,20 +43,20 @@ public class ServletServerHttpResponseTests {
@BeforeEach
public
void
create
()
throws
Exception
{
void
create
()
{
mockResponse
=
new
MockHttpServletResponse
();
response
=
new
ServletServerHttpResponse
(
mockResponse
);
}
@Test
public
void
setStatusCode
()
throws
Exception
{
void
setStatusCode
()
{
response
.
setStatusCode
(
HttpStatus
.
NOT_FOUND
);
assertThat
(
mockResponse
.
getStatus
()).
as
(
"Invalid status code"
).
isEqualTo
(
404
);
}
@Test
public
void
getHeaders
()
throws
Exception
{
void
getHeaders
()
{
HttpHeaders
headers
=
response
.
getHeaders
();
String
headerName
=
"MyHeader"
;
String
headerValue1
=
"value1"
;
...
...
@@ -77,23 +76,32 @@ public class ServletServerHttpResponseTests {
}
@Test
public
void
preExistingHeadersFromHttpServletResponse
()
{
void
preExistingHeadersFromHttpServletResponse
()
{
String
headerName
=
"Access-Control-Allow-Origin"
;
String
headerValue
=
"localhost:8080"
;
this
.
mockResponse
.
addHeader
(
headerName
,
headerValue
);
this
.
mockResponse
.
setContentType
(
"text/csv"
);
this
.
response
=
new
ServletServerHttpResponse
(
this
.
mockResponse
);
assertThat
(
this
.
response
.
getHeaders
().
getFirst
(
headerName
)).
isEqualTo
(
headerValue
);
assertThat
(
this
.
response
.
getHeaders
().
get
(
headerName
)).
isEqualTo
(
Collections
.
singletonList
(
headerValue
));
assertThat
(
this
.
response
.
getHeaders
().
containsKey
(
headerName
)).
isTrue
();
assertThat
(
this
.
response
.
getHeaders
().
getFirst
(
headerName
)).
isEqualTo
(
headerValue
);
assertThat
(
this
.
response
.
getHeaders
().
get
(
headerName
)).
containsExactly
(
headerValue
);
assertThat
(
this
.
response
.
getHeaders
()).
containsKey
(
headerName
);
assertThat
(
this
.
response
.
getHeaders
().
getAccessControlAllowOrigin
()).
isEqualTo
(
headerValue
);
}
@Test
// gh-25490
void
preExistingContentTypeIsOverriddenImmediately
()
{
this
.
mockResponse
.
setContentType
(
"text/csv"
);
this
.
response
=
new
ServletServerHttpResponse
(
this
.
mockResponse
);
this
.
response
.
getHeaders
().
setContentType
(
MediaType
.
APPLICATION_JSON
);
assertThat
(
response
.
getHeaders
().
getContentType
()).
isEqualTo
(
MediaType
.
APPLICATION_JSON
);
}
@Test
public
void
getBody
()
throws
Exception
{
byte
[]
content
=
"Hello World"
.
getBytes
(
"UTF-8"
);
void
getBody
()
throws
Exception
{
byte
[]
content
=
"Hello World"
.
getBytes
(
StandardCharsets
.
UTF_8
);
FileCopyUtils
.
copy
(
content
,
response
.
getBody
());
assertThat
(
mockResponse
.
getContentAsByteArray
()).
as
(
"Invalid content written"
).
isEqualTo
(
content
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录