Use HandlerList instead of HandlerCollection

examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServer.java

@@ -19,11 +19,10 @@
 package org.eclipse.jetty.embedded;
 
 import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 
 public class ExampleServer
@@ -41,9 +40,7 @@ public static Server createServer(int port)
         context.addServlet(HelloServlet.class, "/hello");
         context.addServlet(AsyncEchoServlet.class, "/echo/*");
 
-        HandlerCollection handlers = new HandlerCollection();
-        handlers.setHandlers(new Handler[]{context, new DefaultHandler()});
-        server.setHandler(handlers);
+        server.setHandler(new HandlerList(context, new DefaultHandler()));
 
         return server;
     }

examples/embedded/src/main/java/org/eclipse/jetty/embedded/FastFileServer.java

@@ -31,7 +31,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
@@ -62,12 +61,9 @@ public static Server createServer(int port, File resourceBase)
     {
         Server server = new Server(port);
 
-        HandlerList handlers = new HandlerList();
-        handlers.setHandlers(new Handler[]{
+        server.setHandler(new HandlerList(
             new FastFileHandler(resourceBase),
-            new DefaultHandler()
-        });
-        server.setHandler(handlers);
+            new DefaultHandler()));
         return server;
     }
 

examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java

@@ -21,7 +21,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
@@ -53,9 +52,7 @@ public static Server createServer(int port, Resource baseResource) throws Except
         resourceHandler.setBaseResource(baseResource);
 
         // Add the ResourceHandler to the server.
-        HandlerList handlers = new HandlerList();
-        handlers.setHandlers(new Handler[]{resourceHandler, new DefaultHandler()});
-        server.setHandler(handlers);
+        server.setHandler(new HandlerList(resourceHandler, new DefaultHandler()));
 
         return server;
     }

examples/embedded/src/main/java/org/eclipse/jetty/embedded/JarServer.java

@@ -51,10 +51,7 @@ public static Server createServer(int port) throws Exception
         context.setBaseResource(base);
         context.addServlet(new ServletHolder(new DefaultServlet()), "/");
 
-        HandlerList handlers = new HandlerList();
-        handlers.addHandler(context);
-        handlers.addHandler(new DefaultHandler());
-        server.setHandler(handlers);
+        server.setHandler(new HandlerList(context, new DefaultHandler()));
         return server;
     }
 

examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java

@@ -40,7 +40,6 @@
 import org.eclipse.jetty.server.AsyncRequestLogWriter;
 import org.eclipse.jetty.server.CustomRequestLog;
 import org.eclipse.jetty.server.DebugListener;
-import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.LowResourceMonitor;
@@ -51,7 +50,7 @@
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.StatisticsHandler;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
@@ -105,10 +104,8 @@ public static Server createServer(int port, int securePort, boolean addDebugList
         // httpConfig.addCustomizer(new ForwardedRequestCustomizer());
 
         // Handler Structure
-        HandlerCollection handlers = new HandlerCollection();
         ContextHandlerCollection contexts = new ContextHandlerCollection();
-        handlers.setHandlers(new Handler[]{contexts, new DefaultHandler()});
-        server.setHandler(handlers);
+        server.setHandler(new HandlerList(contexts, new DefaultHandler()));
 
         // === jetty-jmx.xml ===
         MBeanContainer mbContainer = new MBeanContainer(

examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java

@@ -124,7 +124,7 @@ public static Server createServer(int port) throws IOException
         CustomRequestLog ncsaLog = new CustomRequestLog(requestLogFile.getAbsolutePath());
         server.setRequestLog(ncsaLog);
 
-        // create the handler collections
+        // create the handlers list
         HandlerList handlers = new HandlerList();
 
         // wrap contexts around specific handlers

examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java

@@ -50,11 +50,8 @@ public static Server createServer(int port)
     {
         Server server = new Server(port);
 
-        HandlerList handlers = new HandlerList();
-
         ServletContextHandler context = new ServletContextHandler();
         context.setContextPath("/");
-        handlers.addHandler(context);
 
         // Enable javax.websocket configuration for the context
         JavaxWebSocketServletContainerInitializer.configure(context,
@@ -65,8 +62,7 @@ public static Server createServer(int port)
             }
         );
 
-        handlers.addHandler(new DefaultHandler());
-        server.setHandler(handlers);
+        server.setHandler(new HandlerList(context, new DefaultHandler()));
 
         return server;
     }

examples/embedded/src/main/resources/exampleserver.xml

@@ -25,7 +25,7 @@
   </New>
 
   <Set name="handler">
-    <New class="org.eclipse.jetty.server.handler.HandlerCollection">
+    <New class="org.eclipse.jetty.server.handler.HandlerList">
       <Set name="handlers">
         <Array type="org.eclipse.jetty.server.Handler">
           <Item>

examples/embedded/src/main/resources/jetty-otherserver.xml

@@ -3,7 +3,7 @@
 
 <Configure id="OtherServer" class="org.eclipse.jetty.server.Server">
     <Set name="handler">
-      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerList">
         <Set name="handlers">
          <Array type="org.eclipse.jetty.server.Handler">
            <Item>

jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java

@@ -30,7 +30,6 @@
 import org.eclipse.jetty.ant.utils.ServerProxy;
 import org.eclipse.jetty.ant.utils.TaskLog;
 import org.eclipse.jetty.security.LoginService;
-import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.RequestLog;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -39,6 +38,7 @@
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.util.Scanner;
 import org.eclipse.jetty.util.resource.PathResource;
 import org.eclipse.jetty.util.resource.Resource;
@@ -406,23 +406,15 @@ private void configureHandlers()
         if (requestLog != null)
             server.setRequestLog(requestLog);
 
-        contexts = (ContextHandlerCollection)server
-            .getChildHandlerByClass(ContextHandlerCollection.class);
+        contexts = server.getChildHandlerByClass(ContextHandlerCollection.class);
         if (contexts == null)
         {
             contexts = new ContextHandlerCollection();
-            HandlerCollection handlers = (HandlerCollection)server
-                .getChildHandlerByClass(HandlerCollection.class);
+            HandlerCollection handlers = server.getChildHandlerByClass(HandlerCollection.class);
             if (handlers == null)
-            {
-                handlers = new HandlerCollection();
-                server.setHandler(handlers);
-                handlers.setHandlers(new Handler[]{contexts, new DefaultHandler()});
-            }
+                server.setHandler(new HandlerList(contexts, new DefaultHandler()));
             else
-            {
                 handlers.addHandler(contexts);
-            }
         }
 
         //if there are any extra contexts to deploy

jetty-deploy/src/test/java/org/eclipse/jetty/deploy/BadAppDeployTest.java

@@ -29,7 +29,7 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.toolchain.test.FS;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
@@ -69,7 +69,7 @@ public void testBadAppThrowOnUnavailableTrueXmlOrder() throws Exception
            It is important that this Order be maintained for an accurate test case.
            ### BEAN: QueuedThreadPool[qtp1327763628]@4f2410ac{STOPPED,8<=0<=200,i=0,r=-1,q=0}[NO_TRY]
            ### BEAN: ServerConnector@16f65612{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}
-           ### BEAN: HandlerCollection@5f150435{STOPPED}
+           ### BEAN: HandlerList@5f150435{STOPPED}
            ### BEAN: DeploymentManager@1c53fd30{STOPPED}
          */
 
@@ -79,10 +79,8 @@ public void testBadAppThrowOnUnavailableTrueXmlOrder() throws Exception
         server.addConnector(connector);
 
         ContextHandlerCollection contexts = new ContextHandlerCollection();
-        HandlerCollection handlers = new HandlerCollection();
-        handlers.addHandler(contexts);
-        handlers.addHandler(new DefaultHandler());
-        server.setHandler(handlers); // this should be done before addBean(deploymentManager)
+        // this should be done before addBean(deploymentManager)
+        server.setHandler(new HandlerList(contexts, new DefaultHandler()));
 
         DeploymentManager deploymentManager = new DeploymentManager();
         deploymentManager.setContexts(contexts);
@@ -121,7 +119,7 @@ public void testBadAppThrowOnUnavailableTrueEmbeddedOrder() throws Exception
            ### BEAN: QueuedThreadPool[qtp1530388690]@5b37e0d2{STOPPED,8<=0<=200,i=0,r=-1,q=0}[NO_TRY]
            ### BEAN: ServerConnector@5e265ba4{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}
            ### BEAN: DeploymentManager@3419866c{STOPPED}
-           ### BEAN: HandlerCollection@63e31ee{STOPPED}
+           ### BEAN: HandlerList@63e31ee{STOPPED}
          */
 
         server = new Server();
@@ -146,12 +144,11 @@ public void testBadAppThrowOnUnavailableTrueEmbeddedOrder() throws Exception
         webAppProvider.setMonitoredDirName(webappsDir.toString());
         webAppProvider.setScanInterval(1);
 
-        server.addBean(deploymentManager); // this should be done before setHandler(handlers)
+        // this must be done before setHandler(handlers)
+        server.addBean(deploymentManager);
 
-        HandlerCollection handlers = new HandlerCollection();
-        handlers.addHandler(contexts);
-        handlers.addHandler(new DefaultHandler());
-        server.setHandler(handlers); // this should be done after addBean(deploymentManager)
+        // this must be done after addBean(deploymentManager)
+        server.setHandler(new HandlerList(contexts, new DefaultHandler()));
 
         assertTimeoutPreemptively(ofSeconds(10), () ->
         {

jetty-deploy/src/test/resources/jetty.xml

@@ -106,7 +106,7 @@
     <!-- RequestLogHandler after the default handler                 -->
     <!-- =========================================================== -->
     <Set name="handler">
-      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerList">
         <Set name="handlers">
          <Array type="org.eclipse.jetty.server.Handler">
            <Item>

jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java

@@ -24,11 +24,10 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsServer;
 import com.sun.net.httpserver.spi.HttpServerProvider;
-import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.util.thread.ThreadPool;
 
@@ -57,8 +56,7 @@ public HttpServer createHttpServer(InetSocketAddress addr, int backlog)
             ThreadPool threadPool = new DelegatingThreadPool(new QueuedThreadPool());
             server = new Server(threadPool);
 
-            HandlerCollection handlerCollection = new HandlerCollection();
-            handlerCollection.setHandlers(new Handler[]{new ContextHandlerCollection(), new DefaultHandler()});
+            HandlerList handlerCollection = new HandlerList(new ContextHandlerCollection(), new DefaultHandler());
             server.setHandler(handlerCollection);
 
             shared = false;