Merge branch 'master' into remove_reflection

Kahbazi · Kahbazi · commit 89d6372e39ee · 2018-07-22T22:26:13.000+04:30
diff --git a/ReleaseNotes/1.6.6.md b/ReleaseNotes/1.6.6.md
@@ -0,0 +1,3 @@
+# Workflow Core 1.6.6
+
+* Added optional `Reference` parameter to StartWorkflow methods
diff --git a/WorkflowCore.sln b/WorkflowCore.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF47161E-E399-451C-BDE8-E92AAD3BD761}"
 EndProject
@@ -91,6 +91,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReleaseNotes", "ReleaseNote
 		ReleaseNotes\1.3.3.md = ReleaseNotes\1.3.3.md
 		ReleaseNotes\1.4.0.md = ReleaseNotes\1.4.0.md
 		ReleaseNotes\1.6.0.md = ReleaseNotes\1.6.0.md
+		ReleaseNotes\1.6.6.md = ReleaseNotes\1.6.6.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Sample14", "src\samples\WorkflowCore.Sample14\WorkflowCore.Sample14.csproj", "{6BC66637-B42A-4334-ADFB-DBEC9F29D293}"
diff --git a/src/WorkflowCore/Interface/IWorkflowController.cs b/src/WorkflowCore/Interface/IWorkflowController.cs
@@ -7,10 +7,10 @@ namespace WorkflowCore.Interface
 {
     public interface IWorkflowController
     {
-        Task<string> StartWorkflow(string workflowId, object data = null);
-        Task<string> StartWorkflow(string workflowId, int? version, object data = null);
-        Task<string> StartWorkflow<TData>(string workflowId, TData data = null) where TData : class, new();
-        Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null) where TData : class, new();
+        Task<string> StartWorkflow(string workflowId, object data = null, string reference=null);
+        Task<string> StartWorkflow(string workflowId, int? version, object data = null, string reference=null);
+        Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null) where TData : class, new();
+        Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null) where TData : class, new();
 
         Task PublishEvent(string eventName, string eventKey, object eventData, DateTime? effectiveDate = null);
         void RegisterWorkflow<TWorkflow>() where TWorkflow : IWorkflow, new();
diff --git a/src/WorkflowCore/ServiceCollectionExtensions.cs b/src/WorkflowCore/ServiceCollectionExtensions.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {
-        public static void AddWorkflow(this IServiceCollection services, Action<WorkflowOptions> setupAction = null)
+        public static IServiceCollection AddWorkflow(this IServiceCollection services, Action<WorkflowOptions> setupAction = null)
         {
             if (services.Any(x => x.ServiceType == typeof(WorkflowOptions)))
                 throw new InvalidOperationException("Workflow services already registered");
@@ -47,6 +47,8 @@ public static void AddWorkflow(this IServiceCollection services, Action<Workflow
             services.AddTransient<IDefinitionLoader, DefinitionLoader>();
 
             services.AddTransient<Foreach>();
+
+            return services;
         }
     }
 }
diff --git a/src/WorkflowCore/Services/WorkflowController.cs b/src/WorkflowCore/Services/WorkflowController.cs
@@ -29,23 +29,23 @@ public WorkflowController(IPersistenceProvider persistenceStore, IDistributedLoc
             _logger = loggerFactory.CreateLogger<WorkflowController>();
         }
 
-        public Task<string> StartWorkflow(string workflowId, object data = null)
+        public Task<string> StartWorkflow(string workflowId, object data = null, string reference=null)
         {
-            return StartWorkflow(workflowId, null, data);
+            return StartWorkflow(workflowId, null, data, reference);
         }
 
-        public Task<string> StartWorkflow(string workflowId, int? version, object data = null)
+        public Task<string> StartWorkflow(string workflowId, int? version, object data = null, string reference=null)
         {
-            return StartWorkflow<object>(workflowId, version, data);
+            return StartWorkflow<object>(workflowId, version, data, reference);
         }
 
-        public Task<string> StartWorkflow<TData>(string workflowId, TData data = null)
+        public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null) 
             where TData : class, new()
         {
-            return StartWorkflow<TData>(workflowId, null, data);
+            return StartWorkflow<TData>(workflowId, null, data, reference);
         }
 
-        public async Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null)
+        public async Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)
             where TData : class, new()
         {
 
@@ -63,7 +63,8 @@ public async Task<string> StartWorkflow<TData>(string workflowId, int? version,
                 Description = def.Description,
                 NextExecution = 0,
                 CreateTime = DateTime.Now.ToUniversalTime(),
-                Status = WorkflowStatus.Runnable
+                Status = WorkflowStatus.Runnable,
+                Reference = reference
             };
 
             if ((def.DataType != null) && (data == null))
diff --git a/src/WorkflowCore/Services/WorkflowHost.cs b/src/WorkflowCore/Services/WorkflowHost.cs
@@ -43,27 +43,27 @@ public WorkflowHost(IPersistenceProvider persistenceStore, IQueueProvider queueP
             persistenceStore.EnsureStoreExists();
         }
 
-        public Task<string> StartWorkflow(string workflowId, object data = null)
+        public Task<string> StartWorkflow(string workflowId, object data = null, string reference=null)
         {
-            return _workflowController.StartWorkflow(workflowId, data);
+            return _workflowController.StartWorkflow(workflowId, data, reference);
         }
 
-        public Task<string> StartWorkflow(string workflowId, int? version, object data = null)
+        public Task<string> StartWorkflow(string workflowId, int? version, object data = null, string reference=null)
         {
-            return _workflowController.StartWorkflow<object>(workflowId, version, data);
+            return _workflowController.StartWorkflow<object>(workflowId, version, data, reference);
         }
 
-        public Task<string> StartWorkflow<TData>(string workflowId, TData data = null)
+        public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null)
             where TData : class, new()
         {
-            return _workflowController.StartWorkflow<TData>(workflowId, null, data);
+            return _workflowController.StartWorkflow<TData>(workflowId, null, data, reference);
         }
 
 
-        public Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null)
+        public Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)
             where TData : class, new()
         {
-            return _workflowController.StartWorkflow(workflowId, version, data);
+            return _workflowController.StartWorkflow(workflowId, version, data, reference);
         }
 
         public Task PublishEvent(string eventName, string eventKey, object eventData, DateTime? effectiveDate = null)
diff --git a/src/WorkflowCore/WorkflowCore.csproj b/src/WorkflowCore/WorkflowCore.csproj
@@ -15,9 +15,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>Workflow Core is a light weight workflow engine targeting .NET Standard.</Description>
-    <Version>1.6.5</Version>
-    <AssemblyVersion>1.6.5.0</AssemblyVersion>
-    <FileVersion>1.6.5.0</FileVersion>
+    <Version>1.6.6</Version>
+    <AssemblyVersion>1.6.6.0</AssemblyVersion>
+    <FileVersion>1.6.6.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
     <PackageIconUrl>https://github.com/danielgerlag/workflow-core/raw/master/src/logo.png</PackageIconUrl>
   </PropertyGroup>
diff --git a/src/extensions/WorkflowCore.WebAPI/Controllers/WorkflowsController.cs b/src/extensions/WorkflowCore.WebAPI/Controllers/WorkflowsController.cs
@@ -45,7 +45,7 @@ public async Task<IActionResult> Get(string id)
 
         [HttpPost("{id}")]
         [HttpPost("{id}/{version}")]        
-        public async Task<IActionResult> Post(string id, int? version, [FromBody]JObject data)
+        public async Task<IActionResult> Post(string id, int? version, string reference, [FromBody]JObject data)
         {
             string workflowId = null;            
             var def = _registry.GetDefinition(id, version);
@@ -55,11 +55,11 @@ public async Task<IActionResult> Post(string id, int? version, [FromBody]JObject
             {
                 var dataStr = JsonConvert.SerializeObject(data);
                 var dataObj = JsonConvert.DeserializeObject(dataStr, def.DataType);
-                workflowId = await _workflowHost.StartWorkflow(id, version, dataObj);
+                workflowId = await _workflowHost.StartWorkflow(id, version, dataObj, reference);
             }
             else
             {
-                workflowId = await _workflowHost.StartWorkflow(id, version, null);
+                workflowId = await _workflowHost.StartWorkflow(id, version, null, reference);
             }
             
             return Ok(workflowId);
diff --git a/src/samples/WorkflowCore.Sample01/Program.cs b/src/samples/WorkflowCore.Sample01/Program.cs
@@ -22,7 +22,7 @@ public static void Main(string[] args)
             host.RegisterWorkflow<HelloWorldWorkflow>();        
             host.Start();            
 
-            host.StartWorkflow("HelloWorld", 1, null);
+            host.StartWorkflow("HelloWorld");
             
             Console.ReadLine();
             host.Stop();
diff --git a/src/samples/WorkflowCore.Sample02/Program.cs b/src/samples/WorkflowCore.Sample02/Program.cs
@@ -21,7 +21,7 @@ public static void Main(string[] args)
             host.RegisterWorkflow<SimpleDecisionWorkflow>();
             host.Start();
 
-            host.StartWorkflow("Simple Decision Workflow", 1, null);
+            host.StartWorkflow("Simple Decision Workflow");
 
             Console.ReadLine();
             host.Stop();
diff --git a/src/samples/WorkflowCore.Sample05/Program.cs b/src/samples/WorkflowCore.Sample05/Program.cs
@@ -22,7 +22,7 @@ public static void Main(string[] args)
             host.RegisterWorkflow<DeferSampleWorkflow>();
             host.Start();
 
-            host.StartWorkflow("DeferSampleWorkflow", 1, null);
+            host.StartWorkflow("DeferSampleWorkflow", 1, null, null);
                         
             Console.ReadLine();
             host.Stop();
diff --git a/src/samples/WorkflowCore.Sample06/Program.cs b/src/samples/WorkflowCore.Sample06/Program.cs
@@ -22,7 +22,7 @@ public static void Main(string[] args)
             host.RegisterWorkflow<MultipleOutcomeWorkflow>();
             host.Start();
 
-            host.StartWorkflow("MultipleOutcomeWorkflow", 1, null);
+            host.StartWorkflow("MultipleOutcomeWorkflow", 1, null, null);
 
             Console.ReadLine();
             host.Stop();
diff --git a/src/samples/WorkflowCore.Sample15/Program.cs b/src/samples/WorkflowCore.Sample15/Program.cs
@@ -18,7 +18,7 @@ public static void Main(string[] args)
             host.RegisterWorkflow<HelloWorldWorkflow>();
             host.Start();
 
-            host.StartWorkflow("HelloWorld", 1, null);
+            host.StartWorkflow("HelloWorld", 1, null, null);
 
             Console.ReadLine();
             host.Stop();
diff --git a/test/WorkflowCore.UnitTests/BasePersistenceFixture.cs b/test/WorkflowCore.UnitTests/BasePersistenceFixture.cs
@@ -49,7 +49,8 @@ public void GetWorkflowInstance_should_retrieve_workflow()
                 Status = WorkflowStatus.Runnable,
                 NextExecution = 0,
                 Version = 1,
-                WorkflowDefinitionId = "My Workflow"
+                WorkflowDefinitionId = "My Workflow",
+                Reference =  "My Reference"
             };
             workflow.ExecutionPointers.Add(new ExecutionPointer()
             {
@@ -76,7 +77,8 @@ public void PersistWorkflow()
                 NextExecution = 0,
                 Version = 1,
                 WorkflowDefinitionId = "My Workflow",
-                CreateTime = new DateTime(2000, 1, 1).ToUniversalTime()
+                CreateTime = new DateTime(2000, 1, 1).ToUniversalTime(),
+                Reference = "My Reference"
             };
             oldWorkflow.ExecutionPointers.Add(new ExecutionPointer()
             {
@@ -87,6 +89,7 @@ public void PersistWorkflow()
             var workflowId = Subject.CreateNewWorkflow(oldWorkflow).Result;
             var newWorkflow = Utils.DeepCopy(oldWorkflow);
             newWorkflow.Data = oldWorkflow.Data;
+            newWorkflow.Reference = oldWorkflow.Reference;
             newWorkflow.NextExecution = 7;
             newWorkflow.ExecutionPointers.Add(new ExecutionPointer() { Id = Guid.NewGuid().ToString(), Active = true, StepId = 1 });
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Workflow Core 1.6.6`
	`2`	`+`
	`3`	+* Added optional `Reference` parameter to StartWorkflow methods
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ namespace WorkflowCore.Interface`
`7`	`7`	`{`
`8`	`8`	`public interface IWorkflowController`
`9`	`9`	`{`
`10`		`- Task<string> StartWorkflow(string workflowId, object data = null);`
`11`		`- Task<string> StartWorkflow(string workflowId, int? version, object data = null);`
`12`		`- Task<string> StartWorkflow<TData>(string workflowId, TData data = null) where TData : class, new();`
`13`		`- Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null) where TData : class, new();`
	`10`	`+ Task<string> StartWorkflow(string workflowId, object data = null, string reference=null);`
	`11`	`+ Task<string> StartWorkflow(string workflowId, int? version, object data = null, string reference=null);`
	`12`	`+ Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null) where TData : class, new();`
	`13`	`+ Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null) where TData : class, new();`
`14`	`14`
`15`	`15`	`Task PublishEvent(string eventName, string eventKey, object eventData, DateTime? effectiveDate = null);`
`16`	`16`	`void RegisterWorkflow<TWorkflow>() where TWorkflow : IWorkflow, new();`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace Microsoft.Extensions.DependencyInjection`
`16`	`16`	`{`
`17`	`17`	`public static class ServiceCollectionExtensions`
`18`	`18`	`{`
`19`		`- public static void AddWorkflow(this IServiceCollection services, Action<WorkflowOptions> setupAction = null)`
	`19`	`+ public static IServiceCollection AddWorkflow(this IServiceCollection services, Action<WorkflowOptions> setupAction = null)`
`20`	`20`	`{`
`21`	`21`	`if (services.Any(x => x.ServiceType == typeof(WorkflowOptions)))`
`22`	`22`	`throw new InvalidOperationException("Workflow services already registered");`
`@@ -47,6 +47,8 @@ public static void AddWorkflow(this IServiceCollection services, Action<Workflow`
`47`	`47`	`services.AddTransient<IDefinitionLoader, DefinitionLoader>();`
`48`	`48`
`49`	`49`	`services.AddTransient<Foreach>();`
	`50`	`+`
	`51`	`+ return services;`
`50`	`52`	`}`
`51`	`53`	`}`
`52`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,23 +29,23 @@ public WorkflowController(IPersistenceProvider persistenceStore, IDistributedLoc`
`29`	`29`	`_logger = loggerFactory.CreateLogger<WorkflowController>();`
`30`	`30`	`}`
`31`	`31`
`32`		`- public Task<string> StartWorkflow(string workflowId, object data = null)`
	`32`	`+ public Task<string> StartWorkflow(string workflowId, object data = null, string reference=null)`
`33`	`33`	`{`
`34`		`- return StartWorkflow(workflowId, null, data);`
	`34`	`+ return StartWorkflow(workflowId, null, data, reference);`
`35`	`35`	`}`
`36`	`36`
`37`		`- public Task<string> StartWorkflow(string workflowId, int? version, object data = null)`
	`37`	`+ public Task<string> StartWorkflow(string workflowId, int? version, object data = null, string reference=null)`
`38`	`38`	`{`
`39`		`- return StartWorkflow<object>(workflowId, version, data);`
	`39`	`+ return StartWorkflow<object>(workflowId, version, data, reference);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public Task<string> StartWorkflow<TData>(string workflowId, TData data = null)`
	`42`	`+ public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null)`
`43`	`43`	`where TData : class, new()`
`44`	`44`	`{`
`45`		`- return StartWorkflow<TData>(workflowId, null, data);`
	`45`	`+ return StartWorkflow<TData>(workflowId, null, data, reference);`
`46`	`46`	`}`
`47`	`47`
`48`		`- public async Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null)`
	`48`	`+ public async Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)`
`49`	`49`	`where TData : class, new()`
`50`	`50`	`{`
`51`	`51`
`@@ -63,7 +63,8 @@ public async Task<string> StartWorkflow<TData>(string workflowId, int? version,`
`63`	`63`	`Description = def.Description,`
`64`	`64`	`NextExecution = 0,`
`65`	`65`	`CreateTime = DateTime.Now.ToUniversalTime(),`
`66`		`- Status = WorkflowStatus.Runnable`
	`66`	`+ Status = WorkflowStatus.Runnable,`
	`67`	`+ Reference = reference`
`67`	`68`	`};`
`68`	`69`
`69`	`70`	`if ((def.DataType != null) && (data == null))`
Original file line number	Diff line number	Diff line change
`@@ -43,27 +43,27 @@ public WorkflowHost(IPersistenceProvider persistenceStore, IQueueProvider queueP`
`43`	`43`	`persistenceStore.EnsureStoreExists();`
`44`	`44`	`}`
`45`	`45`
`46`		`- public Task<string> StartWorkflow(string workflowId, object data = null)`
	`46`	`+ public Task<string> StartWorkflow(string workflowId, object data = null, string reference=null)`
`47`	`47`	`{`
`48`		`- return _workflowController.StartWorkflow(workflowId, data);`
	`48`	`+ return _workflowController.StartWorkflow(workflowId, data, reference);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public Task<string> StartWorkflow(string workflowId, int? version, object data = null)`
	`51`	`+ public Task<string> StartWorkflow(string workflowId, int? version, object data = null, string reference=null)`
`52`	`52`	`{`
`53`		`- return _workflowController.StartWorkflow<object>(workflowId, version, data);`
	`53`	`+ return _workflowController.StartWorkflow<object>(workflowId, version, data, reference);`
`54`	`54`	`}`
`55`	`55`
`56`		`- public Task<string> StartWorkflow<TData>(string workflowId, TData data = null)`
	`56`	`+ public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null)`
`57`	`57`	`where TData : class, new()`
`58`	`58`	`{`
`59`		`- return _workflowController.StartWorkflow<TData>(workflowId, null, data);`
	`59`	`+ return _workflowController.StartWorkflow<TData>(workflowId, null, data, reference);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`
`63`		`- public Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null)`
	`63`	`+ public Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)`
`64`	`64`	`where TData : class, new()`
`65`	`65`	`{`
`66`		`- return _workflowController.StartWorkflow(workflowId, version, data);`
	`66`	`+ return _workflowController.StartWorkflow(workflowId, version, data, reference);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public Task PublishEvent(string eventName, string eventKey, object eventData, DateTime? effectiveDate = null)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public async Task<IActionResult> Get(string id)`
`45`	`45`
`46`	`46`	`[HttpPost("{id}")]`
`47`	`47`	`[HttpPost("{id}/{version}")]`
`48`		`- public async Task<IActionResult> Post(string id, int? version, [FromBody]JObject data)`
	`48`	`+ public async Task<IActionResult> Post(string id, int? version, string reference, [FromBody]JObject data)`
`49`	`49`	`{`
`50`	`50`	`string workflowId = null;`
`51`	`51`	`var def = _registry.GetDefinition(id, version);`
`@@ -55,11 +55,11 @@ public async Task<IActionResult> Post(string id, int? version, [FromBody]JObject`
`55`	`55`	`{`
`56`	`56`	`var dataStr = JsonConvert.SerializeObject(data);`
`57`	`57`	`var dataObj = JsonConvert.DeserializeObject(dataStr, def.DataType);`
`58`		`- workflowId = await _workflowHost.StartWorkflow(id, version, dataObj);`
	`58`	`+ workflowId = await _workflowHost.StartWorkflow(id, version, dataObj, reference);`
`59`	`59`	`}`
`60`	`60`	`else`
`61`	`61`	`{`
`62`		`- workflowId = await _workflowHost.StartWorkflow(id, version, null);`
	`62`	`+ workflowId = await _workflowHost.StartWorkflow(id, version, null, reference);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`return Ok(workflowId);`