Skip to content

Commit 1153ec3

Browse files
committed
QuartzTrigger code refactorings
1 parent 98e80ae commit 1153ec3

File tree

5 files changed

+26
-48
lines changed

5 files changed

+26
-48
lines changed

Directory.Packages.props

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -264,31 +264,6 @@
264264
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsPackageVersion)" />
265265
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="$(MicrosoftExtensionsPackageVersion)" />
266266
</ItemGroup>
267-
<!-- Elsa -->
268-
<ItemGroup>
269-
<PackageVersion Include="Elsa" Version="$(ElsaPackageVersion)" />
270-
<PackageVersion Include="Elsa.Activities.Email" Version="$(ElsaPackageVersion)" />
271-
<PackageVersion Include="Elsa.Activities.Http" Version="$(ElsaPackageVersion)" />
272-
<PackageVersion Include="Elsa.Activities.UserTask" Version="$(ElsaPackageVersion)" />
273-
<PackageVersion Include="Elsa.Activities.Temporal.Quartz" Version="$(ElsaPackageVersion)" />
274-
<PackageVersion Include="Elsa.Core" Version="$(ElsaPackageVersion)" />
275-
<PackageVersion Include="Elsa.Designer.Components.Web" Version="$(ElsaPackageVersion)" />
276-
<PackageVersion Include="Elsa.Rebus.RabbitMq" Version="$(ElsaPackageVersion)" />
277-
<PackageVersion Include="Elsa.Server.Api" Version="$(ElsaPackageVersion)" />
278-
<PackageVersion Include="Elsa.Webhooks.Api" Version="$(ElsaPackageVersion)" />
279-
<PackageVersion Include="Elsa.Webhooks.Persistence.EntityFramework.Core" Version="$(ElsaPackageVersion)" />
280-
<PackageVersion Include="Elsa.WorkflowSettings.Persistence.EntityFramework.Core" Version="$(ElsaPackageVersion)" />
281-
<PackageVersion Include="Elsa.Webhooks.Persistence.EntityFramework.MySql" Version="$(ElsaPackageVersion)" />
282-
<PackageVersion Include="Elsa.WorkflowSettings.Persistence.EntityFramework.MySql" Version="$(ElsaPackageVersion)" />
283-
</ItemGroup>
284-
<!-- DotNetCore.CAP -->
285-
<ItemGroup>
286-
<PackageVersion Include="DotNetCore.CAP" Version="$(DotNetCoreCAPPackageVersion)" />
287-
<PackageVersion Include="DotNetCore.CAP.Dashboard" Version="$(DotNetCoreCAPPackageVersion)" />
288-
<PackageVersion Include="DotNetCore.CAP.MySql" Version="$(DotNetCoreCAPPackageVersion)" />
289-
<PackageVersion Include="DotNetCore.CAP.OpenTelemetry" Version="$(DotNetCoreCAPPackageVersion)" />
290-
<PackageVersion Include="DotNetCore.CAP.RabbitMQ" Version="$(DotNetCoreCAPPackageVersion)" />
291-
</ItemGroup>
292267
<!-- Serilog -->
293268
<ItemGroup>
294269
<PackageVersion Include="Serilog" Version="4.0.2" />
@@ -539,10 +514,15 @@
539514
<PackageVersion Include="CronExpressionDescriptor" Version="2.39.0" />
540515
<PackageVersion Include="DartSassBuilder" Version="1.1.0" />
541516
</ItemGroup>
517+
<!-- Aspire -->
542518
<ItemGroup>
543519
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
544-
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.0.0" />
520+
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="9.0.0" />
545521
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.0.0" />
546522
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.0.0" />
523+
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.0.0" />
524+
<PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="9.0.0" />
525+
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
526+
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
547527
</ItemGroup>
548528
</Project>

demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.Blazor.Host.Client/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static IServiceCollection AddQuartzAdminMain(
3131
}
3232
else
3333
{
34-
services.AddQuartzJob(t, so.Identity ?? t.Name, so.Desciption ?? t.FullName);
34+
services.AddQuartzJob(t, so.Identity ?? t.Name, so.Description ?? t.FullName);
3535
}
3636
});
3737
services.AddQuartzAdmin(quartzAdminUIConfiguration);

demos/MainDemo/host/Syrna.QuartzAdmin.MainDemo.HttpApi.Host/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static IServiceCollection AddQuartzAdminMain(
3131
}
3232
else
3333
{
34-
services.AddQuartzJob(t, so.Identity ?? t.Name, so.Desciption ?? t.FullName);
34+
services.AddQuartzJob(t, so.Identity ?? t.Name, so.Description ?? t.FullName);
3535
}
3636
});
3737
services.AddQuartzAdmin(quartzAdminUIConfiguration);

demos/MainDemo/src/Syrna.QuartzAdmin.MainDemo.Jobs/AutoJob1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace Syrna.QuartzAdmin.MainDemo.Jobs
55
{
66
[DisallowConcurrentExecution]
7-
[QuartzTrigger(5, 0, 0, Desciption = "Automatic job of welcome information")]
7+
[QuartzTrigger(5, 0, 0, Description = "Automatic job of welcome information")]
88
public class AutoJob1 : IJob
99
{
1010
private Task ExecuteJob(IJobExecutionContext context)
Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,30 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
5-
namespace Syrna.QuartzAdmin.Jobs.Abstractions
1+
namespace Syrna.QuartzAdmin.Jobs.Abstractions
62
{
73
public class QuartzTriggerAttribute : Attribute
84
{
95
public QuartzTriggerAttribute()
106
{
117

128
}
13-
public QuartzTriggerAttribute(double days, double hours, double minutes, double seconds, double milliseconds, string _identity, string _desciption) : this(days, hours, minutes, seconds, milliseconds, 0, _identity, _desciption)
9+
public QuartzTriggerAttribute(double days, double hours, double minutes, double seconds, double milliseconds, string identity, string description) : this(days, hours, minutes, seconds, milliseconds, 0, identity, description)
1410
{
1511
}
1612

17-
public QuartzTriggerAttribute(double hours, double minutes, double seconds, string _identity, string _desciption) : this(0, hours, minutes, seconds, 0, 0, _identity, _desciption)
13+
public QuartzTriggerAttribute(double hours, double minutes, double seconds, string identity, string description) : this(0, hours, minutes, seconds, 0, 0, identity, description)
1814
{
1915
}
2016

21-
public QuartzTriggerAttribute(double minutes, double seconds, string _identity, string _desciption) : this(0, 0, minutes, seconds, 0, 0, _identity, _desciption)
17+
public QuartzTriggerAttribute(double minutes, double seconds, string identity, string description) : this(0, 0, minutes, seconds, 0, 0, identity, description)
2218
{
2319
}
2420

2521
/// <summary>
2622
/// Trigger every x seconds
2723
/// </summary>
2824
/// <param name="seconds"></param>
29-
/// <param name="_identity"></param>
30-
/// <param name="_desciption"></param>
31-
public QuartzTriggerAttribute(double seconds, string _identity, string _desciption) : this(0, 0, 0, seconds, 0, 0, _identity, _desciption)
25+
/// <param name="identity"></param>
26+
/// <param name="description"></param>
27+
public QuartzTriggerAttribute(double seconds, string identity, string description) : this(0, 0, 0, seconds, 0, 0, identity, description)
3228
{
3329
}
3430

@@ -40,9 +36,9 @@ public QuartzTriggerAttribute(double days, double hours, double minutes, double
4036
/// <summary>
4137
/// Trigger every x hours
4238
/// </summary>
39+
/// <param name="minutes"></param>
4340
/// <param name="seconds"></param>
44-
/// <param name="_identity"></param>
45-
/// <param name="_desciption"></param>
41+
/// <param name="hours"></param>
4642
public QuartzTriggerAttribute(double hours, double minutes, double seconds) : this(0, hours, minutes, seconds, 0, 0, null, null)
4743
{
4844
}
@@ -55,30 +51,32 @@ public QuartzTriggerAttribute(double seconds) : this(0, 0, 0, seconds, 0, 0, nul
5551
{
5652
}
5753

58-
public QuartzTriggerAttribute(bool Manual) : this(0, 0, 0, 0, 0, 0, null, null)
54+
public QuartzTriggerAttribute(bool manual) : this(0, 0, 0, 0, 0, 0, null, null)
5955
{
60-
this.Manual = true;
56+
Manual = manual;
6157
}
6258

6359

64-
public QuartzTriggerAttribute(double days, double hours, double minutes, double seconds, double milliseconds, long ticks, string _identity, string _desciption)
60+
private QuartzTriggerAttribute(double days, double hours, double minutes, double seconds, double milliseconds, long ticks, string identity, string description)
6561
{
6662

6763
WithInterval = TimeSpan.FromTicks(ticks + (long)(days * TimeSpan.TicksPerDay
6864
+ hours * TimeSpan.TicksPerHour
6965
+ minutes * TimeSpan.TicksPerMinute
7066
+ seconds * TimeSpan.TicksPerSecond
7167
+ milliseconds + TimeSpan.TicksPerMillisecond));
68+
Identity = identity;
69+
Description = description;
7270
}
73-
public string Desciption { get; set; } = null;
74-
public string Identity { get; set; } = null;
71+
public string Description { get; set; }
72+
public string Identity { get; set; }
7573
public TimeSpan WithInterval { get; set; }
7674
public DateTimeOffset StartAt { get; set; } = DateTimeOffset.MinValue;
7775
public int RepeatCount { get; set; } = 0;
7876
public string TriggerName { get; set; } = string.Empty;
7977
public string TriggerGroup { get; set; } = string.Empty;
8078
public string TriggerDescription { get; set; } = string.Empty;
8179
public int Priority { get; set; } = 0;
82-
public bool Manual { get; set; } = false;
80+
public bool Manual { get; set; }
8381
}
8482
}

0 commit comments

Comments
 (0)