Merge pull request #865 from Project-MONAI/refactoring

Refactoring
Project-MONAI · Aug 23, 2023 · 6fd4ef2 · 6fd4ef2
2 parents 99bcbeb + 04dcc28
commit 6fd4ef2
Show file tree

Hide file tree

Showing 304 changed files with 2,266 additions and 1,318 deletions.
diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
@@ -28,7 +28,7 @@
     :versions:
     - 4.0.1
     - 4.1.1
-    :when: 2022-10-14 23:36:39.999308652 Z
+    :when: 2023-08-15 16:36:39.999308652 Z
 - - :approve
   - AutoFixture
   - :who: mocsharp
@@ -606,6 +606,7 @@
     - 2.0.0
     - 6.0.4
     - 7.0.0
+    - 6.0.4
     :when: 2022-10-14 23:37:09.821156462 Z
 - - :approve
   - Microsoft.Extensions.Logging.Configuration

diff --git a/...onfiguration/ArgoCallbackConfiguration.cs → ...onfiguration/ArgoCallbackConfiguration.cs b/...onfiguration/ArgoCallbackConfiguration.cs → ...onfiguration/ArgoCallbackConfiguration.cs
@@ -16,7 +16,7 @@
 
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class ArgoCallbackConfiguration
     {

diff --git a/...onfiguration/BackgroundServiceSettings.cs → ...onfiguration/BackgroundServiceSettings.cs b/...onfiguration/BackgroundServiceSettings.cs → ...onfiguration/BackgroundServiceSettings.cs
@@ -16,7 +16,7 @@
 
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class BackgroundServiceSettings
     {

diff --git a/...d/Configuration/ConfigurationValidator.cs → ...n/Configuration/ConfigurationValidator.cs b/...d/Configuration/ConfigurationValidator.cs → ...n/Configuration/ConfigurationValidator.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     /// <summary>
     /// Validates configuration based on application requirements and DICOM VR requirements.

diff --git a/.../Configuration/DicomAgentConfiguration.cs → .../Configuration/DicomAgentConfiguration.cs b/.../Configuration/DicomAgentConfiguration.cs → .../Configuration/DicomAgentConfiguration.cs
@@ -16,7 +16,7 @@
 
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class DicomAgentConfiguration
     {

diff --git a/...tion/Exceptions/ConfigurationException.cs → ...tion/Exceptions/ConfigurationException.cs b/...tion/Exceptions/ConfigurationException.cs → ...tion/Exceptions/ConfigurationException.cs
@@ -17,7 +17,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Monai.Deploy.WorkflowManager.Configuration.Exceptions
+namespace Monai.Deploy.WorkflowManager.Common.Configuration.Exceptions
 {
     /// <summary>
     /// Represnets an exception based upon invalid configuration.

diff --git a/...ration/InformaticsGatewayConfiguration.cs → ...ration/InformaticsGatewayConfiguration.cs b/...ration/InformaticsGatewayConfiguration.cs → ...ration/InformaticsGatewayConfiguration.cs
@@ -16,7 +16,7 @@
 
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class InformaticsGatewayConfiguration
     {

diff --git a/...nfiguration/MessageBrokerConfiguration.cs → ...nfiguration/MessageBrokerConfiguration.cs b/...nfiguration/MessageBrokerConfiguration.cs → ...nfiguration/MessageBrokerConfiguration.cs
@@ -17,7 +17,7 @@
 using Microsoft.Extensions.Configuration;
 using Monai.Deploy.Messaging.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class MessageBrokerConfiguration : MessageBrokerServiceConfiguration
     {

diff --git a/...uration/MessageBrokerConfigurationKeys.cs → ...uration/MessageBrokerConfigurationKeys.cs b/...uration/MessageBrokerConfigurationKeys.cs → ...uration/MessageBrokerConfigurationKeys.cs
@@ -16,7 +16,7 @@
 
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class MessageBrokerConfigurationKeys
     {

diff --git a/...ploy.WorkflowManager.Configuration.csproj → ...rkflowManager.Common.Configuration.csproj b/...ploy.WorkflowManager.Configuration.csproj → ...rkflowManager.Common.Configuration.csproj
diff --git a/src/Shared/Configuration/PagedOptions.cs → src/Common/Configuration/PagedOptions.cs b/src/Shared/Configuration/PagedOptions.cs → src/Common/Configuration/PagedOptions.cs
@@ -15,7 +15,7 @@
  */
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class PagedOptions
     {

diff --git a/...hared/Configuration/PaginationSettings.cs → ...ommon/Configuration/PaginationSettings.cs b/...hared/Configuration/PaginationSettings.cs → ...ommon/Configuration/PaginationSettings.cs
@@ -16,7 +16,7 @@
 
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class EndpointSettings
     {

diff --git a/...hared/Configuration/RetryConfiguration.cs → ...ommon/Configuration/RetryConfiguration.cs b/...hared/Configuration/RetryConfiguration.cs → ...ommon/Configuration/RetryConfiguration.cs
@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class RetryConfiguration
     {

diff --git a/...red/Configuration/StorageConfiguration.cs → ...mon/Configuration/StorageConfiguration.cs b/...red/Configuration/StorageConfiguration.cs → ...mon/Configuration/StorageConfiguration.cs
@@ -18,7 +18,7 @@
 using Microsoft.Extensions.Configuration;
 using Monai.Deploy.Storage.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class StorageConfiguration : StorageServiceConfiguration
     {

diff --git a/...Configuration/TaskManagerConfiguration.cs → ...Configuration/TaskManagerConfiguration.cs b/...Configuration/TaskManagerConfiguration.cs → ...Configuration/TaskManagerConfiguration.cs
@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class TaskManagerConfiguration
     {

diff --git a/...d/Configuration/WorkflowManagerOptions.cs → ...n/Configuration/WorkflowManagerOptions.cs b/...d/Configuration/WorkflowManagerOptions.cs → ...n/Configuration/WorkflowManagerOptions.cs
@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Configuration;
 
-namespace Monai.Deploy.WorkflowManager.Configuration
+namespace Monai.Deploy.WorkflowManager.Common.Configuration
 {
     public class WorkflowManagerOptions : PagedOptions
     {

diff --git a/src/Shared/Configuration/packages.lock.json → src/Common/Configuration/packages.lock.json b/src/Shared/Configuration/packages.lock.json → src/Common/Configuration/packages.lock.json
diff --git a/src/Shared/Shared/ApiControllerBase.cs → ...Common/Miscellaneous/ApiControllerBase.cs b/src/Shared/Shared/ApiControllerBase.cs → ...Common/Miscellaneous/ApiControllerBase.cs
@@ -18,12 +18,12 @@
 using Ardalis.GuardClauses;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using Monai.Deploy.WorkflowManager.Configuration;
-using Monai.Deploy.WorkflowManager.Shared.Filter;
-using Monai.Deploy.WorkflowManager.Shared.Wrappers;
-using Monai.Deploy.WorkflowManager.Shared.Services;
+using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers;
+using Monai.Deploy.WorkflowManager.Common.Configuration;
+using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter;
+using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services;
 
-namespace Monai.Deploy.WorkflowManager.ControllersShared
+namespace Monai.Deploy.WorkflowManager.Common.ControllersShared
 {
     /// <summary>
     /// Base Api Controller.

diff --git a/src/Shared/Shared/Filter/PaginationFilter.cs → .../Miscellaneous/Filter/PaginationFilter.cs b/src/Shared/Shared/Filter/PaginationFilter.cs → .../Miscellaneous/Filter/PaginationFilter.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared.Filter
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter
 {
     /// <summary>
     /// Pagination Filter class.

diff --git a/src/Shared/Shared/Filter/TimeFilter.cs → ...Common/Miscellaneous/Filter/TimeFilter.cs b/src/Shared/Shared/Filter/TimeFilter.cs → ...Common/Miscellaneous/Filter/TimeFilter.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared.Filter
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter
 {
     public class TimeFilter : PaginationFilter
     {

diff --git a/src/Shared/Shared/HttpLoggingExtensions.cs → ...on/Miscellaneous/HttpLoggingExtensions.cs b/src/Shared/Shared/HttpLoggingExtensions.cs → ...on/Miscellaneous/HttpLoggingExtensions.cs
@@ -18,7 +18,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     public static class HttpLoggingExtensions
     {

diff --git a/src/Shared/Shared/IMonaiService.cs → src/Common/Miscellaneous/IMonaiService.cs b/src/Shared/Shared/IMonaiService.cs → src/Common/Miscellaneous/IMonaiService.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     public interface IMonaiService
     {

diff --git a/src/Shared/Shared/IMonaiServiceLocator.cs → ...mon/Miscellaneous/IMonaiServiceLocator.cs b/src/Shared/Shared/IMonaiServiceLocator.cs → ...mon/Miscellaneous/IMonaiServiceLocator.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     public interface IMonaiServiceLocator
     {

diff --git a/...onai.Deploy.WorkflowManager.Shared.csproj → ...rkflowManager.Common.Miscellaneous.csproj b/...onai.Deploy.WorkflowManager.Shared.csproj → ...rkflowManager.Common.Miscellaneous.csproj
@@ -18,7 +18,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Monai.Deploy.WorkflowManager.Shared</RootNamespace>
+    <RootNamespace>Monai.Deploy.WorkflowManager.Common</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -53,7 +53,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Configuration\Monai.Deploy.WorkflowManager.Configuration.csproj" />
+    <ProjectReference Include="..\Configuration\Monai.Deploy.WorkflowManager.Common.Configuration.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/Shared/Shared/MonaiHealthCheck.cs → src/Common/Miscellaneous/MonaiHealthCheck.cs b/src/Shared/Shared/MonaiHealthCheck.cs → src/Common/Miscellaneous/MonaiHealthCheck.cs
@@ -16,7 +16,7 @@
 
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     public class MonaiHealthCheck : IHealthCheck
     {

diff --git a/src/Shared/Shared/MonaiServiceLocator.cs → ...mmon/Miscellaneous/MonaiServiceLocator.cs b/src/Shared/Shared/MonaiServiceLocator.cs → ...mmon/Miscellaneous/MonaiServiceLocator.cs
@@ -16,7 +16,7 @@
 
 using Ardalis.GuardClauses;
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     public class MonaiServiceLocator : IMonaiServiceLocator
     {

diff --git a/src/Shared/Shared/PatientKeys.cs → src/Common/Miscellaneous/PatientKeys.cs b/src/Shared/Shared/PatientKeys.cs → src/Common/Miscellaneous/PatientKeys.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     public static class PatientKeys
     {

diff --git a/src/Shared/Shared/PlugInAttribute.cs → src/Common/Miscellaneous/PlugInAttribute.cs b/src/Shared/Shared/PlugInAttribute.cs → src/Common/Miscellaneous/PlugInAttribute.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     [AttributeUsage(AttributeTargets.Assembly)]
     public class PlugInAttribute : Attribute

diff --git a/src/Shared/Shared/ServiceStatus.cs → src/Common/Miscellaneous/ServiceStatus.cs b/src/Shared/Shared/ServiceStatus.cs → src/Common/Miscellaneous/ServiceStatus.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     /// <summary>
     /// Defines the state of a running service.

diff --git a/src/Shared/Shared/Services/IUriService.cs → ...mon/Miscellaneous/Services/IUriService.cs b/src/Shared/Shared/Services/IUriService.cs → ...mon/Miscellaneous/Services/IUriService.cs
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-using Monai.Deploy.WorkflowManager.Shared.Filter;
+using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter;
 
-namespace Monai.Deploy.WorkflowManager.Shared.Services
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services
 {
     /// <summary>
     /// Uri Serivce.

diff --git a/src/Shared/Shared/Services/UriService.cs → ...mmon/Miscellaneous/Services/UriService.cs b/src/Shared/Shared/Services/UriService.cs → ...mmon/Miscellaneous/Services/UriService.cs
@@ -15,9 +15,9 @@
  */
 
 using Microsoft.AspNetCore.WebUtilities;
-using Monai.Deploy.WorkflowManager.Shared.Filter;
+using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter;
 
-namespace Monai.Deploy.WorkflowManager.Shared.Services
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services
 {
     /// <summary>
     /// Uri Service.

diff --git a/...red/Shared/Utilities/DicomTagUtilities.cs → ...cellaneous/Utilities/DicomTagUtilities.cs b/...red/Shared/Utilities/DicomTagUtilities.cs → ...cellaneous/Utilities/DicomTagUtilities.cs
@@ -17,7 +17,7 @@
 using System.Text.RegularExpressions;
 using FellowOakDicom;
 
-namespace Monai.Deploy.WorkflowManager.Shared.Utilities
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Utilities
 {
     public static class DicomTagUtilities
     {

diff --git a/src/Shared/Shared/ValidationConstants.cs → ...mmon/Miscellaneous/ValidationConstants.cs b/src/Shared/Shared/ValidationConstants.cs → ...mmon/Miscellaneous/ValidationConstants.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous
 {
     public static class ValidationConstants
     {
@@ -172,7 +172,8 @@ public enum NotificationValues
                 RouterTaskType,
                 ExportTaskType,
                 DockerTaskType,
-                Email
+                Email,
+                ExternalAppTaskType
             };
     }
 }
diff --git a/src/Shared/Shared/Wrappers/PagedResponse.cs → ...n/Miscellaneous/Wrappers/PagedResponse.cs b/src/Shared/Shared/Wrappers/PagedResponse.cs → ...n/Miscellaneous/Wrappers/PagedResponse.cs
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-using Monai.Deploy.WorkflowManager.Shared.Filter;
-using Monai.Deploy.WorkflowManager.Shared.Services;
+using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Services;
+using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Filter;
 
-namespace Monai.Deploy.WorkflowManager.Shared.Wrappers
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers
 {
     /// <summary>
     /// Paged Response for use with paginations.

diff --git a/src/Shared/Shared/Wrappers/Response.cs → ...Common/Miscellaneous/Wrappers/Response.cs b/src/Shared/Shared/Wrappers/Response.cs → ...Common/Miscellaneous/Wrappers/Response.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace Monai.Deploy.WorkflowManager.Shared.Wrappers
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers
 {
     /// <summary>
     /// Response object.
@@ -44,7 +44,7 @@ public Response(T data)
         /// <summary>
         /// Gets or sets Data.
         /// </summary>
-        public T Data { get; set; }
+        public T? Data { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether response has succeeded.
@@ -54,7 +54,7 @@ public Response(T data)
         /// <summary>
         /// Gets or sets errors.
         /// </summary>
-        public string?[] Errors { get; set; }
+        public string[]? Errors { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Gets or sets message.

diff --git a/...red/Shared/Wrappers/StatsPagedResponse.cs → ...cellaneous/Wrappers/StatsPagedResponse.cs b/...red/Shared/Wrappers/StatsPagedResponse.cs → ...cellaneous/Wrappers/StatsPagedResponse.cs
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-namespace Monai.Deploy.WorkflowManager.Shared.Wrappers
+namespace Monai.Deploy.WorkflowManager.Common.Miscellaneous.Wrappers
 {
     public class StatsPagedResponse<T> : PagedResponse<T>
     {
@@ -30,9 +30,5 @@ public StatsPagedResponse(T data, int pageNumber, int pageSize) : base(data, pag
         {
 
         }
-        //public StatsPagedResponse(PagedResponse<T> paged) : base(paged.Data, paged.PageNumber, paged.PageSize)
-        //{
-        //    int re = 0;
-        //}
     }
 }
diff --git a/src/Shared/Shared/packages.lock.json → src/Common/Miscellaneous/packages.lock.json b/src/Shared/Shared/packages.lock.json → src/Common/Miscellaneous/packages.lock.json
@@ -205,7 +205,7 @@
         "resolved": "6.0.0",
         "contentHash": "TY8/9+tI0mNaUMgntOxxaq2ndTkdXqLSxvPmas7XEqOlv9lQtB7wLjYGd756lOaO7Dvb5r/WXhluM+0Xe87v5Q=="
       },
-      "monai.deploy.workflowmanager.configuration": {
+      "Monai.Deploy.WorkflowManager.Common.configuration": {
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.Messaging": "[0.1.25, )",