8355370: Include server name in HTTP test server thread names to improve diagnostics

Reviewed-by: rschmelter
Backport-of: 7d9a43839ad190a53efdbcc7afd1728760c14e21

Author: GoeLin

test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java

@@ -765,7 +765,7 @@ public static abstract class HttpTestContext {
     /**
      * A version agnostic adapter class for HTTP Servers.
      */
-    public static abstract class HttpTestServer {
+    abstract class HttpTestServer implements AutoCloseable {
         private static final class ServerLogging {
             private static final Logger logger = Logger.getLogger("com.sun.net.httpserver");
             static void enableLogging() {
@@ -782,6 +782,11 @@ static void enableLogging() {
         public abstract Version getVersion();
         public abstract void setRequestApprover(final Predicate<String> approver);
 
+        @Override
+        public void close() throws Exception {
+            stop();
+        }
+
         public String serverAuthority() {
             InetSocketAddress address = getAddress();
             String hostString = address.getHostString();
@@ -971,6 +976,13 @@ public void stop() {
                 System.out.println("Http2TestServerImpl: stop");
                 impl.stop();
             }
+
+            @Override
+            public void close() throws Exception {
+                System.out.println("Http2TestServerImpl: close");
+                impl.close();
+            }
+
             @Override
             public HttpTestContext addHandler(HttpTestHandler handler, String path) {
                 System.out.println("Http2TestServerImpl[" + getAddress()

test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLServerSocket;
+
 import jdk.internal.net.http.frame.ErrorFrame;
 
 /**
@@ -64,24 +65,22 @@ public class Http2TestServer implements AutoCloseable {
     // request approver which takes the server connection key as the input
     private volatile Predicate<String> newRequestApprover;
 
-    private static ThreadFactory defaultThreadFac =
-        (Runnable r) -> {
+    private static ExecutorService createExecutor(String name) {
+        String threadNamePrefix = "%s-pool".formatted(name);
+        ThreadFactory threadFactory = (Runnable r) -> {
             Thread t = new Thread(r);
-            t.setName("Test-server-pool");
+            t.setName(threadNamePrefix);
             return t;
         };
-
-
-    private static ExecutorService getDefaultExecutor() {
-        return Executors.newCachedThreadPool(defaultThreadFac);
+        return Executors.newCachedThreadPool(threadFactory);
     }
 
     public Http2TestServer(String serverName, boolean secure, int port) throws Exception {
-        this(serverName, secure, port, getDefaultExecutor(), 50, null, null);
+        this(serverName, secure, port, null, 50, null, null);
     }
 
     public Http2TestServer(boolean secure, int port) throws Exception {
-        this(null, secure, port, getDefaultExecutor(), 50, null, null);
+        this(null, secure, port, null, 50, null, null);
     }
 
     public InetSocketAddress getAddress() {
@@ -197,7 +196,7 @@ public Http2TestServer(InetAddress localAddr,
             server = initPlaintext(port, backlog);
         }
         this.secure = secure;
-        this.exec = exec == null ? getDefaultExecutor() : exec;
+        this.exec = exec == null ? createExecutor(name) : exec;
         this.handlers = Collections.synchronizedMap(new HashMap<>());
         this.properties = properties == null ? new Properties() : properties;
         this.connections = ConcurrentHashMap.newKeySet();