This method is equivalent to invoking @@ -85,7 +86,7 @@ public static ExecutorService newVirtualThreadPerTaskExecutor() { } /** - * Creates an Executor that starts a new virtual Thread on Java 21 + (or new platform thread on Java 8+) for each task. + * Creates an Executor that starts a new virtual Thread on Java 21+ (or new platform thread on Java 8+) for each task. * The number of threads created by the Executor is unbounded. * *
This method is equivalent to invoking @@ -96,7 +97,20 @@ public static ExecutorService newVirtualThreadPerTaskExecutor() { * @return a new executor that creates a new virtual Thread for each task */ public static ExecutorService newVirtualThreadPerTaskExecutor(ThreadCustomizer threadCustomizer) { - return getThreadProvider().newVirtualThreadPerTaskExecutor(threadCustomizer); + return getThreadProvider().newVirtualThreadPerTaskExecutor(threadCustomizer, null); + } + + /** + * Creates an Executor that starts a new virtual Thread on Java 21+ (or new platform thread on Java 8+) for each task. + * The number of threads created by the Executor is unbounded. + * + * @param threadFactory threadFactory to supply thread name, UncaughtExceptionHandler and ContextClassLoader. + * @return a new executor that creates a new virtual Thread for each task + */ + public static ExecutorService newVirtualThreadPerTaskExecutor(ThreadFactory threadFactory) { + Objects.requireNonNull(threadFactory); + ThreadCustomizer threadCustomizer = thread -> {}; + return getThreadProvider().newVirtualThreadPerTaskExecutor(threadCustomizer, threadFactory); } /** diff --git a/src/main/java/io/github/thunkware/vt/bridge/ThreadProvider.java b/src/main/java/io/github/thunkware/vt/bridge/ThreadProvider.java index 2e8851e..88654f2 100644 --- a/src/main/java/io/github/thunkware/vt/bridge/ThreadProvider.java +++ b/src/main/java/io/github/thunkware/vt/bridge/ThreadProvider.java @@ -111,10 +111,11 @@ public interface ThreadProvider { * that creates virtual threads. * * @param threadCustomizer ThreadCustomizer to customize new unstarted threads + * @param threadFactory ThreadFactory. can be null * @return a new executor that creates a new virtual Thread for each task */ @ConfigFeature(feature = NEW_VIRTUAL_THREAD_PER_TASK_EXECUTOR) - ExecutorService newVirtualThreadPerTaskExecutor(ThreadCustomizer threadCustomizer); + ExecutorService newVirtualThreadPerTaskExecutor(ThreadCustomizer threadCustomizer, ThreadFactory threadFactory); /** * Returns a builder for creating a platform {@code Thread} or {@code ThreadFactory} diff --git a/src/main/java/io/github/thunkware/vt/bridge/ThreadProvider8.java b/src/main/java/io/github/thunkware/vt/bridge/ThreadProvider8.java index 28b9b83..a198072 100644 --- a/src/main/java/io/github/thunkware/vt/bridge/ThreadProvider8.java +++ b/src/main/java/io/github/thunkware/vt/bridge/ThreadProvider8.java @@ -80,10 +80,11 @@ public ExecutorService newVirtualThreadPerTaskExecutor() { } @Override - public ExecutorService newVirtualThreadPerTaskExecutor(ThreadCustomizer threadCustomizer) { + public ExecutorService newVirtualThreadPerTaskExecutor(ThreadCustomizer threadCustomizer, ThreadFactory threadFactory) { config.enforceCompatibilityPolicy(NEW_VIRTUAL_THREAD_PER_TASK_EXECUTOR); - return newThreadPerTaskExecutor(threadCustomizer.asThreadFactory(this::unstartedVirtualThread)); + ThreadFactory actualFactory = threadFactory == null ? this::unstartedVirtualThread : threadFactory; + return newThreadPerTaskExecutor(threadCustomizer.asThreadFactory(actualFactory)); } @Override diff --git a/src/main/java21/io/github/thunkware/vt/bridge/ThreadProvider21.java b/src/main/java21/io/github/thunkware/vt/bridge/ThreadProvider21.java index 0b4bd95..b1748e7 100644 --- a/src/main/java21/io/github/thunkware/vt/bridge/ThreadProvider21.java +++ b/src/main/java21/io/github/thunkware/vt/bridge/ThreadProvider21.java @@ -40,11 +40,17 @@ public Thread startVirtualThread(final Runnable task) { @Override public Thread unstartedVirtualThread(Runnable task) { - return unstartedVirtualThread(task, config.getThreadCustomizer()); + return unstartedVirtualThread(task, config.getThreadCustomizer(), null); } - private Thread unstartedVirtualThread(Runnable task, ThreadCustomizer threadCustomizer) { + private Thread unstartedVirtualThread(Runnable task, ThreadCustomizer threadCustomizer, ThreadFactory threadFactory) { Thread thread = Thread.ofVirtual().unstarted(task); + if (threadFactory != null) { + Thread sample = threadFactory.newThread(task); + thread.setName(sample.getName()); + thread.setUncaughtExceptionHandler(sample.getUncaughtExceptionHandler()); + thread.setContextClassLoader(sample.getContextClassLoader()); + } threadCustomizer.customize(thread); return thread; } @@ -61,8 +67,8 @@ public ExecutorService newVirtualThreadPerTaskExecutor() { } @Override - public ExecutorService newVirtualThreadPerTaskExecutor(ThreadCustomizer threadCustomizer) { - return newThreadPerTaskExecutor(runnable -> unstartedVirtualThread(runnable, threadCustomizer)); + public ExecutorService newVirtualThreadPerTaskExecutor(ThreadCustomizer threadCustomizer, ThreadFactory threadFactory) { + return newThreadPerTaskExecutor(runnable -> unstartedVirtualThread(runnable, threadCustomizer, threadFactory)); } @Override diff --git a/src/test/java/io/github/thunkware/vt/bridge/ExecutorTool21Test.java b/src/test/java/io/github/thunkware/vt/bridge/ExecutorTool21Test.java index ab41ca2..20c798b 100644 --- a/src/test/java/io/github/thunkware/vt/bridge/ExecutorTool21Test.java +++ b/src/test/java/io/github/thunkware/vt/bridge/ExecutorTool21Test.java @@ -198,6 +198,22 @@ void testNewVirtualThreadPerTaskExecutorGlobalThreadName() throws Exception { } } + @Test + void testNewVirtualThreadPerTaskExecutorThreadFactory() { + AtomicInteger counter = new AtomicInteger(); + ThreadFactory threadFactory = runnable -> { + Thread thread = new Thread(runnable); + thread.setName("my-thread-" + counter.getAndIncrement()); + return thread; + }; + executor = ExecutorTool.newVirtualThreadPerTaskExecutor(threadFactory); + try { + verifyThreadNamePrefix(executor); + } finally { + executor.shutdown(); + } + } + private void verifyThreadNamePrefix(ExecutorService executor) { CountDownLatch latch = new CountDownLatch(2); Future future1 = executor.submit(() -> { diff --git a/src/test/java/io/github/thunkware/vt/bridge/ExecutorTool8Test.java b/src/test/java/io/github/thunkware/vt/bridge/ExecutorTool8Test.java index 95729a3..794b0cb 100644 --- a/src/test/java/io/github/thunkware/vt/bridge/ExecutorTool8Test.java +++ b/src/test/java/io/github/thunkware/vt/bridge/ExecutorTool8Test.java @@ -10,8 +10,10 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicInteger; import static org.apache.commons.lang3.JavaVersion.JAVA_20; import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost; @@ -140,6 +142,22 @@ void testNewVirtualThreadPerTaskExecutorGlobalThreadName() throws Exception { } } + @Test + void testNewVirtualThreadPerTaskExecutorThreadFactory() { + AtomicInteger counter = new AtomicInteger(); + ThreadFactory threadFactory = runnable -> { + Thread thread = new Thread(runnable); + thread.setName("my-thread-" + counter.getAndIncrement()); + return thread; + }; + ExecutorService executor = ExecutorTool.newVirtualThreadPerTaskExecutor(threadFactory); + try { + verifyThreadNamePrefix(executor); + } finally { + executor.shutdown(); + } + } + private void verifyThreadNamePrefix(ExecutorService executor) { CountDownLatch latch = new CountDownLatch(2); Future future1 = executor.submit(() -> {