root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge pull request #1597 from liujiong1982/spring-boot-545 

* spring-boot-545:
  Support Jetty HandlerCollection types
This commit is contained in:
Phillip Webb 2014-10-08 20:09:48 -07:00
parent a401454a2a 64447d3f5f
commit c906524df6
3 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
View File

@ -21,6 +21,7 @@ import org.apache.commons.logging.LogFactory;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.springframework.boot.context.embedded.EmbeddedServletContainer; import org.springframework.boot.context.embedded.EmbeddedServletContainer;
import org.springframework.boot.context.embedded.EmbeddedServletContainerException; import org.springframework.boot.context.embedded.EmbeddedServletContainerException;
@ -34,6 +35,7 @@ import org.springframework.util.ReflectionUtils;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Dave Syer * @author Dave Syer
* @author David Liu
* @see JettyEmbeddedServletContainerFactory * @see JettyEmbeddedServletContainerFactory
*/ */
public class JettyEmbeddedServletContainer implements EmbeddedServletContainer { public class JettyEmbeddedServletContainer implements EmbeddedServletContainer {
@ -115,13 +117,18 @@ public class JettyEmbeddedServletContainer implements EmbeddedServletContainer {
} }
} }
private void handleDeferredInitialize(Handler handler) throws Exception { private void handleDeferredInitialize(Handler... handlers) throws Exception {
for (Handler handler : handlers) {
if (handler instanceof JettyEmbeddedWebAppContext) { if (handler instanceof JettyEmbeddedWebAppContext) {
((JettyEmbeddedWebAppContext) handler).deferredInitialize(); ((JettyEmbeddedWebAppContext) handler).deferredInitialize();
} }
else if (handler instanceof HandlerWrapper) { else if (handler instanceof HandlerWrapper) {
handleDeferredInitialize(((HandlerWrapper) handler).getHandler()); handleDeferredInitialize(((HandlerWrapper) handler).getHandler());
} }
else if (handler instanceof HandlerCollection) {
handleDeferredInitialize(((HandlerCollection) handler).getHandlers());
}
}
} }
private Integer getLocalPort(Connector connector) { private Integer getLocalPort(Connector connector) {

2
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@ -580,7 +580,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
protected abstract AbstractEmbeddedServletContainerFactory getFactory(); protected abstract AbstractEmbeddedServletContainerFactory getFactory();
private ServletContextInitializer exampleServletRegistration() { protected ServletContextInitializer exampleServletRegistration() {
return new ServletRegistrationBean(new ExampleServlet(), "/hello"); return new ServletRegistrationBean(new ExampleServlet(), "/hello");
} }

22
spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
View File

@ -21,6 +21,8 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.server.ssl.SslConnector; import org.eclipse.jetty.server.ssl.SslConnector;
import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.Configuration;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
@ -129,4 +131,24 @@ public class JettyEmbeddedServletContainerFactoryTests extends
assertThat(actual, equalTo(expected)); assertThat(actual, equalTo(expected));
} }
@Test
public void wrappedHandlers() throws Exception {
JettyEmbeddedServletContainerFactory factory = getFactory();
factory.setServerCustomizers(Arrays.asList(new JettyServerCustomizer() {
@Override
public void customize(Server server) {
Handler handler = server.getHandler();
HandlerWrapper wrapper = new HandlerWrapper();
wrapper.setHandler(handler);
HandlerCollection collection = new HandlerCollection();
collection.addHandler(wrapper);
server.setHandler(collection);
}
}));
this.container = factory
.getEmbeddedServletContainer(exampleServletRegistration());
this.container.start();
assertThat(getResponse(getLocalUrl("/hello")), equalTo("Hello World"));
}
} }