From ed863615819e9c4a98abf6d405b2846b1f1d86e7 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 22 Feb 2021 10:03:43 +1100 Subject: [PATCH] Revert changes to ServletContainerInitializer Signed-off-by: Lachlan Roberts --- .../jetty/servlet/ServletContextHandler.java | 27 ------------------- .../listener/ContainerInitializer.java | 2 -- .../JavaxWebSocketShutdownContainer.java | 2 +- .../JavaxClientShutdownWithServerTest.java | 2 +- .../jetty/cdi/tests/EmbeddedWeldTest.java | 16 +++++------ 5 files changed, 10 insertions(+), 39 deletions(-) diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java index 39bd9b49e8c..d420675241b 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java @@ -747,33 +747,6 @@ public class ServletContextHandler extends ContextHandler relinkHandlers(); } - /** - * Utility Method to allow for manual execution of {@link javax.servlet.ServletContainerInitializer} when using Embedded Jetty. - * @param containerInitializer the ServletContainerInitializer to register. - * @see Initializer - */ - public void addServletContainerInitializer(ServletContainerInitializer containerInitializer) - { - if (!isStopped()) - throw new IllegalStateException("ServletContainerInitializers should be added before starting"); - - addServletContainerInitializer(containerInitializer, Collections.emptySet()); - } - - /** - * Utility Method to allow for manual execution of {@link javax.servlet.ServletContainerInitializer} when using Embedded Jetty. - * @param containerInitializer the ServletContainerInitializer to register. - * @param classes the Set of application classes. - * @see Initializer - */ - public void addServletContainerInitializer(ServletContainerInitializer containerInitializer, Set> classes) - { - if (!isStopped()) - throw new IllegalStateException("ServletContainerInitializers should be added before starting"); - - addManaged(new Initializer(this, containerInitializer, classes)); - } - /** * The DecoratedObjectFactory for use by IoC containers (weld / spring / etc) * diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ContainerInitializer.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ContainerInitializer.java index 927c7de8fb0..8478fd62ae2 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ContainerInitializer.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ContainerInitializer.java @@ -25,9 +25,7 @@ import javax.servlet.ServletContextListener; /** * Utility Methods for manual execution of {@link javax.servlet.ServletContainerInitializer} when * using Embedded Jetty. - * @deprecated use {@link org.eclipse.jetty.servlet.ServletContextHandler#addServletContainerInitializer(ServletContainerInitializer)}. */ -@Deprecated public final class ContainerInitializer { /** diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketShutdownContainer.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketShutdownContainer.java index 020cb85a8e9..b4781791d4a 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketShutdownContainer.java +++ b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketShutdownContainer.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. +// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others. // // This program and the accompanying materials are made available under the // terms of the Eclipse Public License v. 2.0 which is available at diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JavaxClientShutdownWithServerTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JavaxClientShutdownWithServerTest.java index 6f7959d1b46..59f6fc76850 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JavaxClientShutdownWithServerTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JavaxClientShutdownWithServerTest.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. +// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others. // // This program and the accompanying materials are made available under the // terms of the Eclipse Public License v. 2.0 which is available at diff --git a/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/EmbeddedWeldTest.java b/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/EmbeddedWeldTest.java index 06d63fc4467..3738462013b 100644 --- a/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/EmbeddedWeldTest.java +++ b/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/EmbeddedWeldTest.java @@ -103,29 +103,29 @@ public class EmbeddedWeldTest case "CdiServletContainerInitializer+Listener": // Expect:INFO: WELD-ENV-001213: Jetty CDI SPI support detected, CDI injection will be available in Listeners, Servlets and Filters. - context.addServletContainerInitializer(new CdiServletContainerInitializer()); + context.addBean(new ServletContextHandler.Initializer(context, new CdiServletContainerInitializer())); context.addEventListener(new org.jboss.weld.environment.servlet.Listener()); break; case "CdiServletContainerInitializer(CdiDecoratingListener)+Listener": // Expect:INFO: WELD-ENV-001212: Jetty CdiDecoratingListener support detected, CDI injection will be available in Listeners, Servlets and Filters context.setInitParameter(CdiServletContainerInitializer.CDI_INTEGRATION_ATTRIBUTE, CdiDecoratingListener.MODE); - context.addServletContainerInitializer(new CdiServletContainerInitializer()); + context.addBean(new ServletContextHandler.Initializer(context, new CdiServletContainerInitializer())); context.addEventListener(new org.jboss.weld.environment.servlet.Listener()); break; case "CdiServletContainerInitializer+EnhancedListener": // Expect:INFO: WELD-ENV-001213: Jetty CDI SPI support detected, CDI injection will be available in Listeners, Servlets and Filters. - context.addServletContainerInitializer(new CdiServletContainerInitializer()); - context.addServletContainerInitializer(new org.jboss.weld.environment.servlet.EnhancedListener()); + context.addBean(new ServletContextHandler.Initializer(context, new CdiServletContainerInitializer())); + context.addBean(new ServletContextHandler.Initializer(context, new org.jboss.weld.environment.servlet.EnhancedListener())); break; // NOTE: This is the preferred mode from the Weld team. case "CdiServletContainerInitializer(CdiDecoratingListener)+EnhancedListener": // Expect:INFO: WELD-ENV-001212: Jetty CdiDecoratingListener support detected, CDI injection will be available in Listeners, Servlets and Filters context.setInitParameter(CdiServletContainerInitializer.CDI_INTEGRATION_ATTRIBUTE, CdiDecoratingListener.MODE); - context.addServletContainerInitializer(new CdiServletContainerInitializer()); - context.addServletContainerInitializer(new org.jboss.weld.environment.servlet.EnhancedListener()); + context.addBean(new ServletContextHandler.Initializer(context, new CdiServletContainerInitializer())); + context.addBean(new ServletContextHandler.Initializer(context, new org.jboss.weld.environment.servlet.EnhancedListener())); break; } @@ -190,8 +190,8 @@ public class EmbeddedWeldTest server.setHandler(webapp); webapp.setInitParameter(CdiServletContainerInitializer.CDI_INTEGRATION_ATTRIBUTE, CdiDecoratingListener.MODE); - webapp.addServletContainerInitializer(new CdiServletContainerInitializer()); - webapp.addServletContainerInitializer(new org.jboss.weld.environment.servlet.EnhancedListener()); + webapp.addBean(new ServletContextHandler.Initializer(webapp, new CdiServletContainerInitializer())); + webapp.addBean(new ServletContextHandler.Initializer(webapp, new org.jboss.weld.environment.servlet.EnhancedListener())); String pkg = EmbeddedWeldTest.class.getPackage().getName(); webapp.getServerClassMatcher().add("-" + pkg + ".");