Merge branch 'develop'

ethanhann · ethanhann · commit 87cc09541932 · 2015-01-24T11:15:21.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,5 @@
+language: csharp
+solution: IntegrationEngine.sln
+
+script:
+  - xbuild /p:Configuration=Release IntegrationEngine.sln
diff --git a/IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj b/IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj
@@ -85,6 +85,10 @@
       <Project>{3F3794D7-4078-4D26-954C-7864173EDD86}</Project>
       <Name>IntegrationEngine.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\IntegrationEngine.Model\IntegrationEngine.Model.csproj">
+      <Project>{0b499fe4-0bdb-4080-bcb7-f8d4ce54a4ff}</Project>
+      <Name>IntegrationEngine.Model</Name>
+    </ProjectReference>
     <ProjectReference Include="..\IntegrationEngine\IntegrationEngine.csproj">
       <Project>{7D49353D-A68C-4ACA-A6A5-40B1C314C30E}</Project>
       <Name>IntegrationEngine</Name>
diff --git a/IntegrationEngine.ConsoleHost/IntegrationJobs/CarReport/CarMailMessageJob.cs b/IntegrationEngine.ConsoleHost/IntegrationJobs/CarReport/CarMailMessageJob.cs
@@ -1,15 +1,15 @@
 ﻿using IntegrationEngine.Core.Jobs;
 using IntegrationEngine.Core.Mail;
 using System;
+using System.Collections.Generic;
 using System.Net.Mail;
 
 namespace IntegrationEngine.ConsoleHost.Car
 {
-    public class CarMailMessageJob : IMailJob
+    public class CarMailMessageJob : IMailJob, IParameterizedJob
     {
         public IMailClient MailClient { get; set; }
-        public TimeSpan Interval { get; set; }
-        public DateTimeOffset StartTimeUtc { get; set; }
+        public IDictionary<string, string> Parameters { get; set; }
 
         public void Run()
         {
diff --git a/IntegrationEngine.Core/IntegrationEngine.Core.csproj b/IntegrationEngine.Core/IntegrationEngine.Core.csproj
@@ -86,6 +86,7 @@
     <Compile Include="Jobs\IIntegrationJob.cs" />
     <Compile Include="Jobs\ILogJob.cs" />
     <Compile Include="Jobs\IMailJob.cs" />
+    <Compile Include="Jobs\IParameterizedJob.cs" />
     <Compile Include="Jobs\ISqlJob.cs" />
     <Compile Include="Jobs\SqlJob.cs" />
     <Compile Include="Mail\IMailClient.cs" />
diff --git a/IntegrationEngine.Core/Jobs/IParameterizedJob.cs b/IntegrationEngine.Core/Jobs/IParameterizedJob.cs
@@ -0,0 +1,12 @@
+﻿using IntegrationEngine.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Core.Jobs
+{
+    public interface IParameterizedJob : IIntegrationJob, IHasParameters
+    {}
+}
diff --git a/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj b/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj
@@ -60,12 +60,21 @@
     <Compile Include="..\IntegrationEngine.Model\ICronTrigger.cs">
       <Link>ICronTrigger.cs</Link>
     </Compile>
+    <Compile Include="..\IntegrationEngine.Model\IHasParameters.cs">
+      <Link>IHasParameters.cs</Link>
+    </Compile>
     <Compile Include="..\IntegrationEngine.Model\IHasStringId.cs">
       <Link>IHasStringId.cs</Link>
     </Compile>
+    <Compile Include="..\IntegrationEngine.Model\IJobType.cs">
+      <Link>IJobType.cs</Link>
+    </Compile>
     <Compile Include="..\IntegrationEngine.Model\ISimpleTrigger.cs">
       <Link>ISimpleTrigger.cs</Link>
     </Compile>
+    <Compile Include="..\IntegrationEngine.Model\JobType.cs">
+      <Link>JobType.cs</Link>
+    </Compile>
     <Compile Include="..\IntegrationEngine.Model\TriggerPropertyExtension.cs">
       <Link>TriggerPropertyExtension.cs</Link>
     </Compile>
diff --git a/IntegrationEngine.Model/CronTrigger.cs b/IntegrationEngine.Model/CronTrigger.cs
@@ -1,6 +1,6 @@
-﻿using CronExpressionDescriptor;
-using Nest;
+﻿using Nest;
 using System;
+using System.Collections.Generic;
 
 namespace IntegrationEngine.Model
 {
@@ -11,6 +11,7 @@ public class CronTrigger : ICronTrigger
         public virtual string CronExpressionString { get; set; }
         public virtual string TimeZoneId { get; set; }
         public virtual int StateId { get; set; }
+        public virtual IDictionary<string, string> Parameters { get; set; }
         [ElasticProperty(OptOut = true)]
         public virtual string CronExpressionDescription { get { return CronExpressionString.GetHumanReadableCronSchedule(); } }
         [ElasticProperty(OptOut = true)]
diff --git a/IntegrationEngine.Model/IHasParameters.cs b/IntegrationEngine.Model/IHasParameters.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public interface IHasParameters
+    {
+        IDictionary<string, string> Parameters { get; set; }
+    }
+}
diff --git a/IntegrationEngine.Model/IIntegrationJobTrigger.cs b/IntegrationEngine.Model/IIntegrationJobTrigger.cs
@@ -1,8 +1,9 @@
 ﻿using System;
+using System.Collections.Generic;
 
 namespace IntegrationEngine.Model
 {
-    public interface IIntegrationJobTrigger : IHasStringId
+    public interface IIntegrationJobTrigger : IHasStringId, IHasParameters
     {
         string JobType { get; set; }
         int StateId { get; set; }
diff --git a/IntegrationEngine.Model/IJobType.cs b/IntegrationEngine.Model/IJobType.cs
@@ -0,0 +1,14 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public interface IJobType
+    {
+        string Name { get; set; }
+        string FullName { get; set; }
+    }
+}
diff --git a/IntegrationEngine.Model/IntegrationEngine.Model.csproj b/IntegrationEngine.Model/IntegrationEngine.Model.csproj
@@ -58,8 +58,11 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="ICronTrigger.cs" />
+    <Compile Include="IHasParameters.cs" />
     <Compile Include="IHasStringId.cs" />
+    <Compile Include="IJobType.cs" />
     <Compile Include="ISimpleTrigger.cs" />
+    <Compile Include="JobType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CronTrigger.cs" />
     <Compile Include="SimpleTrigger.cs" />
diff --git a/IntegrationEngine.Model/JobType.cs b/IntegrationEngine.Model/JobType.cs
@@ -0,0 +1,14 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public class JobType : IJobType
+    {
+        public string Name { get; set; }
+        public string FullName { get; set; }
+    }
+}
diff --git a/IntegrationEngine.Model/SimpleTrigger.cs b/IntegrationEngine.Model/SimpleTrigger.cs
@@ -1,6 +1,6 @@
-﻿using System;
-using IntegrationEngine.Model;
-using Nest;
+﻿using Nest;
+using System;
+using System.Collections.Generic;
 
 namespace IntegrationEngine.Model
 {
@@ -12,6 +12,7 @@ public class SimpleTrigger : ISimpleTrigger
         public virtual TimeSpan RepeatInterval { get; set; }
         public virtual DateTimeOffset StartTimeUtc { get; set; }
         public virtual int StateId { get; set; }
+        public virtual IDictionary<string, string> Parameters { get; set; }
         [ElasticProperty(OptOut = true)]
         public virtual string StateDescription { get { return StateId.GetStateDescription(); } }
 
diff --git a/IntegrationEngine/Api/Controllers/JobTypeController.cs b/IntegrationEngine/Api/Controllers/JobTypeController.cs
@@ -8,6 +8,7 @@
 using IntegrationEngine.Scheduler;
 using Quartz.Impl.Matchers;
 using Quartz;
+using System;
 
 namespace IntegrationEngine.Api.Controllers
 {
@@ -24,11 +25,9 @@ public JobTypeController(IEngineScheduler engineScheduler)
             EngineScheduler = engineScheduler;
         }
 
-        public IHttpActionResult GetJobTypes()
+        public IEnumerable<JobType> GetJobTypes()
         {
-            return Ok(EngineScheduler.Scheduler
-                .GetJobKeys(GroupMatcher<JobKey>.AnyGroup())
-                .Select(x => x.ToString()).ToList());
+            return EngineScheduler.IntegrationJobTypes.Select(x => new JobType() { FullName = x.FullName, Name = x.Name });
         }
     }
 }
diff --git a/IntegrationEngine/EngineHostConfiguration.cs b/IntegrationEngine/EngineHostConfiguration.cs
@@ -142,12 +142,10 @@ public void SetupScheduler()
             var cronTriggerRepo = Container.Resolve<ESRepository<CronTrigger>>();
             var allCronTriggers = cronTriggerRepo.SelectAll();
             var cronTriggers = allCronTriggers.Where(x => !string.IsNullOrWhiteSpace(x.CronExpressionString));
-            foreach (var jobType in IntegrationJobTypes)
-            {
-                var jobDetail = engineScheduler.JobDetailFactory(jobType);
-                engineScheduler.ScheduleJobsWithTriggers(simpleTriggers, jobType, jobDetail);
-                engineScheduler.ScheduleJobsWithTriggers(cronTriggers, jobType, jobDetail);
-            }
+            foreach (var trigger in simpleTriggers)
+                engineScheduler.ScheduleJobWithSimpleTrigger(trigger);
+            foreach (var trigger in cronTriggers)
+                engineScheduler.ScheduleJobWithCronTrigger(trigger);
             foreach(var cronTrigger in allCronTriggers.Where(x => string.IsNullOrWhiteSpace(x.CronExpressionString)))
                 log.Warn(x => x("Cron expression for trigger ({0}) is null, empty, or whitespace.", cronTrigger.Id));
         }
@@ -165,10 +163,13 @@ public void SetupElasticClient()
             var elasticClient = new ElasticClient(settings);
             var log = Container.Resolve<ILog>();
             Container.RegisterInstance<IElasticClient>(elasticClient);
-            Container.RegisterInstance<ESRepository<SimpleTrigger>>(new ESRepository<SimpleTrigger>() {
+            var simpleTriggerRepo = new ESRepository<SimpleTrigger>() {
                 ElasticClient = elasticClient,
                 Log = log,
-            });
+            };
+            if (!simpleTriggerRepo.IsServerAvailable())
+                log.Warn("Elasticsearch server does not appear to be available.");
+            Container.RegisterInstance<ESRepository<SimpleTrigger>>(simpleTriggerRepo);
             Container.RegisterInstance<ESRepository<CronTrigger>>(new ESRepository<CronTrigger>() {
                 ElasticClient = elasticClient,
                 Log = log,
diff --git a/IntegrationEngine/IntegrationEngine.csproj b/IntegrationEngine/IntegrationEngine.csproj
@@ -150,6 +150,7 @@
     <Compile Include="Configuration\WebApiConfiguration.cs" />
     <Compile Include="DataAnnotations\CronExpressionStringAttribute.cs" />
     <Compile Include="DataAnnotations\TimeZoneIdAttribute.cs" />
+    <Compile Include="MessageQueue\DispatchMessage.cs" />
     <Compile Include="MessageQueue\IMessageQueueListener.cs" />
     <Compile Include="MessageQueue\MsmqClient.cs" />
     <Compile Include="MessageQueue\MsmqListener.cs" />
diff --git a/IntegrationEngine/MessageQueue/DispatchMessage.cs b/IntegrationEngine/MessageQueue/DispatchMessage.cs
@@ -0,0 +1,15 @@
+﻿using IntegrationEngine.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.MessageQueue
+{
+    public class DispatchMessage : IHasParameters
+    {
+        public string JobTypeName { get; set; }
+        public IDictionary<string, string> Parameters { get; set; }
+    }
+}
diff --git a/IntegrationEngine/MessageQueue/IMessageQueueClient.cs b/IntegrationEngine/MessageQueue/IMessageQueueClient.cs
@@ -1,10 +1,11 @@
 ﻿using System;
+using System.Collections.Generic;
 
 namespace IntegrationEngine.MessageQueue
 {
     public interface IMessageQueueClient
     {
-        void Publish<T>(T value);
+        void Publish<T>(T value, IDictionary<string, string> parameters);
         bool IsServerAvailable();
     }
 }
diff --git a/IntegrationEngine/MessageQueue/IntegrationJobDispatcherJob.cs b/IntegrationEngine/MessageQueue/IntegrationJobDispatcherJob.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using Microsoft.Practices.Unity;
 using Quartz;
+using IntegrationEngine.Model;
+using System.Collections.Generic;
 
 namespace IntegrationEngine.MessageQueue
 {
@@ -14,10 +16,13 @@ public IntegrationJobDispatcherJob()
         public virtual void Execute(IJobExecutionContext context)
         {
             var map = context.MergedJobDataMap;
-            if (map.ContainsKey("MessageQueueClient") && map.ContainsKey("IntegrationJob"))
+            if (map.ContainsKey("MessageQueueClient") && 
+                map.ContainsKey("IntegrationJob") && 
+                map.ContainsKey("Parameters"))
             {
                 var messageQueueClient = map.Get("MessageQueueClient") as IMessageQueueClient;
-                messageQueueClient.Publish(map.Get("IntegrationJob"));
+                var parameters = map.Get("Parameters") as IDictionary<string, string>;
+                messageQueueClient.Publish(map.Get("IntegrationJob"), parameters);
             }
         }
     }
diff --git a/IntegrationEngine/MessageQueue/MsmqClient.cs b/IntegrationEngine/MessageQueue/MsmqClient.cs
@@ -1,5 +1,6 @@
 ﻿﻿using Common.Logging;
 using System;
+using System.Collections.Generic;
 using System.Text;
 using MSMessageQueue = System.Messaging.MessageQueue;
 
@@ -19,7 +20,7 @@ public string QueueName {
         }
         public ILog Log { get; set; }
 
-        public void Publish<T>(T value)
+        public void Publish<T>(T value, IDictionary<string, string> parameters)
         {
             try
             {
diff --git a/IntegrationEngine/MessageQueue/RabbitMqClient.cs b/IntegrationEngine/MessageQueue/RabbitMqClient.cs
@@ -1,9 +1,11 @@
 ﻿using Common.Logging;
 using IntegrationEngine.Configuration;
+using IntegrationEngine.Core.Jobs;
+using Newtonsoft.Json;
+using RabbitMQ.Client.Exceptions;
 using System;
+using System.Collections.Generic;
 using System.Text;
-using System.Net.Sockets;
-using RabbitMQ.Client.Exceptions;
 
 namespace IntegrationEngine.MessageQueue
 {
@@ -16,15 +18,20 @@ public class RabbitMQClient : IMessageQueueClient
         public RabbitMQClient() 
         {}
 
-        public void Publish<T>(T value)
+        public void Publish<T>(T value, IDictionary<string, string> parameters)
         {
             try
             {
                 var type = value.GetType();
-                var message = type.FullName;
+                if (type is IParameterizedJob)
+                    (value as IParameterizedJob).Parameters = parameters;
                 var connection = MessageQueueConnection.GetConnection();
                 using (var channel = connection.CreateModel())
                 {
+                    var message = JsonConvert.SerializeObject(new DispatchMessage {
+                        JobTypeName = type.FullName,
+                        Parameters = parameters,
+                    });
                     channel.QueueBind(MessageQueueConfiguration.QueueName, MessageQueueConfiguration.ExchangeName, "");
                     var body = Encoding.UTF8.GetBytes(message);
                     channel.BasicPublish(MessageQueueConfiguration.ExchangeName, "", null, body);
diff --git a/IntegrationEngine/MessageQueue/RabbitMqListener.cs b/IntegrationEngine/MessageQueue/RabbitMqListener.cs
@@ -4,12 +4,12 @@
 using IntegrationEngine.Core.Mail;
 using IntegrationEngine.Core.Storage;
 using Nest;
+using Newtonsoft.Json;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 
 namespace IntegrationEngine.MessageQueue
@@ -40,17 +40,21 @@ public void Listen()
                 {
                     var eventArgs = (BasicDeliverEventArgs)consumer.Queue.Dequeue();
                     var body = eventArgs.Body;
-                    var message = Encoding.UTF8.GetString(body);
+                    var message = JsonConvert.DeserializeObject<DispatchMessage>(Encoding.UTF8.GetString(body));
                     Log.Debug(x => x("Message queue listener received {0}", message));
                     if (IntegrationJobTypes != null && !IntegrationJobTypes.Any())
                         continue;
-                    var type = IntegrationJobTypes.FirstOrDefault(t => t.FullName.Equals(message));
+                    var type = IntegrationJobTypes.FirstOrDefault(t => t.FullName.Equals(message.JobTypeName));
                     var integrationJob = Activator.CreateInstance(type) as IIntegrationJob;
                     integrationJob = AutoWireJob(integrationJob, type);
                     try
                     {
                         if (integrationJob != null)
+                        {
+                            if (integrationJob.GetType() is IParameterizedJob)
+                                (integrationJob as IParameterizedJob).Parameters = message.Parameters;
                             integrationJob.Run();
+                        }
                     }
                     catch (Exception exception)
                     {
diff --git a/IntegrationEngine/Scheduler/EngineScheduler.cs b/IntegrationEngine/Scheduler/EngineScheduler.cs
diff --git a/IntegrationEngine/Scheduler/IEngineScheduler.cs b/IntegrationEngine/Scheduler/IEngineScheduler.cs
diff --git a/README.md b/README.md
diff --git a/configuration/IntegrationEngine.nlog.xml b/configuration/IntegrationEngine.nlog.xml
diff --git a/doc/change-log.md b/doc/change-log.md
diff --git a/doc/website/css/main.css b/doc/website/css/main.css
diff --git a/doc/website/default.twig b/doc/website/default.twig
diff --git a/doc/website/home.twig b/doc/website/home.twig
diff --git a/doc/website/web-api.twig b/doc/website/web-api.twig

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`using IntegrationEngine.Core.Jobs;`
`2`	`2`	`using IntegrationEngine.Core.Mail;`
`3`	`3`	`using System;`
	`4`	`+using System.Collections.Generic;`
`4`	`5`	`using System.Net.Mail;`
`5`	`6`
`6`	`7`	`namespace IntegrationEngine.ConsoleHost.Car`
`7`	`8`	`{`
`8`		`- public class CarMailMessageJob : IMailJob`
	`9`	`+ public class CarMailMessageJob : IMailJob, IParameterizedJob`
`9`	`10`	`{`
`10`	`11`	`public IMailClient MailClient { get; set; }`
`11`		`- public TimeSpan Interval { get; set; }`
`12`		`- public DateTimeOffset StartTimeUtc { get; set; }`
	`12`	`+ public IDictionary<string, string> Parameters { get; set; }`
`13`	`13`
`14`	`14`	`public void Run()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`
`3`	`4`	`namespace IntegrationEngine.Model`
`4`	`5`	`{`
`5`		`- public interface IIntegrationJobTrigger : IHasStringId`
	`6`	`+ public interface IIntegrationJobTrigger : IHasStringId, IHasParameters`
`6`	`7`	`{`
`7`	`8`	`string JobType { get; set; }`
`8`	`9`	`int StateId { get; set; }`