Refactor

Author: ethanhann

src/InEngine.Commands/CommandsPlugin.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using CommandLine;
 using InEngine.Core;
 using InEngine.Core.Commands;
@@ -18,24 +17,24 @@ public class CommandsPlugin : AbstractPlugin
     public override void Schedule(ISchedule schedule)
     {
         schedule.Command(new Echo { VerbatimText = "Core Echo command." })
-            .EverySecond()
-            .Before(x => Console.WriteLine("Before"))
-            .After(x => Console.WriteLine("After"))
-            .PingBefore("http://www.google.com")
-            .PingAfter("http://www.google.com")
+            .EveryMinute()
+            .Before(x => x.Line($"Before {x.Name}"))
+            .After(x => x.Line($"After {x.Name}"))
+            .PingBefore("https://www.google.com")
+            .PingAfter("https://www.google.com")
             .WriteOutputTo("AlwaysSucceedWrite.log")
             .AppendOutputTo("AlwaysSucceedAppend.log")
             .EmailOutputTo("example@inengine.net");
 
         schedule.Command(new AbstractCommand[] {
             new Echo { VerbatimText = "Chain Link 1" },
             new Echo { VerbatimText = "Chain Link 2" },
-        }).EverySecond();
+        }).EveryFiveMinutes();
 
         schedule.Command(new List<AbstractCommand> {
             new Echo { VerbatimText = "Chain Link A" },
             new AlwaysFail(),
             new Echo { VerbatimText = "Chain Link C" },
-        }).EverySecond();
+        }).EveryFifteenMinutes();
     }
 }

src/InEngine.Core/Scheduling/Occurence.cs

@@ -13,85 +13,52 @@ public class Occurence
     public static TriggerBuilder MakeTriggerBuilder(AbstractCommand command)
     {
         if (command == null)
-            throw new ArgumentNullException(command.GetType().Name, "The command to schedule cannot be null.");
+            throw new ArgumentNullException(nameof(command), "The command to schedule cannot be null");
         return TriggerBuilder
             .Create()
             .WithIdentity($"{command.Name}:job:{command.ScheduleId}", command.SchedulerGroup);
     }
 
-    public ScheduleLifeCycleBuilder RegisterJob(Action<DailyTimeIntervalScheduleBuilder> action)
-    {
-        return new ScheduleLifeCycleBuilder { 
-            JobRegistration = Schedule.RegisterJob(Command, JobDetail, MakeTriggerBuilder(Command).WithDailyTimeIntervalSchedule(action).Build()) 
+    public ScheduleLifeCycleBuilder RegisterJob(Action<DailyTimeIntervalScheduleBuilder> action) =>
+        new ScheduleLifeCycleBuilder
+        {
+            JobRegistration = Schedule.RegisterJob(Command, JobDetail,
+                MakeTriggerBuilder(Command).WithDailyTimeIntervalSchedule(action).Build())
         };
-    }
 
-    public ScheduleLifeCycleBuilder RegisterJob(string cronExpression)
-    {
-        return new ScheduleLifeCycleBuilder {
-            JobRegistration = Schedule.RegisterJob(Command, JobDetail, MakeTriggerBuilder(Command).WithCronSchedule(cronExpression).Build())
+    public ScheduleLifeCycleBuilder RegisterJob(string cronExpression) =>
+        new ScheduleLifeCycleBuilder
+        {
+            JobRegistration = Schedule.RegisterJob(Command, JobDetail,
+                MakeTriggerBuilder(Command).WithCronSchedule(cronExpression).Build())
         };
-    }
 
-    public ScheduleLifeCycleBuilder RegisterJob(Action<SimpleScheduleBuilder> action)
-    {
-        return new ScheduleLifeCycleBuilder {
-            JobRegistration = Schedule.RegisterJob(Command, JobDetail, MakeTriggerBuilder(Command).WithSimpleSchedule(action).Build())
+    public ScheduleLifeCycleBuilder RegisterJob(Action<SimpleScheduleBuilder> action) =>
+        new ScheduleLifeCycleBuilder
+        {
+            JobRegistration = Schedule.RegisterJob(Command, JobDetail,
+                MakeTriggerBuilder(Command).WithSimpleSchedule(action).Build())
         };
-    }
-
-    public ScheduleLifeCycleBuilder Cron(string cronExpression)
-    {
-        return RegisterJob(cronExpression);
-    }
-
-    public ScheduleLifeCycleBuilder EverySecond()
-    {
-        return RegisterJob(x => x.WithIntervalInSeconds(1).RepeatForever());
-    }
-
-    public ScheduleLifeCycleBuilder EveryMinute()
-    {
-        return RegisterJob(x => x.WithIntervalInMinutes(1).RepeatForever());
-    }
-
-    public ScheduleLifeCycleBuilder EveryFiveMinutes()
-    {
-        return RegisterJob(x => x.WithIntervalInMinutes(5).RepeatForever());
-    }
 
-    public ScheduleLifeCycleBuilder EveryTenMinutes()
-    {
-        return RegisterJob(x => x.WithIntervalInMinutes(10).RepeatForever());
-    }
+    public ScheduleLifeCycleBuilder Cron(string cronExpression) => RegisterJob(cronExpression);
+    public ScheduleLifeCycleBuilder EverySecond() => RegisterJob(x => x.WithIntervalInSeconds(1).RepeatForever());
+    public ScheduleLifeCycleBuilder EveryMinute() => RegisterJob(x => x.WithIntervalInMinutes(1).RepeatForever());
+    public ScheduleLifeCycleBuilder EveryFiveMinutes() => RegisterJob(x => x.WithIntervalInMinutes(5).RepeatForever());
+    public ScheduleLifeCycleBuilder EveryTenMinutes() => RegisterJob(x => x.WithIntervalInMinutes(10).RepeatForever());
 
-    public ScheduleLifeCycleBuilder EveryFifteenMinutes()
-    {
-        return RegisterJob(x => x.WithIntervalInMinutes(15).RepeatForever());
-    }
+    public ScheduleLifeCycleBuilder EveryFifteenMinutes() =>
+        RegisterJob(x => x.WithIntervalInMinutes(15).RepeatForever());
 
-    public ScheduleLifeCycleBuilder EveryThirtyMinutes()
-    {
-        return RegisterJob(x => x.WithIntervalInMinutes(30).RepeatForever());
-    }
+    public ScheduleLifeCycleBuilder EveryThirtyMinutes() =>
+        RegisterJob(x => x.WithIntervalInMinutes(30).RepeatForever());
 
-    public ScheduleLifeCycleBuilder Hourly()
-    {
-        return RegisterJob(x => x.WithIntervalInHours(1).RepeatForever());
-    }
+    public ScheduleLifeCycleBuilder Hourly() => RegisterJob(x => x.WithIntervalInHours(1).RepeatForever());
 
-    public ScheduleLifeCycleBuilder HourlyAt(int minutesAfterTheHour)
-    {
-        return RegisterJob($"0 {minutesAfterTheHour} * * * ?");
-    }
+    public ScheduleLifeCycleBuilder HourlyAt(int minutesAfterTheHour) =>
+        RegisterJob($"0 {minutesAfterTheHour} * * * ?");
 
-    public ScheduleLifeCycleBuilder Daily()
-    {
-        return RegisterJob(x => x.WithIntervalInHours(24).RepeatForever());
-    }
+    public ScheduleLifeCycleBuilder Daily() => RegisterJob(x => x.WithIntervalInHours(24).RepeatForever());
 
-    public ScheduleLifeCycleBuilder DailyAt(int hours, int minutes, int seconds = 0)
-    {
-        return RegisterJob(x => x.StartingDailyAt(new TimeOfDay(hours, minutes, seconds)));
-    }
+    public ScheduleLifeCycleBuilder DailyAt(int hours, int minutes, int seconds = 0) =>
+        RegisterJob(x => x.StartingDailyAt(new TimeOfDay(hours, minutes, seconds)));
 }

src/InEngine/Program.cs

@@ -4,15 +4,15 @@
 
 namespace InEngine;
 
-class Program
+public static class Program
 {
     public static ServerHost ServerHost { get; set; }
 
     private static void Main(string[] args)
     {
         /*
          * Set current working directory as services use the system directory by default.
-         * Also, maybe run from the CLI from a different directory than the application root.
+         * Also, allow running the CLI from a different directory than the application root.
          */
         Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
         new ArgumentInterpreter().Interpret(args);