fixup! Upgrade to Jetty 12.0.24

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java

@@ -31,10 +31,10 @@
 import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
 import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.ConnectionFactory;
-import org.eclipse.jetty.server.ConnectionLimit;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.NetworkConnectionLimit;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.StatisticsHandler;
@@ -189,7 +189,7 @@ protected Server createJettyServer(JettyHttpHandlerAdapter servlet) {
 		server.setHandler(addHandlerWrappers(contextHandler));
 		JettyReactiveWebServerFactory.logger.info("Server initialized with port: " + port);
 		if (this.maxConnections > -1) {
-			server.addBean(new ConnectionLimit(this.maxConnections, server));
+			server.addBean(new NetworkConnectionLimit(this.maxConnections, server));
 		}
 		if (Ssl.isEnabled(getSsl())) {
 			customizeSsl(server, address);

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java

@@ -55,12 +55,12 @@
 import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
 import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.ConnectionFactory;
-import org.eclipse.jetty.server.ConnectionLimit;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.HttpCookieUtils;
+import org.eclipse.jetty.server.NetworkConnectionLimit;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
@@ -175,7 +175,7 @@ public WebServer getWebServer(ServletContextInitializer... initializers) {
 		server.setHandler(addHandlerWrappers(context));
 		this.logger.info("Server initialized with port: " + port);
 		if (this.maxConnections > -1) {
-			server.addBean(new ConnectionLimit(this.maxConnections, server.getConnectors()));
+			server.addBean(new NetworkConnectionLimit(this.maxConnections, server.getConnectors()));
 		}
 		if (Ssl.isEnabled(getSsl())) {
 			customizeSsl(server, address);

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java

@@ -23,8 +23,8 @@
 import java.util.List;
 
 import org.awaitility.Awaitility;
-import org.eclipse.jetty.server.ConnectionLimit;
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.NetworkConnectionLimit;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.junit.jupiter.api.Disabled;
@@ -145,9 +145,9 @@ void shouldApplyMaxConnections() {
 		factory.setMaxConnections(1);
 		this.webServer = factory.getWebServer(new EchoHandler());
 		Server server = ((JettyWebServer) this.webServer).getServer();
-		ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
+		NetworkConnectionLimit connectionLimit = server.getBean(NetworkConnectionLimit.class);
 		assertThat(connectionLimit).isNotNull();
-		assertThat(connectionLimit.getMaxConnections()).isOne();
+		assertThat(connectionLimit.getMaxNetworkConnectionCount()).isOne();
 	}
 
 	@Test

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java

@@ -48,9 +48,9 @@
 import org.eclipse.jetty.ee10.webapp.Configuration;
 import org.eclipse.jetty.ee10.webapp.WebAppContext;
 import org.eclipse.jetty.server.AbstractConnector;
-import org.eclipse.jetty.server.ConnectionLimit;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.NetworkConnectionLimit;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
@@ -562,9 +562,9 @@ void shouldApplyMaxConnections() {
 		factory.setMaxConnections(1);
 		this.webServer = factory.getWebServer();
 		Server server = ((JettyWebServer) this.webServer).getServer();
-		ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
+		NetworkConnectionLimit connectionLimit = server.getBean(NetworkConnectionLimit.class);
 		assertThat(connectionLimit).isNotNull();
-		assertThat(connectionLimit.getMaxConnections()).isOne();
+		assertThat(connectionLimit.getMaxNetworkConnectionCount()).isOne();
 	}
 
 	@Test
@@ -574,7 +574,7 @@ void shouldApplyMaxConnectionsToConnectors() {
 		this.webServer = factory.getWebServer();
 		Server server = ((JettyWebServer) this.webServer).getServer();
 		assertThat(server.getConnectors()).isEmpty();
-		ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
+		NetworkConnectionLimit connectionLimit = server.getBean(NetworkConnectionLimit.class);
 		assertThat(connectionLimit).extracting("_connectors")
 			.asInstanceOf(InstanceOfAssertFactories.list(AbstractConnector.class))
 			.hasSize(1);