Extract ExecutorFactory for Java 21 support using newVirtualThreadPerTaskExecutor()

Author: rbygrave

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11]
+        java_version: [21]
         os: [ubuntu-latest]
 
     steps:

ebean-datasource/pom.xml

@@ -92,4 +92,58 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+
+      <plugin> <!-- Multi-Release with 21 -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.3.0</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Multi-Release>true</Multi-Release>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.14.0</version>
+        <executions>
+          <!-- Compile for base version Java 11 -->
+          <execution>
+            <id>base</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <release>11</release>
+              <compileSourceRoots>
+                <compileSourceRoot>${project.basedir}/src/main/java</compileSourceRoot>
+              </compileSourceRoots>
+            </configuration>
+          </execution>
+          <!-- Compile for Java 21 -->
+          <execution>
+            <id>java21</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <release>21</release>
+              <compileSourceRoots>
+                <compileSourceRoot>${project.basedir}/src/main/java21</compileSourceRoot>
+              </compileSourceRoots>
+              <outputDirectory>${project.build.outputDirectory}/META-INF/versions/21</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
 </project>

ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java

@@ -769,7 +769,7 @@ private void startExecutor() {
     executorLock.lock();
     try {
       if (executor == null) {
-        executor = Executors.newSingleThreadExecutor();
+        executor = ExecutorFactory.newExecutor();
       }
     } finally {
       executorLock.unlock();

ebean-datasource/src/main/java/io/ebean/datasource/pool/ExecutorFactory.java

@@ -0,0 +1,11 @@
+package io.ebean.datasource.pool;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+final class ExecutorFactory {
+
+  static ExecutorService newExecutor() {
+    return Executors.newSingleThreadExecutor();
+  }
+}

ebean-datasource/src/main/java21/io/ebean/datasource/pool/ExecutorFactory.java

@@ -0,0 +1,11 @@
+package io.ebean.datasource.pool;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+final class ExecutorFactory {
+
+  static ExecutorService newExecutor() {
+    return Executors.newVirtualThreadPerTaskExecutor();
+  }
+}