From f7595f3e86b203fdaf9f704564fef4987cbe1a35 Mon Sep 17 00:00:00 2001
From: Nipuni Hewage <hewage@maple.cs.ualberta.ca>
Date: Sat, 1 Jun 2024 06:25:17 -0600
Subject: [PATCH] added transformations

---
 conf/server.xml                                      |  6 +++---
 .../catalina/tribes/transport/ReceiverBase.java      |  2 +-
 .../catalina/tribes/transport/nio/NioReceiver.java   |  2 +-
 .../catalina/tribes/util/TcclThreadFactory.java      |  2 +-
 java/org/apache/juli/FileHandler.java                |  2 +-
 .../apache/tomcat/dbcp/pool2/impl/EvictionTimer.java |  2 +-
 .../org/apache/tomcat/util/net/AbstractEndpoint.java |  2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java     |  2 +-
 .../tomcat/websocket/AsyncChannelGroupUtil.java      |  2 +-
 .../tomcat/websocket/AsyncChannelWrapperSecure.java  |  2 +-
 .../tomcat/jdbc/test/AlternateUsernameTest.java      | 12 ++++++++----
 .../http/TestHttpServletResponseSendError.java       |  2 +-
 .../TesterDigestAuthenticatorPerformance.java        |  2 +-
 .../catalina/connector/TestCoyoteOutputStream.java   |  2 +-
 test/org/apache/catalina/tribes/TesterMulticast.java |  4 ++--
 test/org/apache/catalina/tribes/demos/LoadTest.java  |  2 +-
 .../group/interceptors/TestEncryptInterceptor.java   |  2 +-
 .../group/interceptors/TestOrderInterceptor.java     |  2 +-
 .../apache/coyote/http11/TestHttp11Processor.java    |  2 +-
 .../util/net/openssl/ciphers/TesterOpenSSL.java      |  4 ++--
 .../tomcat/websocket/TesterFirehoseServer.java       |  2 +-
 .../TestWsRemoteEndpointImplServerDeadlock.java      |  2 +-
 webapps/examples/WEB-INF/classes/async/Async0.java   |  2 +-
 webapps/examples/WEB-INF/classes/async/Async1.java   |  2 +-
 webapps/examples/WEB-INF/classes/async/Async2.java   |  2 +-
 .../examples/WEB-INF/classes/async/Stockticker.java  |  2 +-
 26 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/conf/server.xml b/conf/server.xml
index 72bda52c93c7..e9db9911e19d 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -19,7 +19,7 @@
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
  -->
-<Server port="8005" shutdown="SHUTDOWN">
+<Server port="8055" shutdown="SHUTDOWN">
   <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />
@@ -65,9 +65,9 @@
          AJP  Connector: /docs/config/ajp.html
          Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
     -->
-    <Connector port="8080" protocol="HTTP/1.1"
+    <Connector port="8085" protocol="HTTP/1.1"
                connectionTimeout="20000"
-               redirectPort="8443" />
+               redirectPort="8445" />
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
index 22be59a54497..047e74436b0e 100644
--- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java
+++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
@@ -594,7 +594,7 @@ class TaskThreadFactory implements ThreadFactory {
 
         @Override
         public Thread newThread(Runnable r) {
-            Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement());
+            Thread t  = Thread.ofVirtual().name(namePrefix + threadNumber.getAndIncrement()).unstarted(r);
             t.setDaemon(daemon);
             t.setPriority(Thread.NORM_PRIORITY);
             return t;
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
index 4af074bf25bb..b7491fd50b8d 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
@@ -94,7 +94,7 @@ public void start() throws IOException {
             if (getChannel().getName() != null) {
                 channelName = "[" + getChannel().getName() + "]";
             }
-            Thread t = new Thread(this, "NioReceiver" + channelName);
+            Thread t  = Thread.ofVirtual().name("NioReceiver" + channelName).unstarted(this);
             t.setDaemon(true);
             t.start();
         } catch (Exception x) {
diff --git a/java/org/apache/catalina/tribes/util/TcclThreadFactory.java b/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
index 9d52fc363cef..fb193263f675 100644
--- a/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
+++ b/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
@@ -43,7 +43,7 @@ public TcclThreadFactory(String namePrefix) {
 
     @Override
     public Thread newThread(Runnable r) {
-        final Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement());
+        final Thread t  = Thread.ofVirtual().name(namePrefix + threadNumber.getAndIncrement()).unstarted(r);
         t.setContextClassLoader(this.getClass().getClassLoader());
         t.setDaemon(true);
         return t;
diff --git a/java/org/apache/juli/FileHandler.java b/java/org/apache/juli/FileHandler.java
index 24796d80773f..f47a43900535 100644
--- a/java/org/apache/juli/FileHandler.java
+++ b/java/org/apache/juli/FileHandler.java
@@ -532,7 +532,7 @@ public ThreadFactory(final String namePrefix) {
 
         @Override
         public Thread newThread(Runnable r) {
-            Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement());
+            Thread t  = Thread.ofVirtual().name(namePrefix + threadNumber.getAndIncrement()).unstarted(r);
             // Threads should not have as context classloader a webapp classloader
             t.setContextClassLoader(ThreadFactory.class.getClassLoader());
             t.setDaemon(true);
diff --git a/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java b/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
index 3c40605c783b..85fff1fd5b89 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
@@ -53,7 +53,7 @@ private static class EvictorThreadFactory implements ThreadFactory {
 
         @Override
         public Thread newThread(final Runnable runnable) {
-            final Thread thread = new Thread(null, runnable, "commons-pool-evictor");
+            final Thread thread  = Thread.ofVirtual().name("commons-pool-evictor").unstarted(runnable);
             thread.setDaemon(true); // POOL-363 - Required for applications using Runtime.addShutdownHook().
             thread.setContextClassLoader(EvictorThreadFactory.class.getClassLoader());
             return thread;
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 29cbef3b8053..cc410a6afe25 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1516,7 +1516,7 @@ protected void startAcceptorThread() {
         acceptor = new Acceptor<>(this);
         String threadName = getName() + "-Acceptor";
         acceptor.setThreadName(threadName);
-        Thread t = new Thread(acceptor, threadName);
+        Thread t  = Thread.ofVirtual().name(threadName).unstarted(acceptor);
         t.setPriority(getAcceptorThreadPriority());
         t.setDaemon(getDaemon());
         t.start();
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 7cc04851704b..633f60cbe3f9 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -285,7 +285,7 @@ public void startInternal() throws Exception {
 
             // Start poller thread
             poller = new Poller();
-            Thread pollerThread = new Thread(poller, getName() + "-Poller");
+            Thread pollerThread  = Thread.ofVirtual().name(getName() + "-Poller").unstarted(poller);
             pollerThread.setPriority(threadPriority);
             pollerThread.setDaemon(true);
             pollerThread.start();
diff --git a/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java b/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java
index 2b92c9c9b308..fc0191577c33 100644
--- a/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java
+++ b/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java
@@ -100,7 +100,7 @@ private static class AsyncIOThreadFactory implements ThreadFactory {
 
         @Override
         public Thread newThread(final Runnable r) {
-            Thread t = new Thread(r);
+            Thread t  = Thread.ofVirtual().unstarted(r);
             t.setName("WebSocketClient-AsyncIO-" + count.incrementAndGet());
             t.setContextClassLoader(this.getClass().getClassLoader());
             t.setDaemon(true);
diff --git a/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java b/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
index 6836ba0866d0..cc18cd3b54f1 100644
--- a/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
+++ b/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
@@ -545,7 +545,7 @@ private static class SecureIOThreadFactory implements ThreadFactory {
 
         @Override
         public Thread newThread(Runnable r) {
-            Thread t = new Thread(r);
+            Thread t  = Thread.ofVirtual().unstarted(r);
             t.setName("WebSocketClient-SecureIO-" + count.incrementAndGet());
             // No need to set the context class loader. The threads will be
             // cleaned up when the connection is closed.
diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
index a3f2ab380fdb..ac34a6f985ec 100644
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
@@ -31,6 +31,7 @@
 
 import org.apache.tomcat.jdbc.test.driver.Connection;
 import org.apache.tomcat.jdbc.test.driver.Driver;
+import java.util.concurrent.ThreadFactory;
 
 public class AlternateUsernameTest extends DefaultTestCase {
 
@@ -42,6 +43,8 @@ public void testUsernameCompare() throws Exception {
     }
 
     private void testUsername(boolean allowUsernameChange) throws Exception {
+ThreadFactory threadFactory = Thread.ofVirtual().factory();
+
         long start = System.currentTimeMillis();
         int withoutuser =10;
         int withuser = withoutuser;
@@ -58,7 +61,7 @@ private void testUsername(boolean allowUsernameChange) throws Exception {
             runners[i] = allowUsernameChange?with:without;
             runners[i+withuser] = without;
         }
-        ExecutorService svc = Executors.newFixedThreadPool(withuser+withoutuser);
+        ExecutorService svc = Executors.newThreadPerTaskExecutor(threadFactory);
         List<Future<TestResult>> results =  svc.invokeAll(Arrays.asList(runners));
         int failures = 0;
         int total = 0;
@@ -74,11 +77,12 @@ private void testUsername(boolean allowUsernameChange) throws Exception {
         this.datasource.close();
         System.out.println("Nr of connect() calls:"+Driver.connectCount.get());
         System.out.println("Nr of disconnect() calls:"+Driver.disconnectCount.get());
-        System.out.println("Nr of iterations:"+total+" over "+(stop-start)+ " ms.");
+        System.out.println("Nr of iterations:"+total+" over "+(stop-start)+ " ms.");}
 
-    }
+    
 
-    @Test
+    
+@Test
     public void testUsernameCompareAgain() throws Exception {
         testUsernameCompare();
     }
diff --git a/test/jakarta/servlet/http/TestHttpServletResponseSendError.java b/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
index bc1cc0a3f6f5..1d494d581bfa 100644
--- a/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
+++ b/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
@@ -240,7 +240,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             if (useStart) {
                 ac.start(r);
             } else {
-                Thread t = new Thread(r);
+                Thread t  = Thread.ofVirtual().unstarted(r);
                 t.start();
             }
 
diff --git a/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java b/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
index ad417f2e5cac..e453f23c8761 100644
--- a/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
+++ b/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
@@ -74,7 +74,7 @@ public void doTest(int threadCount, int requestCount) throws Exception {
         for (int i = 0; i < threadCount; i++) {
             runnables[i] =
                     new TesterRunnable(authenticator, nonce, requestCount);
-            threads[i] = new Thread(runnables[i]);
+            threads[i] = Thread.ofVirtual().unstarted(runnables[i]);
         }
 
         long start = System.currentTimeMillis();
diff --git a/test/org/apache/catalina/connector/TestCoyoteOutputStream.java b/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
index d808db76f706..795d573ab9e9 100644
--- a/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
+++ b/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
@@ -187,7 +187,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             if (useContainerThreadToSetListener) {
                 asyncCtxt.start(task);
             } else {
-                Thread t = new Thread(task);
+                Thread t  = Thread.ofVirtual().unstarted(task);
                 t.start();
             }
         }
diff --git a/test/org/apache/catalina/tribes/TesterMulticast.java b/test/org/apache/catalina/tribes/TesterMulticast.java
index c39dbb894195..82664965316b 100644
--- a/test/org/apache/catalina/tribes/TesterMulticast.java
+++ b/test/org/apache/catalina/tribes/TesterMulticast.java
@@ -58,13 +58,13 @@ public class TesterMulticast {
     public static void main(String[] args) throws Exception {
         // Start Rx Thread
         Rx rx = new Rx();
-        Thread rxThread = new Thread(rx);
+        Thread rxThread  = Thread.ofVirtual().unstarted(rx);
         rxThread.setDaemon(true);
         rxThread.start();
 
         // Start Tx Thread
         Tx tx = new Tx();
-        Thread txThread = new Thread(tx);
+        Thread txThread  = Thread.ofVirtual().unstarted(tx);
         txThread.setDaemon(true);
         txThread.start();
 
diff --git a/test/org/apache/catalina/tribes/demos/LoadTest.java b/test/org/apache/catalina/tribes/demos/LoadTest.java
index 293eea1f2c21..747a98638df6 100644
--- a/test/org/apache/catalina/tribes/demos/LoadTest.java
+++ b/test/org/apache/catalina/tribes/demos/LoadTest.java
@@ -350,7 +350,7 @@ public static void main(String[] args) throws Exception {
         channel.start(startoptions);
         Runtime.getRuntime().addShutdownHook(new Shutdown(channel));
         while (threads > 1) {
-            Thread t = new Thread(test);
+            Thread t  = Thread.ofVirtual().unstarted(test);
             t.setDaemon(true);
             t.start();
             threads--;
diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
index 36f3b797ef4f..56d3dd71d8dc 100644
--- a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
+++ b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
@@ -437,7 +437,7 @@ public void run() {
 
         Thread[] threads = new Thread[numThreads];
         for(int i=0; i<numThreads; ++i) {
-            threads[i] = new Thread(job);
+            threads[i] = Thread.ofVirtual().unstarted(job);
             threads[i].setName("Message-Thread-" + i);
         }
 
diff --git a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
index 66d74b1ce045..267509a0fbc1 100644
--- a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
+++ b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
@@ -131,7 +131,7 @@ public void run() {
         };
         Thread[] threads = new Thread[5];
         for (int i=0;i<threads.length;i++) {
-            threads[i] = new Thread(run);
+            threads[i] = Thread.ofVirtual().unstarted(run);
         }
         for (Thread thread : threads) {
             thread.start();
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java b/test/org/apache/coyote/http11/TestHttp11Processor.java
index d2f07f7fc003..9203bc3dc646 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -298,7 +298,7 @@ public void run() {
                 }
             }
         };
-        Thread t = new Thread(send);
+        Thread t  = Thread.ofVirtual().unstarted(send);
         t.start();
 
         // Sleep for 1500 ms which should mean the all of request 1 has been
diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index 0df4cb26bba7..9478b421cf8d 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -355,11 +355,11 @@ private static String executeOpenSSLCommand(String... args) throws IOException {
         InputStreamToText stdout = new InputStreamToText(p.getInputStream());
         InputStreamToText stderr = new InputStreamToText(p.getErrorStream());
 
-        Thread t1 = new Thread(stdout);
+        Thread t1  = Thread.ofVirtual().unstarted(stdout);
         t1.setName("OpenSSL stdout reader");
         t1.start();
 
-        Thread t2 = new Thread(stderr);
+        Thread t2  = Thread.ofVirtual().unstarted(stderr);
         t2.setName("OpenSSL stderr reader");
         t2.start();
 
diff --git a/test/org/apache/tomcat/websocket/TesterFirehoseServer.java b/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
index a903966c1292..156e5dfb6495 100644
--- a/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
+++ b/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
@@ -119,7 +119,7 @@ public void onMessage(Session session, String msg) throws IOException {
             if (inline) {
                 writer.doRun();
             } else {
-                Thread t = new Thread(writer);
+                Thread t  = Thread.ofVirtual().unstarted(writer);
                 t.start();
             }
         }
diff --git a/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServerDeadlock.java b/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServerDeadlock.java
index a3a0d10773f6..e66c1c8b975f 100644
--- a/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServerDeadlock.java
+++ b/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServerDeadlock.java
@@ -193,7 +193,7 @@ public void onOpen(Session session) {
             if (sendOnContainerThread) {
                 r.run();
             } else {
-                new Thread(r).start();
+                Thread.startVirtualThread(r);
             }
         }
 
diff --git a/webapps/examples/WEB-INF/classes/async/Async0.java b/webapps/examples/WEB-INF/classes/async/Async0.java
index a8d21a0d0eed..69803fafebd0 100644
--- a/webapps/examples/WEB-INF/classes/async/Async0.java
+++ b/webapps/examples/WEB-INF/classes/async/Async0.java
@@ -62,7 +62,7 @@ public void run() {
                     }
                 }
             };
-            Thread t = new Thread(run);
+            Thread t  = Thread.ofVirtual().unstarted(run);
             t.start();
         }
     }
diff --git a/webapps/examples/WEB-INF/classes/async/Async1.java b/webapps/examples/WEB-INF/classes/async/Async1.java
index 746fec0ced03..2208b1c72d31 100644
--- a/webapps/examples/WEB-INF/classes/async/Async1.java
+++ b/webapps/examples/WEB-INF/classes/async/Async1.java
@@ -52,7 +52,7 @@ public void run() {
                 }
             }
         };
-        Thread t = new Thread(run);
+        Thread t  = Thread.ofVirtual().unstarted(run);
         t.start();
     }
 
diff --git a/webapps/examples/WEB-INF/classes/async/Async2.java b/webapps/examples/WEB-INF/classes/async/Async2.java
index efcc6bb687a3..3d62c0750044 100644
--- a/webapps/examples/WEB-INF/classes/async/Async2.java
+++ b/webapps/examples/WEB-INF/classes/async/Async2.java
@@ -58,7 +58,7 @@ public void run() {
                 }
             }
         };
-        Thread t = new Thread(run);
+        Thread t  = Thread.ofVirtual().unstarted(run);
         t.start();
     }
 
diff --git a/webapps/examples/WEB-INF/classes/async/Stockticker.java b/webapps/examples/WEB-INF/classes/async/Stockticker.java
index d3488f6442fb..693900178d20 100644
--- a/webapps/examples/WEB-INF/classes/async/Stockticker.java
+++ b/webapps/examples/WEB-INF/classes/async/Stockticker.java
@@ -31,7 +31,7 @@ public class Stockticker implements Runnable {
 
         public synchronized void start() {
             run = true;
-            ticker = new Thread(this);
+            ticker = Thread.ofVirtual().unstarted(this);
             ticker.setName("Ticker Thread");
             ticker.start();
         }