Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
6f68af68
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 搜索 >>
提交
6f68af68
编写于
2月 13, 2017
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Uncomment test following fix in reactor-netty
上级
febed19b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
12 deletion
+6
-12
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java
...b/reactive/socket/client/ReactorNettyWebSocketClient.java
+6
-6
spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
...mework/web/reactive/socket/WebSocketIntegrationTests.java
+0
-6
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java
浏览文件 @
6f68af68
...
...
@@ -22,11 +22,11 @@ import io.netty.buffer.ByteBufAllocator;
import
reactor.core.publisher.Mono
;
import
reactor.ipc.netty.http.client.HttpClient
;
import
reactor.ipc.netty.http.client.HttpClientOptions
;
import
reactor.ipc.netty.http.client.HttpClientRequest
;
import
reactor.ipc.netty.http.client.HttpClientResponse
;
import
org.springframework.core.io.buffer.NettyDataBufferFactory
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.reactive.socket.HandshakeInfo
;
import
org.springframework.web.reactive.socket.WebSocketHandler
;
import
org.springframework.web.reactive.socket.WebSocketSession
;
...
...
@@ -76,10 +76,11 @@ public class ReactorNettyWebSocketClient extends WebSocketClientSupport implemen
public
Mono
<
Void
>
execute
(
URI
url
,
HttpHeaders
headers
,
WebSocketHandler
handler
)
{
String
[]
protocols
=
beforeHandshake
(
url
,
headers
,
handler
);
// TODO: https://github.com/reactor/reactor-netty/issues/20
return
getHttpClient
()
.
get
(
url
.
toString
(),
request
->
addHeaders
(
request
,
headers
).
sendWebsocket
())
.
ws
(
url
.
toString
(),
nettyHeaders
->
setNettyHeaders
(
headers
,
nettyHeaders
),
StringUtils
.
arrayToCommaDelimitedString
(
protocols
))
.
then
(
response
->
{
HandshakeInfo
info
=
afterHandshake
(
url
,
toHttpHeaders
(
response
));
ByteBufAllocator
allocator
=
response
.
channel
().
alloc
();
...
...
@@ -91,9 +92,8 @@ public class ReactorNettyWebSocketClient extends WebSocketClientSupport implemen
});
}
private
HttpClientRequest
addHeaders
(
HttpClientRequest
request
,
HttpHeaders
headers
)
{
headers
.
keySet
().
stream
().
forEach
(
key
->
request
.
requestHeaders
().
set
(
key
,
headers
.
get
(
key
)));
return
request
;
private
void
setNettyHeaders
(
HttpHeaders
headers
,
io
.
netty
.
handler
.
codec
.
http
.
HttpHeaders
nettyHeaders
)
{
headers
.
keySet
().
stream
().
forEach
(
key
->
nettyHeaders
.
set
(
key
,
headers
.
get
(
key
)));
}
private
HttpHeaders
toHttpHeaders
(
HttpClientResponse
response
)
{
...
...
spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
浏览文件 @
6f68af68
...
...
@@ -32,11 +32,9 @@ import org.springframework.context.annotation.Configuration;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.web.reactive.HandlerMapping
;
import
org.springframework.web.reactive.handler.SimpleUrlHandlerMapping
;
import
org.springframework.web.reactive.socket.client.ReactorNettyWebSocketClient
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
static
org
.
junit
.
Assume
.
assumeFalse
;
/**
* Integration tests with server-side {@link WebSocketHandler}s.
...
...
@@ -72,10 +70,6 @@ public class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests
@Test
public
void
subProtocol
()
throws
Exception
{
// TODO
// https://github.com/reactor/reactor-netty/issues/20
assumeFalse
(
client
instanceof
ReactorNettyWebSocketClient
);
String
protocol
=
"echo-v1"
;
AtomicReference
<
HandshakeInfo
>
infoRef
=
new
AtomicReference
<>();
MonoProcessor
<
Object
>
output
=
MonoProcessor
.
create
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录