Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

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

@@ -30,6 +30,7 @@ import org.eclipse.jetty.deploy.PropertiesConfigurationManager;
 import org.eclipse.jetty.deploy.bindings.DebugListenerBinding;
 import org.eclipse.jetty.deploy.providers.WebAppProvider;
 import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.io.ConnectionStatistics;
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.plus.webapp.EnvConfiguration;
 import org.eclipse.jetty.plus.webapp.PlusConfiguration;
@@ -45,7 +46,6 @@ import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.LowResourceMonitor;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnectionStatistics;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -171,7 +171,7 @@ public class LikeJettyXml
         StatisticsHandler stats = new StatisticsHandler();
         stats.setHandler(server.getHandler());
         server.setHandler(stats);
-        ServerConnectionStatistics.addToAllConnectors(server);
+        server.addBeanToAllConnectors(new ConnectionStatistics());
 
         // === Rewrite Handler
         RewriteHandler rewrite = new RewriteHandler();

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

@@ -20,9 +20,9 @@ package org.eclipse.jetty.embedded;
 
 import java.lang.management.ManagementFactory;
 
+import org.eclipse.jetty.io.ConnectionStatistics;
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnectionStatistics;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 
@@ -45,7 +45,7 @@ public class OneServletContextJmxStats
         context.addServlet(DefaultServlet.class, "/");
 
         // Add Connector Statistics tracking to all connectors
-        ServerConnectionStatistics.addToAllConnectors(server);
+        server.addBeanToAllConnectors(new ConnectionStatistics());
         return server;
     }
 

jetty-server/src/main/config/etc/jetty-stats.xml

@@ -12,7 +12,9 @@
       </New>
     </Arg>
   </Call>
-  <Call class="org.eclipse.jetty.server.ServerConnectionStatistics" name="addToAllConnectors">
-    <Arg><Ref refid="Server"/></Arg>
+  <Call name="addBeanToAllConnectors">
+    <Arg>
+      <New class="org.eclipse.jetty.io.ConnectionStatistics"/>
+    </Arg>
   </Call>
 </Configure>

jetty-server/src/main/java/org/eclipse/jetty/server/Server.java

@@ -43,6 +43,7 @@ import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.http.PreEncodedHttpField;
+import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
@@ -235,8 +236,8 @@ public class Server extends HandlerWrapper implements Attributes
         if (connector.getServer() != this)
             throw new IllegalArgumentException("Connector " + connector +
                 " cannot be shared among server " + connector.getServer() + " and server " + this);
-        if (_connectors.add(connector))
-            addBean(connector);
+        _connectors.add(connector);
+        addBean(connector);
     }
 
     /**
@@ -276,6 +277,20 @@ public class Server extends HandlerWrapper implements Attributes
             _connectors.addAll(Arrays.asList(connectors));
     }
 
+    /**
+     * Add a bean to all connectors on the server.
+     * If the bean is an instance of {@link Connection.Listener} it will also be
+     * registered as a listener on all connections accepted by the connectors.
+     * @param bean the bean to be added.
+     */
+    public void addBeanToAllConnectors(Object bean)
+    {
+        for (Connector connector : getConnectors())
+        {
+            connector.addBean(bean);
+        }
+    }
+
     /**
      * @return Returns the threadPool.
      */

jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnectionStatistics.java

@@ -19,16 +19,19 @@
 package org.eclipse.jetty.server;
 
 import org.eclipse.jetty.io.ConnectionStatistics;
-import org.eclipse.jetty.util.component.Container;
 
+@Deprecated
 public class ServerConnectionStatistics extends ConnectionStatistics
 {
+    /**
+     * @param server the server to use to add {@link ConnectionStatistics} to all Connectors.
+     * @deprecated use {@link Server#addBeanToAllConnectors(Object)} instead.
+     */
     public static void addToAllConnectors(Server server)
     {
         for (Connector connector : server.getConnectors())
         {
-            if (connector instanceof Container)
-                ((Container)connector).addBean(new ConnectionStatistics());
+            connector.addBean(new ConnectionStatistics());
         }
     }
 }