Commit 811bd32c authored by Dave Syer's avatar Dave Syer

More sensible signature for servlet initializer

parent 1f922f49
...@@ -36,8 +36,8 @@ import org.springframework.web.socket.support.PerConnectionWebSocketHandler; ...@@ -36,8 +36,8 @@ import org.springframework.web.socket.support.PerConnectionWebSocketHandler;
public class SampleWebSocketsApplication extends SpringBootServletInitializer { public class SampleWebSocketsApplication extends SpringBootServletInitializer {
@Override @Override
protected void configure(SpringApplicationBuilder application) { protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
application.sources(SampleWebSocketsApplication.class); return application.sources(SampleWebSocketsApplication.class);
} }
public static void main(String[] args) { public static void main(String[] args) {
......
...@@ -86,7 +86,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit ...@@ -86,7 +86,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
application.initializers(new ServletContextApplicationContextInitializer( application.initializers(new ServletContextApplicationContextInitializer(
servletContext)); servletContext));
application.contextClass(AnnotationConfigEmbeddedWebApplicationContext.class); application.contextClass(AnnotationConfigEmbeddedWebApplicationContext.class);
configure(application); application = configure(application);
return (WebApplicationContext) application.run(); return (WebApplicationContext) application.run();
} }
...@@ -99,7 +99,8 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit ...@@ -99,7 +99,8 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
* @param application a builder for the application context * @param application a builder for the application context
* @see SpringApplicationBuilder * @see SpringApplicationBuilder
*/ */
protected void configure(SpringApplicationBuilder application) { protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment