Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ServletHttpHandlerAdapter supports Serlvet path mapping

Browse Source 
Issue: SPR-16155
This commit is contained in:
Rossen Stoyanchev
2017-11-02 20:53:26 -04:00
parent aa653b23bc
commit 8c33ed02b3
6 changed files with 143 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java
View File

@@ -93,7 +93,7 @@ public class ServerHttpRequestTests {
}
};
AsyncContext asyncContext = new MockAsyncContext(request, new MockHttpServletResponse());
return new ServletServerHttpRequest(request, asyncContext, new DefaultDataBufferFactory(), 1024);
return new ServletServerHttpRequest(request, asyncContext, "", new DefaultDataBufferFactory(), 1024);
}
private static class TestServletInputStream extends DelegatingServletInputStream {

17
spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/TomcatHttpServer.java
View File

@@ -35,6 +35,10 @@ public class TomcatHttpServer extends AbstractHttpServer {
private final Class<?> wsListener;
private String contextPath = "";
private String servletMapping = "/";
private Tomcat tomcatServer;
@@ -49,6 +53,15 @@ public class TomcatHttpServer extends AbstractHttpServer {
}
public void setContextPath(String contextPath) {
this.contextPath = contextPath;
}
public void setServletMapping(String servletMapping) {
this.servletMapping = servletMapping;
}
@Override
protected void initServer() throws Exception {
this.tomcatServer = new Tomcat();
@@ -59,9 +72,9 @@ public class TomcatHttpServer extends AbstractHttpServer {
ServletHttpHandlerAdapter servlet = initServletAdapter();
File base = new File(System.getProperty("java.io.tmpdir"));
Context rootContext = tomcatServer.addContext("", base.getAbsolutePath());
Context rootContext = tomcatServer.addContext(this.contextPath, base.getAbsolutePath());
Tomcat.addServlet(rootContext, "httpHandlerServlet", servlet);
rootContext.addServletMappingDecoded("/", "httpHandlerServlet");
rootContext.addServletMappingDecoded(this.servletMapping, "httpHandlerServlet");
if (wsListener != null) {
rootContext.addApplicationListener(wsListener.getName());
}