merge in

neildsouth · neildsouth · commit ad256e7def44 · 2023-10-24T12:16:41.000+01:00
Signed-off-by: Neil South &lt;neil.south@answerdigital.com&gt;
diff --git a/src/Monai.Deploy.WorkflowManager.sln b/src/Monai.Deploy.WorkflowManager.sln
@@ -50,7 +50,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManage
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager", "WorkflowManager\WorkflowManager\Monai.Deploy.WorkflowManager.csproj", "{23AD27A4-40B2-4090-9409-7BABD383A1CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkloadManager.WorkfowExecuter", "WorkflowManager\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj", "{1E485856-E99F-46E0-A1D5-D56DF1657D84}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkloadManager.WorkflowExecuter", "WorkflowManager\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj", "{1E485856-E99F-46E0-A1D5-D56DF1657D84}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.WorkflowManager.PayloadListener", "WorkflowManager\PayloadListener\Monai.Deploy.WorkflowManager.PayloadListener.csproj", "{F1C458DB-3954-4C1C-9294-846DDB68B0DB}"
 EndProject
diff --git a/src/WorkflowManager/Logging/Log.200000.Workflow.cs b/src/WorkflowManager/Logging/Log.200000.Workflow.cs
@@ -55,7 +55,7 @@ public static partial class Log
         public static partial void WorkflowInstanceNotFound(this ILogger logger, string workflowInstanceId);
 
         [LoggerMessage(EventId = 200011, Level = LogLevel.Error, Message = "The following task: {taskId} cannot be found in the workflow instance: {workflowInstanceId}.")]
-        public static partial void TaskNotFoundInWorkfowInstance(this ILogger logger, string taskId, string workflowInstanceId);
+        public static partial void TaskNotFoundInWorkflowInstance(this ILogger logger, string taskId, string workflowInstanceId);
 
         [LoggerMessage(EventId = 200012, Level = LogLevel.Error, Message = "The following task: {taskId} in workflow {workflowInstanceId} is currently timed out and not processing anymore updates, timed out at {timedOut}.")]
         public static partial void TaskTimedOut(this ILogger logger, string taskId, string workflowInstanceId, DateTime timedOut);
@@ -76,7 +76,7 @@ public static partial class Log
         public static partial void ExportFilesNotFound(this ILogger logger, string taskId, string workflowInstanceId);
 
         [LoggerMessage(EventId = 200018, Level = LogLevel.Error, Message = "The following task: {taskId} cannot be found in the workflow: {workflowId}. Payload: {payloadId}")]
-        public static partial void TaskNotFoundInWorkfow(this ILogger logger, string payloadId, string taskId, string workflowId);
+        public static partial void TaskNotFoundInWorkflow(this ILogger logger, string payloadId, string taskId, string workflowId);
 
         [LoggerMessage(EventId = 200019, Level = LogLevel.Debug, Message = "Task destination condition for task {taskId} with resolved condition: {resolvedConditional} resolved to false. initial conditional: {conditions}")]
         public static partial void TaskDestinationConditionFalse(this ILogger logger, string resolvedConditional, string conditions, string taskId);
diff --git a/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj b/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj
@@ -37,6 +37,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Common\Monai.Deploy.WorkflowManager.Common.csproj" />
-    <ProjectReference Include="..\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj" />
+    <ProjectReference Include="..\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/WorkflowManager/MonaiBackgroundService/Worker.cs b/src/WorkflowManager/MonaiBackgroundService/Worker.cs
@@ -21,7 +21,7 @@
 using Monai.Deploy.WorkflowManager.Common.Configuration;
 using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
 using Monai.Deploy.WorkflowManager.Common.Logging;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common;
 using Monai.Deploy.WorkflowManager.MonaiBackgroundService.Logging;
 
 namespace Monai.Deploy.WorkflowManager.Common.MonaiBackgroundService
diff --git a/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj b/src/WorkflowManager/PayloadListener/Monai.Deploy.WorkflowManager.PayloadListener.csproj
@@ -40,7 +40,7 @@
     <ProjectReference Include="..\..\Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj" />
     <ProjectReference Include="..\Contracts\Monai.Deploy.WorkflowManager.Contracts.csproj" />
     <ProjectReference Include="..\Logging\Monai.Deploy.WorkflowManager.Logging.csproj" />
-    <ProjectReference Include="..\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj" />
+    <ProjectReference Include="..\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs
@@ -19,7 +19,7 @@
 using Monai.Deploy.Messaging.Common;
 using Monai.Deploy.Messaging.Events;
 using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Services;
 using Monai.Deploy.WorkflowManager.Logging;
 using Monai.Deploy.WorkflowManager.PayloadListener.Validators;
 
diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json
@@ -830,7 +830,7 @@
           "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"
         }
       },
-      "monai.deploy.workloadmanager.workfowexecuter": {
+      "Monai.Deploy.WorkloadManager.WorkflowExecuter": {
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
diff --git a/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs
@@ -22,7 +22,7 @@
 using Monai.Deploy.WorkflowManager.Common.Logging;
 using Monai.Deploy.WorkflowManager.Common.Miscellaneous;
 
-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common
+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common
 {
     public class ArtifactMapper : IArtifactMapper
     {
diff --git a/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/EventMapper.cs
@@ -20,7 +20,7 @@
 using Monai.Deploy.Storage.Configuration;
 using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
 
-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common
+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common
 {
     public class GenerateTaskUpdateEventParams
     {
diff --git a/src/WorkflowManager/WorkflowExecuter/Common/IArtifactMapper.cs b/src/WorkflowManager/WorkflowExecuter/Common/IArtifactMapper.cs
@@ -16,7 +16,7 @@
 
 using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
 
-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common
+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common
 {
     public interface IArtifactMapper
     {
diff --git a/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs b/src/WorkflowManager/WorkflowExecuter/Common/TaskExecutionStatusExtensions.cs
@@ -17,7 +17,7 @@
 using Ardalis.GuardClauses;
 using Monai.Deploy.Messaging.Events;
 
-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common
+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common
 {
     public static class TaskExecutionStatusExtensions
     {
diff --git a/src/WorkflowManager/WorkflowExecuter/Extensions/TaskExecutionExtension.cs b/src/WorkflowManager/WorkflowExecuter/Extensions/TaskExecutionExtension.cs
@@ -20,7 +20,7 @@
 using Monai.Deploy.WorkflowManager.Common.Miscellaneous;
 using Newtonsoft.Json;
 
-namespace Monai.Deploy.WorkloadManager.WorkfowExecuter.Extensions
+namespace Monai.Deploy.WorkloadManager.WorkflowExecuter.Extensions
 {
     public static class TaskExecutionExtension
     {
diff --git a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj
@@ -1,55 +1,57 @@
-<!--
-  ~ Copyright 2022 MONAI Consortium
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<AdditionalFiles Include="..\..\..\stylecop.json" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\Common\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj" />
-		<ProjectReference Include="..\..\Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj" />
-		<ProjectReference Include="..\Common\Monai.Deploy.WorkflowManager.Common.csproj" />
-		<ProjectReference Include="..\ConditionsResolver\Monai.Deploy.WorkflowManager.ConditionsResolver.csproj" />
-		<ProjectReference Include="..\Contracts\Monai.Deploy.WorkflowManager.Contracts.csproj" />
-		<ProjectReference Include="..\Database\Monai.Deploy.WorkflowManager.Database.csproj" />
-		<ProjectReference Include="..\Logging\Monai.Deploy.WorkflowManager.Logging.csproj" />
-		<ProjectReference Include="..\Storage\Monai.Deploy.WorkflowManager.Storage.csproj" />
-	</ItemGroup>
-
-	<PropertyGroup>
-		<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-		<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
-		<CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset</CodeAnalysisRuleSet>
-	</PropertyGroup>
-
-</Project>
+<!--
+  ~ Copyright 2022 MONAI Consortium
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<AssemblyName>Monai.Deploy.WorkloadManager.WorkflowExecuter</AssemblyName>
+		<RootNamespace>Monai.Deploy.WorkloadManager.WorkflowExecuter</RootNamespace>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<AdditionalFiles Include="..\..\..\stylecop.json" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\Common\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj" />
+		<ProjectReference Include="..\..\Common\Miscellaneous\Monai.Deploy.WorkflowManager.Common.Miscellaneous.csproj" />
+		<ProjectReference Include="..\Common\Monai.Deploy.WorkflowManager.Common.csproj" />
+		<ProjectReference Include="..\ConditionsResolver\Monai.Deploy.WorkflowManager.ConditionsResolver.csproj" />
+		<ProjectReference Include="..\Contracts\Monai.Deploy.WorkflowManager.Contracts.csproj" />
+		<ProjectReference Include="..\Database\Monai.Deploy.WorkflowManager.Database.csproj" />
+		<ProjectReference Include="..\Logging\Monai.Deploy.WorkflowManager.Logging.csproj" />
+		<ProjectReference Include="..\Storage\Monai.Deploy.WorkflowManager.Storage.csproj" />
+	</ItemGroup>
+
+	<PropertyGroup>
+		<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+		<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+		<CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset</CodeAnalysisRuleSet>
+	</PropertyGroup>
+
+</Project>
diff --git a/src/WorkflowManager/WorkflowExecuter/Services/IWorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/IWorkflowExecuterService.cs
@@ -17,7 +17,7 @@
 using Monai.Deploy.Messaging.Events;
 using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
 
-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services
+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Services
 {
     public interface IWorkflowExecuterService
     {
diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs
@@ -34,11 +34,11 @@
 using Monai.Deploy.WorkflowManager.Common.Database.Interfaces;
 using Monai.Deploy.WorkflowManager.Common.Database.Repositories;
 using Monai.Deploy.WorkflowManager.Common.Logging;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common;
-using Monai.Deploy.WorkloadManager.WorkfowExecuter.Extensions;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common;
+using Monai.Deploy.WorkloadManager.WorkflowExecuter.Extensions;
 using Newtonsoft.Json;
 
-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services
+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Services
 {
     public class WorkflowExecuterService : IWorkflowExecuterService
     {
@@ -206,7 +206,7 @@ public async Task<bool> ProcessArtifactReceivedAsync(ArtifactsReceivedEvent mess
             var taskTemplate = workflowTemplate.Workflow?.Tasks.FirstOrDefault(t => t.Id == taskId);
             if (taskTemplate is null)
             {
-                _logger.TaskNotFoundInWorkfow(message.PayloadId.ToString(), taskId, workflowTemplate.Id);
+                _logger.TaskNotFoundInWorkflow(message.PayloadId.ToString(), taskId, workflowTemplate.Id);
                 return false;
             }
 
@@ -253,7 +253,7 @@ private async Task<bool> AllRequiredArtifactsReceivedAsync(ArtifactsReceivedEven
 
             if (taskExecution is null)
             {
-                _logger.TaskNotFoundInWorkfowInstance(taskId, workflowInstanceId);
+                _logger.TaskNotFoundInWorkflowInstance(taskId, workflowInstanceId);
                 return false;
             }
 
@@ -351,7 +351,7 @@ public async Task<bool> ProcessTaskUpdate(TaskUpdateEvent message)
 
             if (currentTask is null)
             {
-                _logger.TaskNotFoundInWorkfowInstance(message.TaskId, message.WorkflowInstanceId);
+                _logger.TaskNotFoundInWorkflowInstance(message.TaskId, message.WorkflowInstanceId);
 
                 return false;
             }
@@ -634,7 +634,7 @@ private async Task<bool> HandleOutputArtifacts(WorkflowInstance workflowInstance
 
             if (revisionTask is null)
             {
-                _logger.TaskNotFoundInWorkfow(workflowInstance.PayloadId, task.TaskId, workflowRevision.WorkflowId);
+                _logger.TaskNotFoundInWorkflow(workflowInstance.PayloadId, task.TaskId, workflowRevision.WorkflowId);
 
                 return false;
             }
@@ -780,7 +780,7 @@ private async Task<List<TaskExecution>> CreateTaskDestinations(WorkflowInstance
 
                 if (newTask is null)
                 {
-                    _logger.TaskNotFoundInWorkfow(workflowInstance.PayloadId, taskDest.Name, workflow?.WorkflowId);
+                    _logger.TaskNotFoundInWorkflow(workflowInstance.PayloadId, taskDest.Name, workflow?.WorkflowId);
 
                     continue;
                 }
diff --git a/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs b/src/WorkflowManager/WorkflowManager/Extentions/WorkflowExecutorExtensions.cs
@@ -25,8 +25,8 @@
 using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services;
 using Monai.Deploy.WorkflowManager.Common.Services.InformaticsGateway;
 using Monai.Deploy.WorkflowManager.Common.Storage.Services;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Services;
 using Monai.Deploy.WorkflowManager.PayloadListener.Services;
 using Monai.Deploy.WorkflowManager.PayloadListener.Validators;
 
diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json
@@ -1106,7 +1106,7 @@
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
-          "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )"
+          "Monai.Deploy.WorkloadManager.WorkflowExecuter": "[1.0.0, )"
         }
       },
       "monai.deploy.workflowmanager.payloadlistener": {
@@ -1116,7 +1116,7 @@
           "Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )",
           "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
           "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )",
-          "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )"
+          "Monai.Deploy.WorkloadManager.WorkflowExecuter": "[1.0.0, )"
         }
       },
       "monai.deploy.workflowmanager.services": {
@@ -1135,7 +1135,7 @@
           "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"
         }
       },
-      "monai.deploy.workloadmanager.workfowexecuter": {
+      "Monai.Deploy.WorkloadManager.WorkflowExecuter": {
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
diff --git a/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs b/tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Hooks.cs
@@ -125,7 +125,7 @@ await RetryPolicy.ExecuteAsync(async () =>
                 }
                 else
                 {
-                    Console.WriteLine("Workfow Executor started. Integration Tests will begin.");
+                    Console.WriteLine("Workflow Executor started. Integration Tests will begin.");
                 }
             });
 
diff --git a/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs b/tests/UnitTests/PayloadListener.Tests/Services/EventPayloadRecieverServiceTests.cs
@@ -24,7 +24,7 @@
 using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces;
 using Monai.Deploy.WorkflowManager.Common.Configuration;
 using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Services;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Services;
 using Monai.Deploy.WorkflowManager.PayloadListener.Services;
 using Monai.Deploy.WorkflowManager.PayloadListener.Validators;
 using Moq;
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/ArtifactMapperTests.cs
@@ -25,7 +25,7 @@
 using Monai.Deploy.Storage.API;
 using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
 using Monai.Deploy.WorkflowManager.Common.Database.Interfaces;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common;
 using Moq;
 using Xunit;
 
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs
@@ -20,7 +20,7 @@
 using Monai.Deploy.Messaging.Events;
 using Monai.Deploy.Storage.Configuration;
 using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common;
 using Xunit;
 
 namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Tests.Common
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/TaskExecutionStatusExtensionsTests.cs
@@ -15,7 +15,7 @@
  */
 
 using Monai.Deploy.Messaging.Events;
-using Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common;
+using Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common;
 using Xunit;
 
 namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Tests.Common
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\WorkflowManager\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj" />
+    <ProjectReference Include="..\..\..\src\WorkflowManager\WorkflowExecuter\Monai.Deploy.WorkloadManager.WorkflowExecuter.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs
diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json

Original file line number	Diff line number	Diff line change
`@@ -830,7 +830,7 @@`
`830`	`830`	`"Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"`
`831`	`831`	`}`
`832`	`832`	`},`
`833`		`- "monai.deploy.workloadmanager.workfowexecuter": {`
	`833`	`+ "Monai.Deploy.WorkloadManager.WorkflowExecuter": {`
`834`	`834`	`"type": "Project",`
`835`	`835`	`"dependencies": {`
`836`	`836`	`"Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`using Monai.Deploy.WorkflowManager.Common.Logging;`
`23`	`23`	`using Monai.Deploy.WorkflowManager.Common.Miscellaneous;`
`24`	`24`
`25`		`-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common`
	`25`	`+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common`
`26`	`26`	`{`
`27`	`27`	`public class ArtifactMapper : IArtifactMapper`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`using Monai.Deploy.Storage.Configuration;`
`21`	`21`	`using Monai.Deploy.WorkflowManager.Common.Contracts.Models;`
`22`	`22`
`23`		`-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common`
	`23`	`+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common`
`24`	`24`	`{`
`25`	`25`	`public class GenerateTaskUpdateEventParams`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`using Monai.Deploy.WorkflowManager.Common.Contracts.Models;`
`18`	`18`
`19`		`-namespace Monai.Deploy.WorkflowManager.Common.WorkfowExecuter.Common`
	`19`	`+namespace Monai.Deploy.WorkflowManager.Common.WorkflowExecuter.Common`
`20`	`20`	`{`
`21`	`21`	`public interface IArtifactMapper`
`22`	`22`	`{`