Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
709d4ba6
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 搜索 >>
提交
709d4ba6
编写于
12月 21, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid explicit DecoratedObjectFactory setup in JettyRequestUpgradeStrategy
Issue: SPR-14940
上级
8d55c7d6
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
69 addition
and
67 deletion
+69
-67
spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
.../web/socket/server/jetty/JettyRequestUpgradeStrategy.java
+0
-2
spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java
...amework/web/socket/AbstractWebSocketIntegrationTests.java
+2
-3
spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
.../springframework/web/socket/JettyWebSocketTestServer.java
+22
-14
spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
...springframework/web/socket/TomcatWebSocketTestServer.java
+11
-12
spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
...va/org/springframework/web/socket/UndertowTestServer.java
+21
-22
spring-websocket/src/test/java/org/springframework/web/socket/WebSocketTestServer.java
...a/org/springframework/web/socket/WebSocketTestServer.java
+10
-12
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java
...socket/config/annotation/WebSocketConfigurationTests.java
+3
-2
未找到文件。
spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
浏览文件 @
709d4ba6
...
...
@@ -26,7 +26,6 @@ import javax.servlet.ServletContext;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
org.eclipse.jetty.util.DecoratedObjectFactory
;
import
org.eclipse.jetty.websocket.api.WebSocketPolicy
;
import
org.eclipse.jetty.websocket.api.extensions.ExtensionConfig
;
import
org.eclipse.jetty.websocket.server.HandshakeRFC6455
;
...
...
@@ -296,7 +295,6 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv
@Override
protected
WebSocketServerFactory
createFactory
(
WebSocketPolicy
policy
)
throws
Exception
{
servletContext
.
setAttribute
(
DecoratedObjectFactory
.
ATTR
,
new
DecoratedObjectFactory
());
return
new
WebSocketServerFactory
(
servletContext
,
policy
);
}
...
...
spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java
浏览文件 @
709d4ba6
...
...
@@ -86,11 +86,10 @@ public abstract class AbstractWebSocketIntegrationTests {
this
.
server
.
setup
();
this
.
server
.
deployConfig
(
this
.
wac
);
// Set ServletContext in WebApplicationContext after deployment but before
// starting the server.
this
.
server
.
start
();
this
.
wac
.
setServletContext
(
this
.
server
.
getServletContext
());
this
.
wac
.
refresh
();
this
.
server
.
start
();
}
protected
abstract
Class
<?>[]
getAnnotatedConfigClasses
();
...
...
spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
浏览文件 @
709d4ba6
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -52,11 +52,6 @@ public class JettyWebSocketTestServer implements WebSocketTestServer {
this
.
jettyServer
=
new
Server
(
0
);
}
@Override
public
int
getPort
()
{
return
this
.
port
;
}
@Override
public
void
deployConfig
(
WebApplicationContext
wac
,
Filter
...
filters
)
{
ServletHolder
servletHolder
=
new
ServletHolder
(
new
DispatcherServlet
(
wac
));
...
...
@@ -72,11 +67,6 @@ public class JettyWebSocketTestServer implements WebSocketTestServer {
return
EnumSet
.
of
(
DispatcherType
.
REQUEST
,
DispatcherType
.
FORWARD
,
DispatcherType
.
INCLUDE
,
DispatcherType
.
ASYNC
);
}
@Override
public
ServletContext
getServletContext
()
{
return
this
.
contextHandler
.
getServletContext
();
}
@Override
public
void
undeployConfig
()
{
// Stopping jetty will undeploy the servlet
...
...
@@ -85,6 +75,7 @@ public class JettyWebSocketTestServer implements WebSocketTestServer {
@Override
public
void
start
()
throws
Exception
{
this
.
jettyServer
.
start
();
this
.
contextHandler
.
start
();
Connector
[]
connectors
=
jettyServer
.
getConnectors
();
NetworkConnector
connector
=
(
NetworkConnector
)
connectors
[
0
];
...
...
@@ -93,10 +84,27 @@ public class JettyWebSocketTestServer implements WebSocketTestServer {
@Override
public
void
stop
()
throws
Exception
{
if
(
this
.
jettyServer
.
isRunning
())
{
this
.
jettyServer
.
setStopTimeout
(
5000
);
this
.
jettyServer
.
stop
();
try
{
if
(
this
.
contextHandler
.
isRunning
())
{
this
.
contextHandler
.
stop
();
}
}
finally
{
if
(
this
.
jettyServer
.
isRunning
())
{
this
.
jettyServer
.
setStopTimeout
(
5000
);
this
.
jettyServer
.
stop
();
}
}
}
@Override
public
int
getPort
()
{
return
this
.
port
;
}
@Override
public
ServletContext
getServletContext
()
{
return
this
.
contextHandler
.
getServletContext
();
}
}
spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
浏览文件 @
709d4ba6
...
...
@@ -18,7 +18,6 @@ package org.springframework.web.socket;
import
java.io.File
;
import
java.io.IOException
;
import
javax.servlet.Filter
;
import
javax.servlet.ServletContext
;
...
...
@@ -82,15 +81,10 @@ public class TomcatWebSocketTestServer implements WebSocketTestServer {
return
tempFolder
;
}
catch
(
IOException
ex
)
{
throw
new
Runtim
eException
(
"Unable to create temp directory"
,
ex
);
throw
new
IllegalStat
eException
(
"Unable to create temp directory"
,
ex
);
}
}
@Override
public
int
getPort
()
{
return
this
.
port
;
}
@Override
public
void
deployConfig
(
WebApplicationContext
wac
,
Filter
...
filters
)
{
Assert
.
state
(
this
.
port
!=
-
1
,
"setup() was never called."
);
...
...
@@ -112,11 +106,6 @@ public class TomcatWebSocketTestServer implements WebSocketTestServer {
}
}
@Override
public
ServletContext
getServletContext
()
{
return
this
.
context
.
getServletContext
();
}
@Override
public
void
undeployConfig
()
{
if
(
this
.
context
!=
null
)
{
...
...
@@ -143,4 +132,14 @@ public class TomcatWebSocketTestServer implements WebSocketTestServer {
this
.
tomcatServer
.
stop
();
}
@Override
public
int
getPort
()
{
return
this
.
port
;
}
@Override
public
ServletContext
getServletContext
()
{
return
this
.
context
.
getServletContext
();
}
}
spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
浏览文件 @
709d4ba6
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -16,6 +16,13 @@
package
org.springframework.web.socket
;
import
java.io.IOException
;
import
javax.servlet.DispatcherType
;
import
javax.servlet.Filter
;
import
javax.servlet.Servlet
;
import
javax.servlet.ServletContext
;
import
javax.servlet.ServletException
;
import
io.undertow.Undertow
;
import
io.undertow.server.HttpHandler
;
import
io.undertow.servlet.api.DeploymentInfo
;
...
...
@@ -24,23 +31,14 @@ import io.undertow.servlet.api.FilterInfo;
import
io.undertow.servlet.api.InstanceFactory
;
import
io.undertow.servlet.api.InstanceHandle
;
import
io.undertow.websockets.jsr.WebSocketDeploymentInfo
;
import
java.io.IOException
;
import
javax.servlet.DispatcherType
;
import
javax.servlet.Filter
;
import
javax.servlet.Servlet
;
import
javax.servlet.ServletContext
;
import
javax.servlet.ServletException
;
import
org.xnio.OptionMap
;
import
org.xnio.Xnio
;
import
org.springframework.util.Assert
;
import
org.springframework.util.SocketUtils
;
import
org.springframework.web.context.WebApplicationContext
;
import
org.springframework.web.servlet.DispatcherServlet
;
import
org.xnio.OptionMap
;
import
org.xnio.Xnio
;
import
static
io
.
undertow
.
servlet
.
Servlets
.*;
/**
...
...
@@ -63,11 +61,6 @@ public class UndertowTestServer implements WebSocketTestServer {
this
.
port
=
SocketUtils
.
findAvailableTcpPort
();
}
@Override
public
int
getPort
()
{
return
this
.
port
;
}
@Override
@SuppressWarnings
(
"deprecation"
)
public
void
deployConfig
(
WebApplicationContext
wac
,
Filter
...
filters
)
{
...
...
@@ -108,11 +101,6 @@ public class UndertowTestServer implements WebSocketTestServer {
}
}
@Override
public
ServletContext
getServletContext
()
{
return
this
.
manager
.
getDeployment
().
getServletContext
();
}
@Override
public
void
undeployConfig
()
{
this
.
manager
.
undeploy
();
...
...
@@ -128,6 +116,16 @@ public class UndertowTestServer implements WebSocketTestServer {
this
.
server
.
stop
();
}
@Override
public
int
getPort
()
{
return
this
.
port
;
}
@Override
public
ServletContext
getServletContext
()
{
return
this
.
manager
.
getDeployment
().
getServletContext
();
}
private
static
class
DispatcherServletInstanceFactory
implements
InstanceFactory
<
Servlet
>
{
...
...
@@ -151,6 +149,7 @@ public class UndertowTestServer implements WebSocketTestServer {
}
}
private
static
class
FilterInstanceFactory
implements
InstanceFactory
<
Filter
>
{
private
final
Filter
filter
;
...
...
spring-websocket/src/test/java/org/springframework/web/socket/WebSocketTestServer.java
浏览文件 @
709d4ba6
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -29,26 +29,24 @@ import org.springframework.web.context.WebApplicationContext;
*/
public
interface
WebSocketTestServer
{
int
getPort
();
void
setup
();
void
deployConfig
(
WebApplicationContext
cxt
,
Filter
...
filters
);
void
undeployConfig
();
void
start
()
throws
Exception
;
void
stop
()
throws
Exception
;
int
getPort
();
/**
* Get the {@link ServletContext} created by the underlying server.
*
* <p>The {@code ServletContext} is only guaranteed to be available
* after {@link #deployConfig} has been invoked.
*
* @since 4.2
*/
ServletContext
getServletContext
();
void
undeployConfig
();
void
start
()
throws
Exception
;
void
stop
()
throws
Exception
;
}
\ No newline at end of file
}
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java
浏览文件 @
709d4ba6
...
...
@@ -97,9 +97,9 @@ public class WebSocketConfigurationTests extends AbstractWebSocketIntegrationTes
@Override
public
void
registerWebSocketHandlers
(
WebSocketHandlerRegistry
registry
)
{
registry
.
addHandler
(
serverHandler
(),
"/ws"
)
.
setHandshakeHandler
(
this
.
handshakeHandler
);
.
setHandshakeHandler
(
this
.
handshakeHandler
);
registry
.
addHandler
(
serverHandler
(),
"/sockjs"
).
withSockJS
()
.
setTransportHandlerOverrides
(
new
WebSocketTransportHandler
(
this
.
handshakeHandler
));
.
setTransportHandlerOverrides
(
new
WebSocketTransportHandler
(
this
.
handshakeHandler
));
}
@Bean
...
...
@@ -108,6 +108,7 @@ public class WebSocketConfigurationTests extends AbstractWebSocketIntegrationTes
}
}
private
static
class
TestHandler
extends
AbstractWebSocketHandler
{
private
CountDownLatch
connectLatch
=
new
CountDownLatch
(
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录