chore(web): upgrade to Jetty 12.0.0.alpha3

Also refactor virtual thread ExecutorService handling and integration
tests.

3 files changed, 55 insertions, 22 deletions

diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
index 960eef71..f49f46ee 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java
@@ -11,7 +11,6 @@ import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.ee10.servlet.SessionHandler;
 import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.util.VirtualThreads;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.slf4j.Logger;
@@ -44,13 +43,7 @@ public class ServerLauncher {
         private final Server server;
 
         public ServerLauncher(InetSocketAddress bindAddress, String[] allowedOrigins, String webSocketUrl) {
-                server = new Server(bindAddress);
-                enableVirtualThreads(server);
-                if (server.getThreadPool() instanceof VirtualThreads.Configurable virtualThreadsConfigurable) {
-                        // Change this to setVirtualThreadsExecutor once
-                        // https://github.com/eclipse/jetty.project/commit/83154b4ffe4767ef44981598d6c26e6a5d32e57c gets released.
-                        virtualThreadsConfigurable.setUseVirtualThreads(VirtualThreads.areSupported());
-                }
+                server = VirtualThreadUtils.newServerWithVirtualThreadsThreadPool("jetty", bindAddress);
                 var handler = new ServletContextHandler();
                 addSessionHandler(handler);
                 addProblemServlet(handler, allowedOrigins);
@@ -150,14 +143,6 @@ public class ServerLauncher {
                 }
         }
 
-        public static void enableVirtualThreads(Server server) {
-                if (server.getThreadPool() instanceof VirtualThreads.Configurable virtualThreadsConfigurable) {
-                        // Change this to setVirtualThreadsExecutor once
-                        // https://github.com/eclipse/jetty.project/commit/83154b4ffe4767ef44981598d6c26e6a5d32e57c gets released.
-                        virtualThreadsConfigurable.setUseVirtualThreads(VirtualThreads.areSupported());
-                }
-        }
-
         private static String getListenAddress() {
                 var listenAddress = System.getenv("LISTEN_ADDRESS");
                 if (listenAddress == null) {
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/VirtualThreadUtils.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/VirtualThreadUtils.java
new file mode 100644
index 00000000..a055e755
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/VirtualThreadUtils.java
@@ -0,0 +1,52 @@
+package tools.refinery.language.web;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.util.thread.ThreadPool;
+
+import java.net.InetSocketAddress;
+import java.time.Duration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public final class VirtualThreadUtils {
+        private VirtualThreadUtils() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static ExecutorService newNamedVirtualThreadsExecutor(String name) {
+                // Based on
+                // https://github.com/eclipse/jetty.project/blob/83154b4ffe4767ef44981598d6c26e6a5d32e57c/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml
+                return Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
+                                .allowSetThreadLocals(true)
+                                .inheritInheritableThreadLocals(false)
+                                .name(name + "-virtual-", 0)
+                                .factory());
+        }
+
+        public static ThreadPool newThreadPoolWithVirtualThreadsExecutor(String name) {
+                // Based on
+                // https://github.com/eclipse/jetty.project/blob/83154b4ffe4767ef44981598d6c26e6a5d32e57c/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml
+                int timeout = (int) Duration.ofMinutes(1).toMillis();
+                var threadPool = new QueuedThreadPool(200, 10, timeout, -1, null, null);
+                threadPool.setName(name);
+                threadPool.setDetailedDump(false);
+                threadPool.setVirtualThreadsExecutor(newNamedVirtualThreadsExecutor(name));
+                return threadPool;
+        }
+
+        public static Server newServerWithVirtualThreadsThreadPool(String name, InetSocketAddress listenAddress) {
+                var server = new Server(newThreadPoolWithVirtualThreadsExecutor(name));
+                var connector = new ServerConnector(server);
+                try {
+                        connector.setHost(listenAddress.getHostName());
+                        connector.setPort(listenAddress.getPort());
+                        server.addConnector(connector);
+                } catch (Exception e) {
+                        connector.close();
+                        throw e;
+                }
+                return server;
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/VirtualThreadExecutorServiceProvider.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/VirtualThreadExecutorServiceProvider.java
index ead98927..abbcbd53 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/VirtualThreadExecutorServiceProvider.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/VirtualThreadExecutorServiceProvider.java
@@ -1,9 +1,9 @@
 package tools.refinery.language.web.xtext;
 
 import org.eclipse.xtext.ide.ExecutorServiceProvider;
+import tools.refinery.language.web.VirtualThreadUtils;
 
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public class VirtualThreadExecutorServiceProvider extends ExecutorServiceProvider {
         private static final String THREAD_POOL_NAME = "xtextWeb";
@@ -11,10 +11,6 @@ public class VirtualThreadExecutorServiceProvider extends ExecutorServiceProvide
         @Override
         protected ExecutorService createInstance(String key) {
                 var name = key == null ? THREAD_POOL_NAME : THREAD_POOL_NAME + "-" + key;
-                return Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
-                                .allowSetThreadLocals(true)
-                                .inheritInheritableThreadLocals(false)
-                                .name(name + "-", 0)
-                                .factory());
+                return VirtualThreadUtils.newNamedVirtualThreadsExecutor(name);
         }
 }