Skip to content

Commit 3ab9e25

Browse files
committed
[r] to new C# style and async
1 parent 42465d6 commit 3ab9e25

File tree

5 files changed

+30
-27
lines changed

5 files changed

+30
-27
lines changed

src/Simplify.Mail.TestConsoleApp/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
using var scope = provider.BeginLifetimeScope();
1212
var sender = scope.Resolver.Resolve<IMailSender>();
1313

14-
sender.Send("[email protected]", "[email protected]", "Hello subject",
14+
await sender.SendAsync("[email protected]", "[email protected]", "Hello subject",
1515
"Hello World!!!");

src/Simplify.Scheduler.IntegrationTester/BasicTaskProcessor.cs renamed to src/Simplify.Scheduler.IntegrationTester/BasicTaskProcessorAsync.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
using System;
22
using System.Diagnostics;
3+
using System.Threading.Tasks;
34

45
namespace Simplify.Scheduler.IntegrationTester;
56

6-
public class BasicTaskProcessor : IDisposable
7+
public class BasicTaskProcessorAsync(DisposableDependency dependency) : IDisposable
78
{
89
private static bool _isRunning;
910

10-
private readonly DisposableDependency _dependency;
11-
12-
public BasicTaskProcessor(DisposableDependency dependency) => _dependency = dependency;
13-
14-
public void Run()
11+
public Task Run()
1512
{
1613
if (_isRunning)
1714
throw new SimplifySchedulerException("BasicTaskProcessor is running a duplicate!");
1815

1916
_isRunning = true;
2017

2118
Trace.WriteLine("BasicTaskProcessor launched");
22-
}
2319

24-
public void Dispose()
25-
{
26-
Trace.WriteLine("BasicTaskProcessor disposed");
20+
dependency.DoSomeWork();
21+
22+
return Task.CompletedTask;
2723
}
24+
25+
public void Dispose() => Trace.WriteLine("BasicTaskProcessor disposed");
2826
}

src/Simplify.Scheduler.IntegrationTester/DisposableDependency.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ namespace Simplify.Scheduler.IntegrationTester;
55

66
public class DisposableDependency : IDisposable
77
{
8+
public void DoSomeWork() { }
9+
810
public void Dispose() => Trace.WriteLine("Disposable dependency disposed");
911
}

src/Simplify.Scheduler.IntegrationTester/Program.cs

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,29 @@
66

77
// IOC container setup
88

9-
DIContainer.Current.RegisterAll()
9+
DIContainer.Current
10+
.RegisterAll()
1011
.Verify();
1112

1213
// Using scheduler
1314

14-
using (var scheduler = new MultitaskScheduler())
15-
{
16-
scheduler.OnJobStart += HandlerDiagnostics.HandlerOnJobStart;
17-
scheduler.OnJobFinish += HandlerDiagnostics.HandlerOnJobFinish;
15+
using var scheduler = new MultitaskScheduler();
1816

19-
scheduler.AddJob<OneSecondStepProcessor>(IocRegistrations.Configuration);
20-
scheduler.AddJob<TwoSecondStepProcessor>(IocRegistrations.Configuration, startupArgs: "Hello world!!!");
21-
scheduler.AddJob<OneMinuteStepCrontabProcessor>(IocRegistrations.Configuration);
22-
scheduler.AddJob<TwoParallelTasksProcessor>(IocRegistrations.Configuration, invokeMethodName: "Execute");
23-
scheduler.AddBasicJob<BasicTaskProcessor>();
17+
scheduler.OnJobStart += HandlerDiagnostics.HandlerOnJobStart;
18+
scheduler.OnJobFinish += HandlerDiagnostics.HandlerOnJobFinish;
19+
20+
scheduler.AddJob<OneSecondStepProcessor>(IocRegistrations.Configuration);
21+
scheduler.AddJob<TwoSecondStepProcessor>(IocRegistrations.Configuration, startupArgs: "Hello world!!!");
22+
scheduler.AddJob<OneMinuteStepCrontabProcessor>(IocRegistrations.Configuration);
23+
scheduler.AddJob<TwoParallelTasksProcessor>(IocRegistrations.Configuration, invokeMethodName: "Execute");
24+
scheduler.AddBasicJob<BasicTaskProcessorAsync>();
25+
26+
if (await scheduler.StartAsync(args))
27+
return;
2428

25-
if (await scheduler.StartAsync(args))
26-
return;
27-
}
2829

2930
// Testing some processors without scheduler
30-
using (var scope = DIContainer.Current.BeginLifetimeScope())
31-
scope.Resolver.Resolve<BasicTaskProcessor>().Run();
31+
32+
using var scope = DIContainer.Current.BeginLifetimeScope();
33+
34+
await scope.Resolver.Resolve<BasicTaskProcessorAsync>().Run();

src/Simplify.Scheduler.IntegrationTester/Setup/IocRegistrations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static IDIContainerProvider RegisterAll(this IDIContainerProvider provide
1515
.Register<TwoSecondStepProcessor>()
1616
.Register<OneMinuteStepCrontabProcessor>()
1717
.Register<TwoParallelTasksProcessor>()
18-
.Register<BasicTaskProcessor>();
18+
.Register<BasicTaskProcessorAsync>();
1919

2020
return provider;
2121
}

0 commit comments

Comments
 (0)