Merge branch 'master' into VKAlwaysWin/PersistantStorageWithCancellationToken

Author: danielgerlag

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+
+**Describe the change**
+A clear and concise description of what the change is. Any PR submitted without a description of the change will not be reviewed.
+
+**Describe your implementation or design**
+How did you go about implementing the change?
+
+**Tests**
+Did you cover your changes with tests?
+
+**Breaking change**
+Do you changes break compatibility with previous versions?
+
+**Additional context**
+Any additional information you'd like to provide?

ReleaseNotes/3.4.0.md

@@ -0,0 +1,64 @@
+# Workflow Core 3.4.0
+
+## Execute Workflow Middleware
+
+These middleware get run after each workflow execution and can be used to perform additional actions or build metrics/statistics for all workflows in your app.
+
+The following example illustrates how you can use a execute workflow middleware to build [prometheus](https://prometheus.io/) metrics.
+
+Note that you use `WorkflowMiddlewarePhase.ExecuteWorkflow` to specify that it runs after each workflow execution.
+
+**Important:** You should call `next` as part of the workflow middleware to ensure that the next workflow in the chain runs.
+
+```cs
+public class MetricsMiddleware : IWorkflowMiddleware
+{
+    private readonly ConcurrentHashSet<string>() _suspendedWorkflows =
+        new ConcurrentHashSet<string>();
+
+    private readonly Counter _completed;
+    private readonly Counter _suspended;
+
+    public MetricsMiddleware()
+    {
+        _completed = Prometheus.Metrics.CreateCounter(
+            "workflow_completed", "Workflow completed");
+
+        _suspended = Prometheus.Metrics.CreateCounter(
+            "workflow_suspended", "Workflow suspended");
+    }
+
+    public WorkflowMiddlewarePhase Phase =>
+        WorkflowMiddlewarePhase.ExecuteWorkflow;
+
+    public Task HandleAsync(
+        WorkflowInstance workflow,
+        WorkflowDelegate next)
+    {
+        switch (workflow.Status)
+        {
+            case WorkflowStatus.Complete:
+                TryDecrementSuspended(workflow);
+                _completed.Inc();
+                break;
+            case WorkflowStatus.Suspended:
+                _suspendedWorkflows.Add(workflow.Id);
+                _suspended.Inc();
+                break;
+            default:
+                TryDecrementSuspended(workflow);
+                break;
+        }
+
+        return next();
+    }
+
+    private void TryDecrementSuspended(WorkflowInstance workflow)
+    {
+        if (_suspendedWorkflows.TryRemove(workflow.Id))
+        {
+            _suspended.Dec();
+        }
+    }
+}
+```

src/Directory.Build.props

@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
+    <Version>3.5.0</Version>
+    <AssemblyVersion>3.5.0.0</AssemblyVersion>
+    <FileVersion>3.5.0.0</FileVersion>
+    <PackageIconUrl>https://github.com/danielgerlag/workflow-core/raw/master/src/logo.png</PackageIconUrl>
+    <PackageVersion>3.5.0</PackageVersion>
+  </PropertyGroup>
+</Project>

src/WorkflowCore.DSL/Models/DefinitionSource.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace WorkflowCore.Models.DefinitionStorage
 {

src/WorkflowCore.DSL/Models/Envelope.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace WorkflowCore.Models.DefinitionStorage
 {

src/WorkflowCore.DSL/Models/v1/MappingSourceV1.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace WorkflowCore.Models.DefinitionStorage.v1
 {

src/WorkflowCore.DSL/Models/v1/StepSourceV1.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
-using System.Text;
 
 namespace WorkflowCore.Models.DefinitionStorage.v1
 {

src/WorkflowCore.DSL/ServiceCollectionExtensions.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using WorkflowCore.Interface;
 using WorkflowCore.Services.DefinitionStorage;
 

src/WorkflowCore.DSL/Services/DefinitionLoader.cs

@@ -1,17 +1,14 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Text;
 using Newtonsoft.Json.Linq;
 using WorkflowCore.Interface;
 using WorkflowCore.Models;
 using WorkflowCore.Primitives;
-using WorkflowCore.Models.DefinitionStorage;
 using WorkflowCore.Models.DefinitionStorage.v1;
 using WorkflowCore.Exceptions;
 
@@ -250,7 +247,7 @@ private void AttachOutputs(StepSourceV1 source, Type dataType, Type stepType, Wo
         private void AttachOutcomes(StepSourceV1 source, Type dataType, WorkflowStep step)
         {
             if (!string.IsNullOrEmpty(source.NextStepId))
-                step.Outcomes.Add(new ValueOutcome() { ExternalNextStepId = $"{source.NextStepId}" });
+                step.Outcomes.Add(new ValueOutcome { ExternalNextStepId = $"{source.NextStepId}" });
 
             var dataParameter = Expression.Parameter(dataType, "data");
             var outcomeParameter = Expression.Parameter(typeof(object), "outcome");

src/WorkflowCore.DSL/WorkflowCore.DSL.csproj

@@ -2,14 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>3.3.1</Version>
     <Description>DSL extenstion for Workflow Core provding support for JSON and YAML workflow definitions.</Description>
     <Authors>Daniel Gerlag</Authors>
     <Company />
     <Product>WorkflowCore</Product>
-    <PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <ItemGroup>