changes in responce to comments

neildsouth · neildsouth · commit ce3e322025df · 2023-10-05T16:14:53.000+01:00
Signed-off-by: Neil South &lt;neil.south@answerdigital.com&gt;
diff --git a/src/Configuration/DatabaseOptions.cs b/src/Configuration/DatabaseOptions.cs
@@ -15,9 +15,8 @@
  */
 
 using Microsoft.Extensions.Configuration;
-using Monai.Deploy.InformaticsGateway.Configuration;
 
-namespace Monai.Deploy.InformaticsGateway.Database.Api
+namespace Monai.Deploy.InformaticsGateway.Configuration
 {
     public class DatabaseOptions
     {
diff --git a/src/Database/Api/Repositories/InferenceRequestRepositoryBase.cs b/src/Database/Api/Repositories/InferenceRequestRepositoryBase.cs
@@ -19,6 +19,7 @@
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 
 namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
diff --git a/src/Database/Api/StorageMetadataWrapper.cs b/src/Database/Api/StorageMetadataWrapper.cs
@@ -27,7 +27,6 @@ namespace Monai.Deploy.InformaticsGateway.Database.Api
     /// </summary>
     public class StorageMetadataWrapper : MongoDBEntityBase
     {
-        //private readonly JsonSerializerOptions _options;
 
         [JsonPropertyName("correlationId")]
         public string CorrelationId { get; set; } = string.Empty;
diff --git a/src/Database/DatabaseManager.cs b/src/Database/DatabaseManager.cs
@@ -24,6 +24,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework;
@@ -68,7 +69,6 @@ public static IServiceCollection ConfigureDatabase(this IServiceCollection servi
 
         public static IServiceCollection ConfigureDatabase(this IServiceCollection services, IConfigurationSection? connectionStringConfigurationSection, IConfigurationSection? pluginsConfigurationSection, IFileSystem fileSystem, ILoggerFactory loggerFactory)
         {
-            var logger = loggerFactory.CreateLogger("DatabaseManager");
 
             if (connectionStringConfigurationSection is null)
             {
@@ -96,7 +96,6 @@ public static IServiceCollection ConfigureDatabase(this IServiceCollection servi
                     return services;
 
                 case DbType_MongoDb:
-                    var terst = connectionStringConfigurationSection[SR.DatabaseConnectionStringKey];
                     services.AddSingleton<IMongoClient, MongoClient>(s => new MongoClient(connectionStringConfigurationSection[SR.DatabaseConnectionStringKey]));
                     services.AddScoped<IDatabaseMigrationManager, MongoDatabaseMigrationManager>();
                     services.AddScoped(typeof(IDestinationApplicationEntityRepository), typeof(MongoDB.Repositories.DestinationApplicationEntityRepository));
@@ -155,6 +154,7 @@ internal static Type[] FindMatchingTypesFromAssemblies(Assembly[] assemblies)
             return matchingTypes.ToArray();
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("SonarLint", "S3885", Justification = "assembly.Load does not full register the contents, but assembly.LoadFrom does, this is need to load .dlls from the plug-ins folder that plugins use")]
         internal static Assembly[] LoadAssemblyFromPlugInsDirectory(IFileSystem fileSystem)
         {
             Guard.Against.Null(fileSystem, nameof(fileSystem));
@@ -169,6 +169,7 @@ internal static Assembly[] LoadAssemblyFromPlugInsDirectory(IFileSystem fileSyst
 
             foreach (var plugin in plugins)
             {
+
                 assemblies.Add(Assembly.LoadFrom(plugin));
             }
             return assemblies.ToArray();
diff --git a/src/Database/EntityFramework/Repositories/DestinationApplicationEntityRepository.cs b/src/Database/EntityFramework/Repositories/DestinationApplicationEntityRepository.cs
@@ -21,7 +21,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Polly;
diff --git a/src/Database/EntityFramework/Repositories/DicomAssociationInfoRepository.cs b/src/Database/EntityFramework/Repositories/DicomAssociationInfoRepository.cs
@@ -20,7 +20,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Polly;
diff --git a/src/Database/EntityFramework/Repositories/InferenceRequestRepository.cs b/src/Database/EntityFramework/Repositories/InferenceRequestRepository.cs
@@ -22,7 +22,7 @@
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Polly;
diff --git a/src/Database/EntityFramework/Repositories/MonaiApplicationEntityRepository.cs b/src/Database/EntityFramework/Repositories/MonaiApplicationEntityRepository.cs
@@ -21,7 +21,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Polly;
diff --git a/src/Database/EntityFramework/Repositories/PayloadRepository.cs b/src/Database/EntityFramework/Repositories/PayloadRepository.cs
@@ -20,7 +20,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Polly;
diff --git a/src/Database/EntityFramework/Repositories/SourceApplicationEntityRepository.cs b/src/Database/EntityFramework/Repositories/SourceApplicationEntityRepository.cs
@@ -21,7 +21,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Polly;
diff --git a/src/Database/EntityFramework/Repositories/StorageMetadataWrapperRepository.cs b/src/Database/EntityFramework/Repositories/StorageMetadataWrapperRepository.cs
@@ -22,6 +22,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
diff --git a/src/Database/EntityFramework/Repositories/VirtualApplicationEntityRepository.cs b/src/Database/EntityFramework/Repositories/VirtualApplicationEntityRepository.cs
@@ -21,7 +21,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Polly;
diff --git a/src/Database/EntityFramework/Test/DestinationApplicationEntityRepositoryTest.cs b/src/Database/EntityFramework/Test/DestinationApplicationEntityRepositoryTest.cs
@@ -18,8 +18,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Moq;
 
diff --git a/src/Database/EntityFramework/Test/DicomAssociationInfoRepositoryTest.cs b/src/Database/EntityFramework/Test/DicomAssociationInfoRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Moq;
 
diff --git a/src/Database/EntityFramework/Test/InferenceRequestRepositoryTest.cs b/src/Database/EntityFramework/Test/InferenceRequestRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Moq;
 
diff --git a/src/Database/EntityFramework/Test/MonaiApplicationEntityRepositoryTest.cs b/src/Database/EntityFramework/Test/MonaiApplicationEntityRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Moq;
 
diff --git a/src/Database/EntityFramework/Test/PayloadRepositoryTest.cs b/src/Database/EntityFramework/Test/PayloadRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Monai.Deploy.Messaging.Events;
 using Moq;
diff --git a/src/Database/EntityFramework/Test/SourceApplicationEntityRepositoryTest.cs b/src/Database/EntityFramework/Test/SourceApplicationEntityRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Moq;
 
diff --git a/src/Database/EntityFramework/Test/StorageMetadataWrapperRepositoryTest.cs b/src/Database/EntityFramework/Test/StorageMetadataWrapperRepositoryTest.cs
@@ -22,6 +22,7 @@
 using Monai.Deploy.InformaticsGateway.Api.Rest;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
 using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Monai.Deploy.Messaging.Events;
 using Moq;
diff --git a/src/Database/EntityFramework/Test/VirtualApplicationEntityRepositoryTest.cs b/src/Database/EntityFramework/Test/VirtualApplicationEntityRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Repositories;
 using Moq;
 
diff --git a/src/Database/MongoDB/Integration.Test/DestinationApplicationEntityRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/DestinationApplicationEntityRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB.Repositories;
 using MongoDB.Driver;
diff --git a/src/Database/MongoDB/Integration.Test/DicomAssociationInfoRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/DicomAssociationInfoRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB.Repositories;
 using MongoDB.Driver;
diff --git a/src/Database/MongoDB/Integration.Test/InferenceRequestRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/InferenceRequestRepositoryTest.cs
@@ -18,7 +18,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB.Repositories;
 using MongoDB.Driver;
diff --git a/src/Database/MongoDB/Integration.Test/MonaiApplicationEntityRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/MonaiApplicationEntityRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB.Repositories;
 using MongoDB.Driver;
diff --git a/src/Database/MongoDB/Integration.Test/MongoDatabaseFixture.cs b/src/Database/MongoDB/Integration.Test/MongoDatabaseFixture.cs
@@ -17,7 +17,7 @@
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB;
 using MongoDB.Driver;
 
diff --git a/src/Database/MongoDB/Integration.Test/PayloadRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/PayloadRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB.Repositories;
 using Monai.Deploy.Messaging.Events;
diff --git a/src/Database/MongoDB/Integration.Test/SourceApplicationEntityRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/SourceApplicationEntityRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB.Repositories;
 using MongoDB.Driver;
diff --git a/src/Database/MongoDB/Integration.Test/StorageMetadataWrapperRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/StorageMetadataWrapperRepositoryTest.cs
@@ -21,6 +21,7 @@
 using Monai.Deploy.InformaticsGateway.Api.Rest;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
 using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB.Repositories;
 using Monai.Deploy.Messaging.Events;
diff --git a/src/Database/MongoDB/Integration.Test/VirtualApplicationEntityRepositoryTest.cs b/src/Database/MongoDB/Integration.Test/VirtualApplicationEntityRepositoryTest.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Test;
 using Monai.Deploy.InformaticsGateway.Database.MongoDB.Repositories;
 using MongoDB.Driver;
diff --git a/src/Database/MongoDB/Repositories/DestinationApplicationEntityRepository.cs b/src/Database/MongoDB/Repositories/DestinationApplicationEntityRepository.cs
@@ -20,6 +20,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
diff --git a/src/Database/MongoDB/Repositories/DicomAssociationInfoRepository.cs b/src/Database/MongoDB/Repositories/DicomAssociationInfoRepository.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using MongoDB.Driver;
diff --git a/src/Database/MongoDB/Repositories/InferenceRequestRepository.cs b/src/Database/MongoDB/Repositories/InferenceRequestRepository.cs
@@ -21,7 +21,7 @@
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using MongoDB.Driver;
diff --git a/src/Database/MongoDB/Repositories/MonaiApplicationEntityRepository.cs b/src/Database/MongoDB/Repositories/MonaiApplicationEntityRepository.cs
@@ -20,6 +20,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
diff --git a/src/Database/MongoDB/Repositories/PayloadRepository.cs b/src/Database/MongoDB/Repositories/PayloadRepository.cs
@@ -19,6 +19,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
diff --git a/src/Database/MongoDB/Repositories/SourceApplicationEntityRepository.cs b/src/Database/MongoDB/Repositories/SourceApplicationEntityRepository.cs
@@ -20,6 +20,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
diff --git a/src/Database/MongoDB/Repositories/StorageMetadataWrapperRepository.cs b/src/Database/MongoDB/Repositories/StorageMetadataWrapperRepository.cs
@@ -21,6 +21,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
diff --git a/src/Database/MongoDB/Repositories/VirtualApplicationEntityRepository.cs b/src/Database/MongoDB/Repositories/VirtualApplicationEntityRepository.cs
@@ -20,6 +20,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
diff --git a/src/InformaticsGateway/Test/Services/Common/InputDataPluginEngineFactoryTest.cs b/src/InformaticsGateway/Test/Services/Common/InputDataPluginEngineFactoryTest.cs
@@ -21,7 +21,6 @@
 using System.Reflection;
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
-using Microsoft.VisualStudio.TestPlatform.Utilities;
 using Monai.Deploy.InformaticsGateway.Api.PlugIns;
 using Monai.Deploy.InformaticsGateway.Common;
 using Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution;
@@ -62,7 +61,6 @@ public void RegisteredPlugIns_WhenCalled_ReturnsListOfPlugIns()
                 p => VerifyPlugIn(p, typeof(TestInputDataPlugInAddWorkflow)),
                 p => VerifyPlugIn(p, typeof(TestInputDataPlugInModifyDicomFile)),
                 p => VerifyPlugIn(p, typeof(TestInputDataPlugInResumeWorkflow)),
-               
                 p => VerifyPlugIn(p, typeof(TestInputDataPlugInVirtualAE)));
 
             _logger.VerifyLogging($"{typeof(IInputDataPlugIn).Name} data plug-in found {typeof(TestInputDataPlugInAddWorkflow).GetCustomAttribute<PlugInNameAttribute>()?.Name}: {typeof(TestInputDataPlugInAddWorkflow).GetShortTypeAssemblyName()}.", LogLevel.Information, Times.Once());
diff --git a/src/InformaticsGateway/Test/Services/Connectors/PayloadAssemblerTest.cs b/src/InformaticsGateway/Test/Services/Connectors/PayloadAssemblerTest.cs
@@ -21,7 +21,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;
 using Monai.Deploy.InformaticsGateway.Services.Connectors;
 using Monai.Deploy.InformaticsGateway.SharedTest;
diff --git a/src/Plug-ins/RemoteAppExecution/Database/DatabaseRegistrar.cs b/src/Plug-ins/RemoteAppExecution/Database/DatabaseRegistrar.cs
@@ -19,6 +19,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api;
 
 namespace Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.Database
diff --git a/src/Plug-ins/RemoteAppExecution/Database/EntityFramework/RemoteAppExecutionRepository.cs b/src/Plug-ins/RemoteAppExecution/Database/EntityFramework/RemoteAppExecutionRepository.cs
@@ -19,7 +19,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Monai.Deploy.InformaticsGateway.Database.Api;
+using Monai.Deploy.InformaticsGateway.Configuration;
 using Monai.Deploy.InformaticsGateway.Database.Api.Logging;
 using Polly;
 using Polly.Retry;
diff --git a/src/Plug-ins/RemoteAppExecution/Database/MongoDb/RemoteAppExecutionRepository.cs b/src/Plug-ins/RemoteAppExecution/Database/MongoDb/RemoteAppExecutionRepository.cs
diff --git a/src/Plug-ins/RemoteAppExecution/DicomDeidentifier.cs b/src/Plug-ins/RemoteAppExecution/DicomDeidentifier.cs
diff --git a/src/Plug-ins/RemoteAppExecution/Test/Database/EntityFramework/RemoteAppExecutionRepositoryTest.cs b/src/Plug-ins/RemoteAppExecution/Test/Database/EntityFramework/RemoteAppExecutionRepositoryTest.cs
diff --git a/src/Plug-ins/RemoteAppExecution/Test/Database/MongoDb/MongoDatabaseFixture.cs b/src/Plug-ins/RemoteAppExecution/Test/Database/MongoDb/MongoDatabaseFixture.cs
diff --git a/src/Plug-ins/RemoteAppExecution/Test/Database/MongoDb/RemoteAppExecutionRepositoryTest.cs b/src/Plug-ins/RemoteAppExecution/Test/Database/MongoDb/RemoteAppExecutionRepositoryTest.cs

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,8 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`using Microsoft.Extensions.Configuration;`
`18`		`-using Monai.Deploy.InformaticsGateway.Configuration;`
`19`	`18`
`20`		`-namespace Monai.Deploy.InformaticsGateway.Database.Api`
	`19`	`+namespace Monai.Deploy.InformaticsGateway.Configuration`
`21`	`20`	`{`
`22`	`21`	`public class DatabaseOptions`
`23`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ namespace Monai.Deploy.InformaticsGateway.Database.Api`
`27`	`27`	`/// </summary>`
`28`	`28`	`public class StorageMetadataWrapper : MongoDBEntityBase`
`29`	`29`	`{`
`30`		`- //private readonly JsonSerializerOptions _options;`
`31`	`30`
`32`	`31`	`[JsonPropertyName("correlationId")]`
`33`	`32`	`public string CorrelationId { get; set; } = string.Empty;`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`using Microsoft.Extensions.Configuration;`
`25`	`25`	`using Microsoft.Extensions.DependencyInjection;`
`26`	`26`	`using Microsoft.Extensions.Logging;`
	`27`	`+using Monai.Deploy.InformaticsGateway.Configuration;`
`27`	`28`	`using Monai.Deploy.InformaticsGateway.Database.Api;`
`28`	`29`	`using Monai.Deploy.InformaticsGateway.Database.Api.Repositories;`
`29`	`30`	`using Monai.Deploy.InformaticsGateway.Database.EntityFramework;`
`@@ -68,7 +69,6 @@ public static IServiceCollection ConfigureDatabase(this IServiceCollection servi`
`68`	`69`
`69`	`70`	`public static IServiceCollection ConfigureDatabase(this IServiceCollection services, IConfigurationSection? connectionStringConfigurationSection, IConfigurationSection? pluginsConfigurationSection, IFileSystem fileSystem, ILoggerFactory loggerFactory)`
`70`	`71`	`{`
`71`		`- var logger = loggerFactory.CreateLogger("DatabaseManager");`
`72`	`72`
`73`	`73`	`if (connectionStringConfigurationSection is null)`
`74`	`74`	`{`
`@@ -96,7 +96,6 @@ public static IServiceCollection ConfigureDatabase(this IServiceCollection servi`
`96`	`96`	`return services;`
`97`	`97`
`98`	`98`	`case DbType_MongoDb:`
`99`		`- var terst = connectionStringConfigurationSection[SR.DatabaseConnectionStringKey];`
`100`	`99`	`services.AddSingleton<IMongoClient, MongoClient>(s => new MongoClient(connectionStringConfigurationSection[SR.DatabaseConnectionStringKey]));`
`101`	`100`	`services.AddScoped<IDatabaseMigrationManager, MongoDatabaseMigrationManager>();`
`102`	`101`	`services.AddScoped(typeof(IDestinationApplicationEntityRepository), typeof(MongoDB.Repositories.DestinationApplicationEntityRepository));`
`@@ -155,6 +154,7 @@ internal static Type[] FindMatchingTypesFromAssemblies(Assembly[] assemblies)`
`155`	`154`	`return matchingTypes.ToArray();`
`156`	`155`	`}`
`157`	`156`
	`157`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("SonarLint", "S3885", Justification = "assembly.Load does not full register the contents, but assembly.LoadFrom does, this is need to load .dlls from the plug-ins folder that plugins use")]`
`158`	`158`	`internal static Assembly[] LoadAssemblyFromPlugInsDirectory(IFileSystem fileSystem)`
`159`	`159`	`{`
`160`	`160`	`Guard.Against.Null(fileSystem, nameof(fileSystem));`
`@@ -169,6 +169,7 @@ internal static Assembly[] LoadAssemblyFromPlugInsDirectory(IFileSystem fileSyst`
`169`	`169`
`170`	`170`	`foreach (var plugin in plugins)`
`171`	`171`	`{`
	`172`	`+`
`172`	`173`	`assemblies.Add(Assembly.LoadFrom(plugin));`
`173`	`174`	`}`
`174`	`175`	`return assemblies.ToArray();`