Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
a5339d71
S
spring-framework
项目概览
sesemomo
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
a5339d71
编写于
11月 09, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
WebClient handles no Content-Type with data correctly
Issue: SPR-17482
上级
e4c84ec7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
6 deletion
+23
-6
spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
...springframework/web/reactive/function/BodyExtractors.java
+5
-6
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientDataBufferAllocatingTests.java
...e/function/client/WebClientDataBufferAllocatingTests.java
+18
-0
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
浏览文件 @
a5339d71
...
...
@@ -224,16 +224,15 @@ public abstract class BodyExtractors {
Flux
<
T
>
result
;
if
(
message
.
getHeaders
().
getContentType
()
==
null
)
{
// Maybe it's okay, if there is no content..
result
=
message
.
getBody
().
map
(
o
->
{
// Maybe it's okay there is no content type, if there is no content..
result
=
message
.
getBody
().
map
(
buffer
->
{
DataBufferUtils
.
release
(
buffer
);
throw
ex
;
});
}
else
{
result
=
Flux
.
error
(
ex
);
}
if
(
message
instanceof
ClientHttpResponse
)
{
result
=
consumeAndCancel
(
message
).
thenMany
(
result
);
result
=
message
instanceof
ClientHttpResponse
?
consumeAndCancel
(
message
).
thenMany
(
Flux
.
error
(
ex
))
:
Flux
.
error
(
ex
);
}
return
result
;
}
...
...
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientDataBufferAllocatingTests.java
浏览文件 @
a5339d71
...
...
@@ -16,6 +16,7 @@
package
org.springframework.web.reactive.function.client
;
import
java.time.Duration
;
import
java.util.Map
;
import
java.util.function.Function
;
import
io.netty.buffer.ByteBufAllocator
;
...
...
@@ -28,12 +29,14 @@ import org.junit.Test;
import
reactor.core.publisher.Mono
;
import
reactor.test.StepVerifier
;
import
org.springframework.core.ParameterizedTypeReference
;
import
org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase
;
import
org.springframework.core.io.buffer.NettyDataBufferFactory
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.client.reactive.ReactorClientHttpConnector
;
import
org.springframework.http.client.reactive.ReactorResourceFactory
;
import
org.springframework.web.reactive.function.UnsupportedMediaTypeException
;
import
static
org
.
junit
.
Assert
.*;
...
...
@@ -103,6 +106,21 @@ public class WebClientDataBufferAllocatingTests extends AbstractDataBufferAlloca
assertEquals
(
1
,
this
.
server
.
getRequestCount
());
}
@Test
// SPR-17482
public
void
bodyToMonoVoidWithoutContentType
()
{
this
.
server
.
enqueue
(
new
MockResponse
()
.
setResponseCode
(
HttpStatus
.
ACCEPTED
.
value
())
.
setChunkedBody
(
"{\"foo\" : \"123\", \"baz\" : \"456\", \"baz\" : \"456\"}"
,
5
));
Mono
<
Map
<
String
,
String
>>
mono
=
this
.
webClient
.
get
()
.
uri
(
"/sample"
).
accept
(
MediaType
.
APPLICATION_JSON
)
.
retrieve
()
.
bodyToMono
(
new
ParameterizedTypeReference
<
Map
<
String
,
String
>>()
{});
StepVerifier
.
create
(
mono
).
expectError
(
UnsupportedMediaTypeException
.
class
).
verify
(
Duration
.
ofSeconds
(
3
));
assertEquals
(
1
,
this
.
server
.
getRequestCount
());
}
@Test
public
void
onStatusWithBodyNotConsumed
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录