Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
725d6857
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,发现更多精彩内容 >>
提交
725d6857
编写于
5月 01, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ReactorNettyWebSocketSession implements close properly
Issue: SPR-16774
上级
6545cab4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
7 deletion
+32
-7
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
...reactive/socket/adapter/ReactorNettyWebSocketSession.java
+7
-6
spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
...mework/web/reactive/socket/WebSocketIntegrationTests.java
+25
-1
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
浏览文件 @
725d6857
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
8
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.
...
...
@@ -15,10 +15,12 @@
*/
package
org.springframework.web.reactive.socket.adapter
;
import
io.netty.handler.codec.http.websocketx.CloseWebSocketFrame
;
import
io.netty.handler.codec.http.websocketx.WebSocketFrame
;
import
org.reactivestreams.Publisher
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Mono
;
import
reactor.core.publisher.MonoProcessor
;
import
reactor.ipc.netty.NettyInbound
;
import
reactor.ipc.netty.NettyOutbound
;
import
reactor.ipc.netty.NettyPipeline
;
...
...
@@ -42,6 +44,8 @@ import org.springframework.web.reactive.socket.WebSocketSession;
public
class
ReactorNettyWebSocketSession
extends
NettyWebSocketSessionSupport
<
ReactorNettyWebSocketSession
.
WebSocketConnection
>
{
private
final
MonoProcessor
<
WebSocketFrame
>
closeMono
=
MonoProcessor
.
create
();
public
ReactorNettyWebSocketSession
(
WebsocketInbound
inbound
,
WebsocketOutbound
outbound
,
HandshakeInfo
info
,
NettyDataBufferFactory
bufferFactory
)
{
...
...
@@ -69,11 +73,8 @@ public class ReactorNettyWebSocketSession
@Override
public
Mono
<
Void
>
close
(
CloseStatus
status
)
{
return
Mono
.
error
(
new
UnsupportedOperationException
(
"Reactor Netty does not support closing the session from anywhere. "
+
"You will need to work with the Flux returned from receive() method, "
+
"either subscribing to it and using the returned Disposable, "
+
"or using an operator that cancels (e.g. take)."
));
WebSocketFrame
closeFrame
=
new
CloseWebSocketFrame
(
status
.
getCode
(),
status
.
getReason
());
return
getDelegate
().
getOutbound
().
sendObject
(
closeFrame
).
then
();
}
...
...
spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
浏览文件 @
725d6857
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
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.
...
...
@@ -127,6 +127,21 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
assertEquals
(
"my-header:my-value"
,
output
.
block
(
Duration
.
ofMillis
(
5000
)));
}
@Test
public
void
sessionClosing
()
throws
Exception
{
this
.
client
.
execute
(
getUrl
(
"/close"
),
session
->
{
logger
.
debug
(
"Starting.."
);
return
session
.
receive
()
.
doOnNext
(
s
->
logger
.
debug
(
"inbound "
+
s
))
.
then
()
.
doFinally
(
signalType
->
{
logger
.
debug
(
"Completed with: "
+
signalType
);
});
})
.
block
(
Duration
.
ofMillis
(
5000
));
}
@Configuration
static
class
WebConfig
{
...
...
@@ -137,6 +152,7 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
map
.
put
(
"/echo"
,
new
EchoWebSocketHandler
());
map
.
put
(
"/sub-protocol"
,
new
SubProtocolWebSocketHandler
());
map
.
put
(
"/custom-header"
,
new
CustomHeaderHandler
());
map
.
put
(
"/close"
,
new
SessionClosingHandler
());
SimpleUrlHandlerMapping
mapping
=
new
SimpleUrlHandlerMapping
();
mapping
.
setUrlMap
(
map
);
...
...
@@ -183,4 +199,12 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
}
}
private
static
class
SessionClosingHandler
implements
WebSocketHandler
{
@Override
public
Mono
<
Void
>
handle
(
WebSocketSession
session
)
{
return
Flux
.
never
().
mergeWith
(
session
.
close
(
CloseStatus
.
GOING_AWAY
)).
then
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录