Merge branch 'develop'

Author: ethanhann

IntegrationEngine.Client/IJsonConvert.cs

@@ -5,6 +5,7 @@ namespace IntegrationEngine.Client
     public interface IJsonConvert
     {
         T DeserializeObject<T>(string value);
+        string SerializeObject(object value);
     }
 }
 

IntegrationEngine.Client/InEngineClient.cs

@@ -80,7 +80,8 @@ public TItem Get<TItem>(string id) where TItem : class, IHasStringId
         public TItem Create<TItem>(TItem item)
         {
             var request = new RestRequest(typeof(TItem).Name, Method.POST);
-            request.AddObject(item);
+            var json = JsonConvert.SerializeObject(item);
+            request.AddParameter("text/json", json, ParameterType.RequestBody);
             var result = RestClient.Execute(request);
             return JsonConvert.DeserializeObject<TItem>(result.Content);
         }
@@ -89,7 +90,8 @@ public TItem Update<TItem>(TItem item) where TItem : class, IHasStringId
         {
             var request = new RestRequest(typeof(TItem).Name + "/{id}", Method.PUT);
             request.AddUrlSegment("id", item.Id);
-            request.AddObject(item);
+            var json = JsonConvert.SerializeObject(item);
+            request.AddParameter("text/json", json, ParameterType.RequestBody);
             var result = RestClient.Execute(request);
             return JsonConvert.DeserializeObject<TItem>(result.Content);
         }

IntegrationEngine.Client/JsonConvertAdapter.cs

@@ -9,6 +9,11 @@ public virtual T DeserializeObject<T>(string value)
         {
             return JsonConvert.DeserializeObject<T>(value);
         }
+
+        public virtual string SerializeObject(object value)
+        {
+            return JsonConvert.SerializeObject(value);
+        }
     }
 }
 

IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj

@@ -95,6 +95,10 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <ProjectReference Include="..\IntegrationEngine.Client\IntegrationEngine.Client.csproj">
+      <Project>{f3fcb706-f0dd-46c1-b121-785757fae9b9}</Project>
+      <Name>IntegrationEngine.Client</Name>
+    </ProjectReference>
     <ProjectReference Include="..\IntegrationEngine.Core\IntegrationEngine.Core.csproj">
       <Project>{3F3794D7-4078-4D26-954C-7864173EDD86}</Project>
       <Name>IntegrationEngine.Core</Name>

IntegrationEngine/Api/TriggerControllerBase.cs

@@ -42,7 +42,7 @@ public IHttpActionResult Put(string id, T trigger)
             if (id != trigger.Id)
                 return BadRequest();
             if (!ModelState.IsValid)
-                BadRequest(ModelState);
+                return BadRequest(ModelState);
             var updatedTrigger = Repository.Update(trigger);
             EngineScheduler.ScheduleJobWithTrigger(updatedTrigger);
             return Ok(updatedTrigger);
@@ -53,7 +53,7 @@ public IHttpActionResult Put(string id, T trigger)
         public IHttpActionResult Post(T trigger)
         {
             if (!ModelState.IsValid)
-                BadRequest(ModelState);
+                return BadRequest(ModelState);
             var triggerWithId = Repository.Insert(trigger);
             EngineScheduler.ScheduleJobWithTrigger(triggerWithId);
             return CreatedAtRoute("DefaultApi", new { id = triggerWithId.Id }, triggerWithId);

IntegrationEngine/DataAnnotations/TimeZoneIdAttribute.cs

@@ -151,7 +151,6 @@
     <Compile Include="Configuration\MessageQueueConfiguration.cs" />
     <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" />
@@ -211,4 +210,4 @@
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <ItemGroup />
   <ItemGroup />
-</Project>
+</Project>

IntegrationEngine/IntegrationEngine.csproj

@@ -1,9 +1,10 @@
 using IntegrationEngine.DataAnnotations;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace IntegrationEngine.Scheduler
 {
-    public class CronTrigger : IntegrationEngine.Model.CronTrigger
+    public class CronTrigger : IntegrationEngine.Model.CronTrigger, IntegrationEngine.Model.IHasParameters
     {
         [Required]
         [JobType]
@@ -13,5 +14,7 @@ public class CronTrigger : IntegrationEngine.Model.CronTrigger
         public override string CronExpressionString { get; set; }
         [Range(0, 1)]
         public override int StateId { get; set; }
+
+        public override IDictionary<string, string> Parameters { get; set; }
     }
 }

IntegrationEngine/Scheduler/CronTrigger.cs

@@ -1,14 +1,16 @@
 using IntegrationEngine.DataAnnotations;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace IntegrationEngine.Scheduler
 {
-    public class SimpleTrigger : IntegrationEngine.Model.SimpleTrigger
+    public class SimpleTrigger : IntegrationEngine.Model.SimpleTrigger, IntegrationEngine.Model.IHasParameters
     {
         [Required]
         [JobType]
         public override string JobType { get; set; }
         [Range(0, 1)]
         public override int StateId { get; set; }
+        public override IDictionary<string, string> Parameters { get; set; }
     }
 }

IntegrationEngine/Scheduler/SimpleTrigger.cs

@@ -3,7 +3,7 @@
 // Assembly Info that is shared across the product
 [assembly: AssemblyProduct("InEngine.NET")]
 [assembly: AssemblyVersion("2.0.0.*")]
-[assembly: AssemblyInformationalVersion("2.0.0-beta8")]
+[assembly: AssemblyInformationalVersion("2.0.0-beta10")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ethan Hann")]