Refactor Task to ValueTask (#988)

quartznet · Mar 25, 2023 · e27afd4 · e27afd4
1 parent 774739f
commit e27afd4
Show file tree

Hide file tree

Showing 162 changed files with 1,631 additions and 1,607 deletions.
diff --git a/changelog.md b/changelog.md
@@ -63,6 +63,8 @@
 
   * Introduce JobType to allow storing job's type information without actual Type instance (#1610)
 
+  * `Task` return types and parameters have been changed to `ValueTask`.  Any consumers of Quartz expecting a `Task` will require to update the signatures to `ValueTask`,
+     or use the `AsTask()` Method on ValueTask to Return the `ValueTask` as a `Task`  (#988)
 
 ## Release 3.6.1, Feb 25 2023
 

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -7,6 +7,7 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.1" />
+    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.0" />

diff --git a/src/Quartz.AspNetCore/AspNetCore/HttpApi/Endpoints/CalendarEndpoints.cs b/src/Quartz.AspNetCore/AspNetCore/HttpApi/Endpoints/CalendarEndpoints.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
@@ -65,7 +65,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         endpointHelper.AssertIsValid(request);
         return endpointHelper.ExecuteWithOkResponse(
             schedulerName,
-            scheduler => scheduler.AddCalendar(request.CalendarName, request.Calendar, request.Replace, request.UpdateTriggers, cancellationToken)
+            scheduler => scheduler.AddCalendar(request.CalendarName, request.Calendar, request.Replace, request.UpdateTriggers, cancellationToken).AsTask()
         );
     }
 

diff --git a/src/Quartz.AspNetCore/AspNetCore/HttpApi/Endpoints/JobEndpoints.cs b/src/Quartz.AspNetCore/AspNetCore/HttpApi/Endpoints/JobEndpoints.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
@@ -155,7 +155,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string jobName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.PauseJob(new JobKey(jobName, jobGroup), cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.PauseJob(new JobKey(jobName, jobGroup), cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -183,7 +183,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string jobName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.ResumeJob(new JobKey(jobName, jobGroup), cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.ResumeJob(new JobKey(jobName, jobGroup), cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -214,10 +214,10 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
     {
         if (request?.JobData != null)
         {
-            return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.TriggerJob(new JobKey(jobName, jobGroup), request.JobData, cancellationToken));
+            return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.TriggerJob(new JobKey(jobName, jobGroup), request.JobData, cancellationToken).AsTask());
         }
 
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.TriggerJob(new JobKey(jobName, jobGroup), cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.TriggerJob(new JobKey(jobName, jobGroup), cancellationToken).AsTask());
     }
 
     [ProducesResponseType(typeof(InterruptResponse), StatusCodes.Status200OK)]

diff --git a/src/Quartz.AspNetCore/AspNetCore/HttpApi/Endpoints/SchedulerEndpoints.cs b/src/Quartz.AspNetCore/AspNetCore/HttpApi/Endpoints/SchedulerEndpoints.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
@@ -92,10 +92,10 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         {
             if (delayMilliseconds.HasValue)
             {
-                return scheduler.StartDelayed(TimeSpan.FromMilliseconds(delayMilliseconds.Value), cancellationToken);
+                return scheduler.StartDelayed(TimeSpan.FromMilliseconds(delayMilliseconds.Value), cancellationToken).AsTask();
             }
 
-            return scheduler.Start(cancellationToken);
+            return scheduler.Start(cancellationToken).AsTask();
         });
     }
 
@@ -105,7 +105,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string schedulerName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.Standby(cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.Standby(cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -115,7 +115,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         bool waitForJobsToComplete = false,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.Shutdown(waitForJobsToComplete, cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.Shutdown(waitForJobsToComplete, cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -124,7 +124,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string schedulerName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.Clear(cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.Clear(cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -133,7 +133,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string schedulerName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.PauseAll(cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.PauseAll(cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -142,6 +142,6 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string schedulerName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.ResumeAll(cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.ResumeAll(cancellationToken).AsTask());
     }
 }
diff --git a/src/Quartz.AspNetCore/AspNetCore/HttpApi/Endpoints/TriggerEndpoints.cs b/src/Quartz.AspNetCore/AspNetCore/HttpApi/Endpoints/TriggerEndpoints.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
@@ -139,7 +139,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string triggerName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.ResetTriggerFromErrorState(new TriggerKey(triggerName, triggerGroup), cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.ResetTriggerFromErrorState(new TriggerKey(triggerName, triggerGroup), cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -150,7 +150,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string triggerName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.PauseTrigger(new TriggerKey(triggerName, triggerGroup), cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.PauseTrigger(new TriggerKey(triggerName, triggerGroup), cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]
@@ -178,7 +178,7 @@ public static IEnumerable<RouteHandlerBuilder> MapEndpoints(IEndpointRouteBuilde
         string triggerName,
         CancellationToken cancellationToken = default)
     {
-        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.ResumeTrigger(new TriggerKey(triggerName, triggerGroup), cancellationToken));
+        return endpointHelper.ExecuteWithOkResponse(schedulerName, scheduler => scheduler.ResumeTrigger(new TriggerKey(triggerName, triggerGroup), cancellationToken).AsTask());
     }
 
     [ProducesResponseType(StatusCodes.Status200OK)]

diff --git a/src/Quartz.AspNetCore/AspNetCore/HttpApi/Util/EndpointHelper.cs b/src/Quartz.AspNetCore/AspNetCore/HttpApi/Util/EndpointHelper.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 
 using Quartz.HttpApiContract;
 using Quartz.Impl;

diff --git a/src/Quartz.Benchmark/DefaultThreadPoolBenchmark.cs b/src/Quartz.Benchmark/DefaultThreadPoolBenchmark.cs
@@ -70,10 +70,10 @@ public void RunInThread_CompletedTask_MaxConcurrencyIsSixteen_MultiThreaded()
         }
 
         /// <summary>
-        /// The primary goal of this benchamrk is to measure memory allocations.
+        /// The primary goal of this benchmark is to measure memory allocations.
         /// </summary>
         /// <remarks>
-        /// Note that this includes the allocations for initializing the threadpool itself.
+        /// Note that this includes the allocations for initializing the ThreadPool itself.
         /// </remarks>
         [Benchmark]
         public void RunInThread_OneShot()

diff --git a/src/Quartz.Benchmark/ExecutingJobsManagerBenchmark.cs b/src/Quartz.Benchmark/ExecutingJobsManagerBenchmark.cs
@@ -46,28 +46,28 @@ internal sealed class ExecutingJobsManagerLegacy : IJobListener
 
             private int numJobsFired;
 
-            public Task JobToBeExecuted(
+            public ValueTask JobToBeExecuted(
                 IJobExecutionContext context,
                 CancellationToken cancellationToken = default)
             {
                 Interlocked.Increment(ref numJobsFired);
                 executingJobs[((IOperableTrigger)context.Trigger).FireInstanceId] = context;
-                return Task.CompletedTask;
+                return default;
             }
 
-            public Task JobWasExecuted(IJobExecutionContext context,
+            public ValueTask JobWasExecuted(IJobExecutionContext context,
                 JobExecutionException? jobException,
                 CancellationToken cancellationToken = default)
             {
                 executingJobs.TryRemove(((IOperableTrigger)context.Trigger).FireInstanceId, out _);
-                return Task.CompletedTask;
+                return default;
             }
 
-            public Task JobExecutionVetoed(
+            public ValueTask JobExecutionVetoed(
                 IJobExecutionContext context,
                 CancellationToken cancellationToken = default)
             {
-                return Task.CompletedTask;
+                return default;
             }
         }
     }