Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3698 - Changes based on review from @sbordet 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2019-06-03 15:52:41 -05:00
parent 54888d2541
commit a6b2bd86ef
3 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ContainerInitializer.java
View File

@ -37,11 +37,11 @@ public final class ContainerInitializer
* Utility Method to allow for manual execution of {@link javax.servlet.ServletContainerInitializer} when
* using Embedded Jetty.
*
* <code>
* <pre>
* ServletContextHandler context = new ServletContextHandler();
* ServletContainerInitializer corpSci = new MyCorporateSCI();
* context.addEventListener(ContainerInitializer.asContextListener(corpSci));
* </code>
* </pre>
*
* <p>
* The {@link ServletContainerInitializer} will have its {@link ServletContainerInitializer#onStartup(Set, ServletContext)}
@ -52,22 +52,22 @@ public final class ContainerInitializer
*
* @param sci the {@link ServletContainerInitializer} to call
* @return the {@link ServletContextListener} wrapping the SCI
* @see SCIAsContextListener#addClasses(Class[])
* @see SCIAsContextListener#addClasses(String...)
* @see ServletContainerInitializerServletContextListener#addClasses(Class[])
* @see ServletContainerInitializerServletContextListener#addClasses(String...)
*/
public static SCIAsContextListener asContextListener(ServletContainerInitializer sci)
public static ServletContainerInitializerServletContextListener asContextListener(ServletContainerInitializer sci)
{
return new SCIAsContextListener(sci);
return new ServletContainerInitializerServletContextListener(sci);
}
public static class SCIAsContextListener implements ServletContextListener
public static class ServletContainerInitializerServletContextListener implements ServletContextListener
{
private final ServletContainerInitializer sci;
private Set<String> classNames;
private Set<Class<?>> classes = new HashSet<>();
private Consumer<ServletContext> postOnStartupConsumer;
private Consumer<ServletContext> afterStartupConsumer;
public SCIAsContextListener(ServletContainerInitializer sci)
public ServletContainerInitializerServletContextListener(ServletContainerInitializer sci)
{
this.sci = sci;
}
@ -80,9 +80,9 @@ public final class ContainerInitializer
* </p>
*
* @param classNames the class names to load and pass into the {@link ServletContainerInitializer#onStartup(Set, ServletContext)} call
* @return this configured {@link SCIAsContextListener} instance.
* @return this configured {@link ServletContainerInitializerServletContextListener} instance.
*/
public SCIAsContextListener addClasses(String... classNames)
public ServletContainerInitializerServletContextListener addClasses(String... classNames)
{
if (this.classNames == null)
{
@ -101,9 +101,9 @@ public final class ContainerInitializer
* </p>
*
* @param classes the classes to pass into the {@link ServletContainerInitializer#onStartup(Set, ServletContext)} call
* @return this configured {@link SCIAsContextListener} instance.
* @return this configured {@link ServletContainerInitializerServletContextListener} instance.
*/
public SCIAsContextListener addClasses(Class<?>... classes)
public ServletContainerInitializerServletContextListener addClasses(Class<?>... classes)
{
this.classes.addAll(Arrays.asList(classes));
return this;
@ -121,13 +121,12 @@ public final class ContainerInitializer
* This consumer is typically used for Embedded Jetty users to configure Jetty for their specific needs.
* </p>
*
*
* @param consumer the consumer to execute after the SCI has executed
* @return this configured {@link SCIAsContextListener} instance.
* @return this configured {@link ServletContainerInitializerServletContextListener} instance.
*/
public SCIAsContextListener setPostOnStartupConsumer(Consumer<ServletContext> consumer)
public ServletContainerInitializerServletContextListener afterStartup(Consumer<ServletContext> consumer)
{
this.postOnStartupConsumer = consumer;
this.afterStartupConsumer = consumer;
return this;
}
@ -138,9 +137,9 @@ public final class ContainerInitializer
try
{
sci.onStartup(getClasses(), servletContext);
if (postOnStartupConsumer != null)
if (afterStartupConsumer != null)
{
postOnStartupConsumer.accept(servletContext);
afterStartupConsumer.accept(servletContext);
}
}
catch (RuntimeException rte)

13
jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/deploy/WebSocketServerContainerInitializer.java
View File

@ -142,7 +142,7 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit
* @return a configured {@link ServerContainer} instance
* @throws ServletException if the {@link WebSocketUpgradeFilter} cannot be configured
* @deprecated use {@link #configure(ServletContextHandler, Configurator)} instead
* @see #configure(ServletContextHandler, Configurator)
* @see #initialize(ServletContext)
*/
@Deprecated
public static ServerContainer configureContext(ServletContextHandler context) throws ServletException
@ -153,12 +153,12 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit
}
/**
* @param context not used
* @param jettyContext the {@link ServletContextHandler} to use
* @param context the {@link ServletContext} to use
* @param jettyContext not used
* @return a configured {@link ServerContainer} instance
* @throws ServletException if the {@link WebSocketUpgradeFilter} cannot be configured
* @deprecated use {@link #configure(ServletContextHandler, Configurator)} instead
* @see #configure(ServletContextHandler, Configurator)
* @see #initialize(ServletContext)
*/
@Deprecated
public static ServerContainer configureContext(ServletContext context, ServletContextHandler jettyContext) throws ServletException
@ -254,9 +254,8 @@ public class WebSocketServerContainerInitializer implements ServletContainerInit
// the initialization phase is over. (important for this SCI to function)
context.getServletContext().setExtendedListenerTypes(true);
context.addEventListener(
ContainerInitializer.asContextListener(new WebSocketServerContainerInitializer())
.setPostOnStartupConsumer((servletContext) ->
context.addEventListener(ContainerInitializer.asContextListener(new WebSocketServerContainerInitializer())
.afterStartup((servletContext) ->
{
ServerContainer serverContainer = (ServerContainer)servletContext.getAttribute(ATTR_JAVAX_SERVER_CONTAINER);
try

2
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketServletContainerInitializer.java
View File

@ -83,7 +83,7 @@ public class NativeWebSocketServletContainerInitializer implements ServletContai
context.addEventListener(
ContainerInitializer
.asContextListener(new NativeWebSocketServletContainerInitializer())
.setPostOnStartupConsumer((servletContext) ->
.afterStartup((servletContext) ->
{
NativeWebSocketConfiguration configuration = (NativeWebSocketConfiguration)servletContext.getAttribute(ATTR_KEY);
configurator.accept(servletContext, configuration);