From 811bd32ce2167f64957e2b14e3466ea46b59e3e7 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 7 Nov 2013 13:40:49 +0000 Subject: [PATCH] More sensible signature for servlet initializer --- .../websocket/config/SampleWebSocketsApplication.java | 4 ++-- .../boot/web/SpringBootServletInitializer.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java index 52bb18642c..daebe593a5 100644 --- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java +++ b/spring-boot-samples/spring-boot-sample-websocket/src/main/java/org/springframework/boot/samples/websocket/config/SampleWebSocketsApplication.java @@ -36,8 +36,8 @@ import org.springframework.web.socket.support.PerConnectionWebSocketHandler; public class SampleWebSocketsApplication extends SpringBootServletInitializer { @Override - protected void configure(SpringApplicationBuilder application) { - application.sources(SampleWebSocketsApplication.class); + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(SampleWebSocketsApplication.class); } public static void main(String[] args) { diff --git a/spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java b/spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java index a9165f1fc0..6588e8ecda 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java @@ -86,7 +86,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit application.initializers(new ServletContextApplicationContextInitializer( servletContext)); application.contextClass(AnnotationConfigEmbeddedWebApplicationContext.class); - configure(application); + application = configure(application); return (WebApplicationContext) application.run(); } @@ -99,7 +99,8 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit * @param application a builder for the application context * @see SpringApplicationBuilder */ - protected void configure(SpringApplicationBuilder application) { + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application; } }