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

Updated ServletHttpHandlerAdapter usage

Browse Source
This commit is contained in:
Juergen Hoeller
2016-08-04 03:04:33 +02:00
parent dfef4e09da
commit 8109a8c288
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 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.
@@ -28,26 +28,18 @@ import org.springframework.util.Assert;
/**
* @author Rossen Stoyanchev
*/
public class JettyHttpServer extends HttpServerSupport implements InitializingBean, HttpServer {
public class JettyHttpServer extends HttpServerSupport implements HttpServer, InitializingBean {
private Server jettyServer;
private boolean running;
@Override
public boolean isRunning() {
return this.running;
}
@Override
public void afterPropertiesSet() throws Exception {
this.jettyServer = new Server();
Assert.notNull(getHttpHandler());
ServletHttpHandlerAdapter servlet = new ServletHttpHandlerAdapter();
servlet.setHandler(getHttpHandler());
ServletHttpHandlerAdapter servlet = new ServletHttpHandlerAdapter(getHttpHandler());
ServletHolder servletHolder = new ServletHolder(servlet);
ServletContextHandler contextHandler = new ServletContextHandler(this.jettyServer, "", false, false);
@@ -86,4 +78,9 @@ public class JettyHttpServer extends HttpServerSupport implements InitializingBe
}
}
@Override
public boolean isRunning() {
return this.running;
}
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 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.
@@ -24,13 +24,11 @@ import org.apache.catalina.startup.Tomcat;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.http.server.reactive.ServletHttpHandlerAdapter;
import org.springframework.util.Assert;
/**
* @author Rossen Stoyanchev
*/
public class TomcatHttpServer extends HttpServerSupport implements InitializingBean, HttpServer {
public class TomcatHttpServer extends HttpServerSupport implements HttpServer, InitializingBean {
private Tomcat tomcatServer;
@@ -47,14 +45,8 @@ public class TomcatHttpServer extends HttpServerSupport implements InitializingB
}
@Override
public boolean isRunning() {
return this.running;
}
@Override
public void afterPropertiesSet() throws Exception {
this.tomcatServer = new Tomcat();
if (this.baseDir != null) {
this.tomcatServer.setBaseDir(baseDir);
@@ -62,9 +54,7 @@ public class TomcatHttpServer extends HttpServerSupport implements InitializingB
this.tomcatServer.setHostname(getHost());
this.tomcatServer.setPort(getPort());
Assert.notNull(getHttpHandler());
ServletHttpHandlerAdapter servlet = new ServletHttpHandlerAdapter();
servlet.setHandler(getHttpHandler());
ServletHttpHandlerAdapter servlet = new ServletHttpHandlerAdapter(getHttpHandler());
File base = new File(System.getProperty("java.io.tmpdir"));
Context rootContext = tomcatServer.addContext("", base.getAbsolutePath());
@@ -100,4 +90,9 @@ public class TomcatHttpServer extends HttpServerSupport implements InitializingB
}
}
@Override
public boolean isRunning() {
return this.running;
}
}