Merge pull request #252 from NCronJob-Dev/ntk/dyn

Drop DynamicJobRegistration

Author: nulltoken

src/NCronJob/Configuration/DynamicJobRegistration.cs

@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -30,7 +31,7 @@ public JobExecutor(
         this.retryHandler = retryHandler;
         this.jobQueueManager = jobQueueManager;
         this.jobRegistry = jobRegistry;
-        this.exceptionHandlers = [..exceptionHandlers];
+        this.exceptionHandlers = [.. exceptionHandlers];
 
         lifetime.ApplicationStopping.Register(OnApplicationStopping);
     }
@@ -79,18 +80,17 @@ public async Task RunJob(JobRun run, CancellationToken stoppingToken)
 
     private IJob ResolveJob(IServiceProvider scopedServiceProvider, JobDefinition definition)
     {
-        if (!definition.IsTypedJob)
-            return jobRegistry.GetDynamicJobInstance(scopedServiceProvider, definition);
-
-        var job = scopedServiceProvider.GetService(definition.Type);
+        var job = definition.ResolveJob(scopedServiceProvider);
         if (job != null)
-            return (IJob)job;
+        {
+            return job;
+        }
 
-        LogUnregisteredJob(definition.Name);
+        Debug.Assert(definition.IsTypedJob);
 
-        job = ActivatorUtilities.CreateInstance(scopedServiceProvider, definition.Type);
+        LogUnregisteredJob(definition.Name);
 
-        return (IJob)job;
+        return (IJob)ActivatorUtilities.CreateInstance(scopedServiceProvider, definition.Type);
     }
 
     public void Dispose()

src/NCronJob/Execution/JobExecutor.cs

@@ -22,15 +22,15 @@ private JobDefinition(
 
     private JobDefinition(
         string? customName,
-        string dynamicHash,
-        JobExecutionAttributes jobPolicyMetadata)
+        Delegate jobDelegate)
     {
         CustomName = customName;
 
+        Delegate = jobDelegate;
         IsTypedJob = false;
-        JobFullName = $"Untyped job {typeof(DynamicJobFactory).Namespace}.{dynamicHash}";
+        JobFullName = $"Untyped job {typeof(DynamicJobFactory).Namespace}.{DynamicJobNameGenerator.GenerateJobName(jobDelegate)}";
 
-        JobPolicyMetadata = jobPolicyMetadata;
+        JobPolicyMetadata = new JobExecutionAttributes(jobDelegate);
     }
 
     public string Name => CustomName is not null ? $"{CustomName} ({JobFullName})" : JobFullName;
@@ -72,11 +72,11 @@ private JobDefinition(
     public SupportsConcurrencyAttribute? ConcurrencyPolicy => JobPolicyMetadata.ConcurrencyPolicy;
 
     [MemberNotNullWhen(true, nameof(Type))]
+    [MemberNotNullWhen(false, nameof(Delegate))]
     public bool IsTypedJob { get; }
 
-    private bool IsDisabled => CronExpression == NotReacheableCronDefinition;
-
-    public bool IsEnabled => CronExpression is null || !IsDisabled;
+    public bool IsEnabled => CronExpression is null
+        || CronExpression != NotReacheableCronDefinition;
 
     public static JobDefinition CreateTyped(
         Type type,
@@ -101,9 +101,8 @@ public static JobDefinition CreateTyped(
 
     public static JobDefinition CreateUntyped(
         string? name,
-        string dynamicHash,
-        JobExecutionAttributes jobPolicyMetadata)
-    => new(name, dynamicHash, jobPolicyMetadata);
+        Delegate jobDelegate)
+    => new(name, jobDelegate);
 
     public void Disable()
     {
@@ -164,6 +163,18 @@ public void UpdateWith(JobOption? jobOption)
         }
     }
 
+    public IJob? ResolveJob(IServiceProvider scopedServiceProvider)
+    {
+        if (IsTypedJob)
+        {
+            return (IJob?)scopedServiceProvider.GetService(Type);
+        }
+
+        return new DynamicJobFactory(scopedServiceProvider, Delegate);
+    }
+
+    private Delegate? Delegate { get; }
+
     private static CronExpression GetCronExpression(string expression)
     {
         var precisionRequired = DetermineAndValidatePrecision(expression);

src/NCronJob/Registry/JobDefinition.cs

@@ -5,7 +5,7 @@ namespace NCronJob;
 internal sealed class JobRegistry
 {
     private readonly List<JobDefinition> allJobs = [];
-    public List<DynamicJobRegistration> DynamicJobRegistrations { get; } = [];
+
     private readonly Dictionary<JobDefinition, List<DependentJobRegistryEntry>> dependentJobsPerJobDefinition
         = new(DependentJobDefinitionEqualityComparer.Instance);
 
@@ -62,22 +62,15 @@ public JobDefinition AddDynamicJob(
         string? jobName = null,
         JobOption? jobOption = null)
     {
-        var jobPolicyMetadata = new JobExecutionAttributes(jobDelegate);
 
-        var entry = JobDefinition.CreateUntyped(jobName, DynamicJobNameGenerator.GenerateJobName(jobDelegate), jobPolicyMetadata);
+        var entry = JobDefinition.CreateUntyped(jobName, jobDelegate);
         entry.UpdateWith(jobOption);
 
         Add(entry);
-        AddDynamicJobRegistration(entry, jobDelegate);
 
         return entry;
     }
 
-    public IJob GetDynamicJobInstance(IServiceProvider serviceProvider, JobDefinition jobDefinition)
-        => DynamicJobRegistrations
-            .Single(d => d.JobDefinition.JobFullName == jobDefinition.JobFullName)
-            .DynamicJobFactoryResolver(serviceProvider);
-
     public void RegisterJobDependency(IReadOnlyCollection<JobDefinition> parentJobdefinitions, DependentJobRegistryEntry entry)
     {
         foreach (var jobDefinition in parentJobdefinitions)
@@ -98,9 +91,6 @@ public IReadOnlyCollection<JobDefinition> GetDependentSuccessJobTypes(JobDefinit
     public IReadOnlyCollection<JobDefinition> GetDependentFaultedJobTypes(JobDefinition parentJobDefinition)
         => FilterByAndProject(parentJobDefinition, v => v.SelectMany(p => p.RunWhenFaulted));
 
-    private void AddDynamicJobRegistration(JobDefinition jobDefinition, Delegate jobDelegate)
-        => DynamicJobRegistrations.Add(new DynamicJobRegistration(jobDefinition, sp => new DynamicJobFactory(sp, jobDelegate)));
-
     public static void UpdateJobDefinitionsToRunAtStartup(
         IReadOnlyCollection<JobDefinition> jobDefinitions,
         bool shouldCrashOnFailure = false)

src/NCronJob/Registry/JobRegistry.cs

@@ -192,10 +192,6 @@ public bool TryRegister(Action<IRuntimeJobBuilder> jobBuilder, [NotNullWhen(fals
                 jobQueueManager.SignalJobQueue(jobDefinition.JobFullName);
             }
 
-            foreach (var entry in jobRegistry.DynamicJobRegistrations)
-            {
-                jobQueueManager.SignalJobQueue(entry.JobDefinition.JobFullName);
-            }
             exception = null;
             return true;
         }