making sure virtual threads only run on java 21

Author: lmajano

system/async/executors/Executor.cfc

@@ -36,22 +36,26 @@ component accessors="true" singleton {
 		"ScheduledThreadPoolExecutor" : {
 			"pool"          : true,
 			"taskMethods"   : true,
-			"isTerminating" : true
+			"isTerminating" : true,
+			"queue"        : true
 		},
 		"ThreadPoolExecutor" : {
 			"pool"          : true,
 			"taskMethods"   : true,
-			"isTerminating" : true
+			"isTerminating" : true,
+			"queue"        : true
 		},
 		"ForkJoinPool" : {
 			"pool"          : false,
 			"taskMethods"   : false,
-			"isTerminating" : true
+			"isTerminating" : true,
+			"queue"        : false
 		},
 		"ThreadPerTaskExecutor" : {
 			"pool"          : false,
 			"taskMethods"   : false,
-			"isTerminating" : false
+			"isTerminating" : false,
+			"queue"        : false
 		}
 	};
 
@@ -89,7 +93,7 @@ component accessors="true" singleton {
 	 * The result of this call is a ColdBox FutureTask from which you can monitor,
 	 * cancel, or get the result of the  the executing task.
 	 *
-	 * @callable THe callable closure/lambda/cfc to execute
+	 * @callable The callable closure/lambda/cfc to execute
 	 * @method   The default method to execute if the runnable is a CFC, defaults to `run()`
 	 *
 	 * @return A ColdBox Future Task object
@@ -173,9 +177,9 @@ component accessors="true" singleton {
 
 	/**
 	 * Shuts down the executor in two phases, first by calling the shutdown() and rejecting all incoming tasks.
-	 * Second, calling shutdownNow() aggresively if tasks did not shutdown on time to cancel any lingering tasks.
+	 * Second, calling shutdownNow() aggressively if tasks did not shutdown on time to cancel any lingering tasks.
 	 *
-	 * @timeout The timeout in seconds to wait for the shutdown.  By deafult we use the default on the property shutdownTimeout (30s)
+	 * @timeout The timeout in seconds to wait for the shutdown.  By default we use the default on the property shutdownTimeout (30s)
 	 */
 	Executor function shutdownAndAwaitTermination( numeric timeout = variables.shutdownTimeout ){
 		var sTime = getTickCount();
@@ -242,9 +246,14 @@ component accessors="true" singleton {
 
 	/**
 	 * Returns the task queue used by this executor.
+	 * If the executor has no queue, an empty LinkedBlockingQueue is returned.
+	 *
+	 * @return A queue that holds the tasks submitted to this executor.
 	 */
 	any function getQueue(){
-		return variables.native.getQueue();
+		return hasFeature( "queue" )
+			? variables.native.getQueue()
+			 : createObject( "java", "java.util.concurrent.LinkedBlockingQueue" ).init();
 	}
 
 	/**
@@ -315,12 +324,13 @@ component accessors="true" singleton {
 			"isTerminated"       : isTerminated(),
 			"isTerminating"      : isTerminating(),
 			"isShutdown"         : isShutdown(),
-			"type"               : variables.native.getClass().getName()
+			"type"               : variables.native.getClass().getName(),
+			"queue": getQueue().toString()
 		};
 	}
 
 	/**
-	 * Utility to send to output to the output stream
+	 * Utility to send output to the output stream
 	 *
 	 * @var Variable/Message to send
 	 */

tests/specs/async/ExecutorServicesSpec.cfc

@@ -3,6 +3,8 @@
  */
 component extends="BaseAsyncSpec" {
 
+	variables.javaMajorVersion = createObject( "java", "java.lang.System" ).getProperty( "java.version" ).listFirst( "." )
+
 	function run( testResults, testBox ){
 		// all your suites go here.
 		describe( "ColdBox Async Executor Services", function(){
@@ -15,55 +17,64 @@ component extends="BaseAsyncSpec" {
 					var executor = asyncManager.newExecutor( "unitTest" );
 					expect( executor.getName() ).toBe( "unitTest" );
 					expect( executor.getCorePoolSize() ).toBe( 20 );
+					debug( executor.getStats() );
 					expect( executor.getStats() ).toBeStruct();
 				} );
 				it( "can create the default fixed executor with custom threads", function(){
 					var executor = asyncManager.newExecutor( name: "unitTest", threads: 100 );
 					expect( executor.getName() ).toBe( "unitTest" );
 					expect( executor.getCorePoolSize() ).toBe( 100 );
+					debug( executor.getStats() );
 					expect( executor.getStats() ).toBeStruct();
 				} );
 				it( "can create the a single executor", function(){
 					var executor = asyncManager.newExecutor( name: "unitTest", type: "single" );
 					expect( executor.getName() ).toBe( "unitTest" );
 					expect( executor.getCorePoolSize() ).toBe( 1 );
+					debug( executor.getStats() );
 					expect( executor.getStats() ).toBeStruct();
 				} );
 				it( "can create the a cached executor", function(){
 					var executor = asyncManager.newExecutor( name: "unitTest", type: "cached" );
 					expect( executor.getName() ).toBe( "unitTest" );
 					expect( executor.getPoolSize() ).toBe( 0 );
+					debug( executor.getStats() );
 					expect( executor.getStats() ).toBeStruct();
 				} );
 				it( "can create a fork_join executor", function(){
 					var executor = asyncManager.newExecutor( name: "fork_join", type: "fork_join" );
 					expect( executor.getName() ).toBe( "fork_join" );
 					expect( executor.getPoolSize() ).toBe( 0 );
+					debug( executor.getStats() );
 					expect( executor.getStats() ).toBeStruct();
 				} );
 				it( "can create a work_stealing executor", function(){
 					var executor = asyncManager.newExecutor( name: "work_stealing", type: "work_stealing" );
 					expect( executor.getName() ).toBe( "work_stealing" );
 					expect( executor.getPoolSize() ).toBe( 0 );
+					debug( executor.getStats() );
 					expect( executor.getStats() ).toBeStruct();
 				} );
 				it( "can create a scheduled executor", function(){
 					var executor = asyncManager.newExecutor( name: "unitTest", type: "scheduled" );
 					expect( executor.getName() ).toBe( "unitTest" );
 					expect( executor.getCorePoolSize() ).toBe( 20 );
 					expect( executor.getNative().toString() ).toInclude( "ScheduledThreadPoolExecutor" );
+					debug( executor.getStats() );
 					expect( executor.getStats() ).toBeStruct();
 				} );
 				// Skip on Adobe as their dumb reflection does not support virtual threads
 				it(
 					title: "can create a virtual thread executor",
 					skip : (
-						server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" )
+						( server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" ) ) ||
+						( variables.javaMajorVersion < 21 )
 					),
 					body: function(){
 						var executor = asyncManager.newExecutor( name: "virtual", type: "virtual" );
 						expect( executor.getName() ).toBe( "virtual" );
 						expect( executor.getPoolSize() ).toBe( 0 );
+						debug( executor.getStats() );
 						expect( executor.getStats() ).toBeStruct();
 					}
 				);

tests/specs/async/executors/ExecutorsSpec.cfc

@@ -3,6 +3,8 @@
  */
 component extends="tests.specs.async.BaseAsyncSpec" {
 
+	variables.javaMajorVersion = createObject( "java", "java.lang.System" ).getProperty( "java.version" ).listFirst( "." )
+
 	/*********************************** BDD SUITES ***********************************/
 
 	function run( testResults, testBox ){
@@ -45,7 +47,8 @@ component extends="tests.specs.async.BaseAsyncSpec" {
 				it(
 					title: "can create a virtual thread executor",
 					skip : (
-						server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" )
+						( server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" ) ) ||
+						( variables.javaMajorVersion < 21 )
 					),
 					body: () => {
 						var executor = executors.newVirtualThreadExecutor();