Refactor

Author: ethanhann

IntegrationEngine/Api/Controllers/CronTriggerController.cs

@@ -1,9 +1,10 @@
-using IntegrationEngine.Core.Storage;
-using IntegrationEngine.Model;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Net;
 using System.Web.Http;
 using System.Web.Http.Description;
+using IntegrationEngine.Core.Storage;
+using IntegrationEngine.Model;
+using IntegrationEngine.Scheduler;
 
 namespace IntegrationEngine.Api.Controllers
 {
@@ -53,6 +54,8 @@ public IHttpActionResult PutIntegrationJob(string id, CronTrigger trigger)
         [ResponseType(typeof(CronTrigger))]
         public IHttpActionResult PostIntegrationJob(CronTrigger trigger)
         {
+            if (trigger.CronExpressionString.IsValidCronExpression())
+                return BadRequest("Cron expression is not valid: " + trigger.CronExpressionString);
             var triggerWithId = Repository.Insert(trigger);
             EngineScheduler.ScheduleJobWithCronTrigger(triggerWithId);
             return CreatedAtRoute("DefaultApi", new { id = triggerWithId.Id }, triggerWithId);

IntegrationEngine/Api/Controllers/SimpleTriggerController.cs

@@ -1,6 +1,4 @@
-using IntegrationEngine.Model;
-using IntegrationEngine.Core.Storage;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
@@ -10,6 +8,9 @@
 using System.Threading.Tasks;
 using System.Web.Http;
 using System.Web.Http.Description;
+using IntegrationEngine.Core.Storage;
+using IntegrationEngine.Model;
+using IntegrationEngine.Scheduler;
 
 namespace IntegrationEngine.Api.Controllers
 {

IntegrationEngine/EngineHostConfiguration.cs

@@ -1,22 +1,23 @@
-using IntegrationEngine.Api;
-using IntegrationEngine.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity.Core.Metadata.Edm;
+using System.Linq;
+using System.Reflection;
 using IntegrationEngine.Core.Jobs;
 using IntegrationEngine.Core.Mail;
 using IntegrationEngine.Core.R;
 using IntegrationEngine.Core.Storage;
-using IntegrationEngine.MessageQueue;
 using IntegrationEngine.Model;
-using log4net;
+using Microsoft.Practices.Unity;
 using Nest;
 using Quartz;
 using Quartz.Impl;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
+using log4net;
 using log4net.Core;
-using Microsoft.Practices.Unity;
-using System.Data.Entity.Core.Metadata.Edm;
+using IntegrationEngine.Api;
+using IntegrationEngine.Configuration;
+using IntegrationEngine.MessageQueue;
+using IntegrationEngine.Scheduler;
 
 namespace IntegrationEngine
 {

IntegrationEngine/IntegrationEngine.csproj

@@ -133,7 +133,6 @@
     <Compile Include="Api\Startup.cs" />
     <Compile Include="Configuration\MessageQueueConfiguration.cs" />
     <Compile Include="Configuration\WebApiConfiguration.cs" />
-    <Compile Include="IEngineScheduler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MessageQueue\IMessageQueueClient.cs" />
     <Compile Include="MessageQueue\RabbitMqClient.cs" />
@@ -148,8 +147,10 @@
     <Compile Include="Configuration\ElasticsearchConfiguration.cs" />
     <Compile Include="Api\Controllers\SimpleTriggerController.cs" />
     <Compile Include="Api\Controllers\CronTriggerController.cs" />
-    <Compile Include="EngineScheduler.cs" />
     <Compile Include="ContainerResolver.cs" />
+    <Compile Include="Scheduler\EngineScheduler.cs" />
+    <Compile Include="Scheduler\IEngineScheduler.cs" />
+    <Compile Include="Scheduler\TriggerStringExtension.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -176,4 +177,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <ItemGroup>
+    <Folder Include="Scheduler\" />
+  </ItemGroup>
 </Project>

IntegrationEngine/EngineScheduler.cs …ationEngine/Scheduler/EngineScheduler.csIntegrationEngine/EngineScheduler.cs renamed to IntegrationEngine/Scheduler/EngineScheduler.cs IntegrationEngine/EngineScheduler.cs renamed to IntegrationEngine/Scheduler/EngineScheduler.cs

@@ -1,12 +1,12 @@
-using IntegrationEngine.Core.Jobs;
-using IntegrationEngine.MessageQueue;
-using IntegrationEngine.Model;
-using Quartz;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using IntegrationEngine.Core.Jobs;
+using IntegrationEngine.Model;
+using Quartz;
+using IntegrationEngine.MessageQueue;
 
-namespace IntegrationEngine
+namespace IntegrationEngine.Scheduler
 {
     public class EngineScheduler : IEngineScheduler
     {
@@ -45,8 +45,9 @@ public void ScheduleJobWithCronTrigger(CronTrigger triggerDefinition, Type jobTy
         {
             var trigger = TriggerBuilder.Create()
                 .WithIdentity(GenerateTriggerId(jobType, triggerDefinition), jobType.Namespace);
-            if (triggerDefinition.CronExpressionString != null)
+            if (triggerDefinition.CronExpressionString != null) {
                 trigger.WithCronSchedule(triggerDefinition.CronExpressionString, x => x.InTimeZone(triggerDefinition.TimeZone));
+            }
             Scheduler.ScheduleJob(jobDetail, trigger.Build());
         }
 

IntegrationEngine/IEngineScheduler.cs …tionEngine/Scheduler/IEngineScheduler.csIntegrationEngine/IEngineScheduler.cs renamed to IntegrationEngine/Scheduler/IEngineScheduler.cs IntegrationEngine/IEngineScheduler.cs renamed to IntegrationEngine/Scheduler/IEngineScheduler.cs

@@ -1,8 +1,8 @@
-using IntegrationEngine.Model;
+using System;
+using IntegrationEngine.Model;
 using Quartz;
-using System;
 
-namespace IntegrationEngine
+namespace IntegrationEngine.Scheduler
 {
     public interface IEngineScheduler
     {

IntegrationEngine/Scheduler/TriggerStringExtension.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace IntegrationEngine.Scheduler
+{
+    public static class TriggerStringExtension
+    {
+        public static bool IsValidCronExpression(this string value)
+        {
+            return Quartz.CronExpression.IsValidExpression(value);
+        }
+    }
+}
+