Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
7de2650a
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 搜索 >>
提交
7de2650a
编写于
3月 16, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Drop @WebServlet annotation
Issue: SPR-16591
上级
72bbb261
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
6 addition
and
8 deletion
+6
-8
spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
...amework/http/server/reactive/JettyHttpHandlerAdapter.java
+2
-3
spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
...ework/http/server/reactive/ServletHttpHandlerAdapter.java
+1
-2
spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
...mework/http/server/reactive/TomcatHttpHandlerAdapter.java
+1
-2
spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java
...ework/http/server/reactive/bootstrap/JettyHttpServer.java
+1
-0
spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java
...work/http/server/reactive/bootstrap/TomcatHttpServer.java
+1
-1
未找到文件。
spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
浏览文件 @
7de2650a
/*
* 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.
...
...
@@ -20,7 +20,6 @@ import java.io.IOException;
import
java.nio.ByteBuffer
;
import
javax.servlet.AsyncContext
;
import
javax.servlet.ServletResponse
;
import
javax.servlet.annotation.WebServlet
;
import
javax.servlet.http.HttpServletResponse
;
import
org.eclipse.jetty.server.HttpOutput
;
...
...
@@ -34,8 +33,8 @@ import org.springframework.core.io.buffer.DataBufferFactory;
*
* @author Violeta Georgieva
* @since 5.0
* @see org.springframework.web.server.adapter.AbstractReactiveWebInitializer
*/
@WebServlet
(
asyncSupported
=
true
)
public
class
JettyHttpHandlerAdapter
extends
ServletHttpHandlerAdapter
{
public
JettyHttpHandlerAdapter
(
HttpHandler
httpHandler
)
{
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
浏览文件 @
7de2650a
...
...
@@ -29,7 +29,6 @@ import javax.servlet.ServletException;
import
javax.servlet.ServletRegistration
;
import
javax.servlet.ServletRequest
;
import
javax.servlet.ServletResponse
;
import
javax.servlet.annotation.WebServlet
;
import
javax.servlet.http.HttpServlet
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -52,8 +51,8 @@ import org.springframework.util.Assert;
* @author Arjen Poutsma
* @author Rossen Stoyanchev
* @since 5.0
* @see org.springframework.web.server.adapter.AbstractReactiveWebInitializer
*/
@WebServlet
(
asyncSupported
=
true
)
@SuppressWarnings
(
"serial"
)
public
class
ServletHttpHandlerAdapter
implements
Servlet
{
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
浏览文件 @
7de2650a
...
...
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import
javax.servlet.AsyncContext
;
import
javax.servlet.ServletRequest
;
import
javax.servlet.ServletResponse
;
import
javax.servlet.annotation.WebServlet
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -39,8 +38,8 @@ import org.springframework.util.Assert;
*
* @author Violeta Georgieva
* @since 5.0
* @see org.springframework.web.server.adapter.AbstractReactiveWebInitializer
*/
@WebServlet
(
asyncSupported
=
true
)
public
class
TomcatHttpHandlerAdapter
extends
ServletHttpHandlerAdapter
{
...
...
spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/JettyHttpServer.java
浏览文件 @
7de2650a
...
...
@@ -41,6 +41,7 @@ public class JettyHttpServer extends AbstractHttpServer {
ServletHttpHandlerAdapter
servlet
=
createServletAdapter
();
ServletHolder
servletHolder
=
new
ServletHolder
(
servlet
);
servletHolder
.
setAsyncSupported
(
true
);
this
.
contextHandler
=
new
ServletContextHandler
(
this
.
jettyServer
,
""
,
false
,
false
);
this
.
contextHandler
.
addServlet
(
servletHolder
,
"/"
);
...
...
spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java
浏览文件 @
7de2650a
...
...
@@ -73,7 +73,7 @@ public class TomcatHttpServer extends AbstractHttpServer {
File
base
=
new
File
(
System
.
getProperty
(
"java.io.tmpdir"
));
Context
rootContext
=
tomcatServer
.
addContext
(
this
.
contextPath
,
base
.
getAbsolutePath
());
Tomcat
.
addServlet
(
rootContext
,
"httpHandlerServlet"
,
servlet
);
Tomcat
.
addServlet
(
rootContext
,
"httpHandlerServlet"
,
servlet
)
.
setAsyncSupported
(
true
)
;
rootContext
.
addServletMappingDecoded
(
this
.
servletMapping
,
"httpHandlerServlet"
);
if
(
wsListener
!=
null
)
{
rootContext
.
addApplicationListener
(
wsListener
.
getName
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录