some fixups

Signed-off-by: Neil South <neil.south@answerdigital.com>
Project-MONAI · Dec 11, 2023 · 56c76cb · 56c76cb
1 parent 634a484
commit 56c76cb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/src/Api/Hl7ApplicationConfigEntity.cs b/src/Api/Hl7ApplicationConfigEntity.cs
@@ -26,7 +26,7 @@
 
 namespace Monai.Deploy.InformaticsGateway.Api
 {
-    public class Hl7ApplicationConfigEntity : MongoDBEntityBase
+    public sealed class Hl7ApplicationConfigEntity : MongoDBEntityBase
     {
         /// <summary>
         /// Gets or sets the name of a Hl7 application entity.

diff --git a/src/InformaticsGateway/Services/Common/InputHL7DataPlugInEngine.cs b/src/InformaticsGateway/Services/Common/InputHL7DataPlugInEngine.cs
@@ -55,7 +55,7 @@ public async Task<Tuple<Message, FileStorageMetadata>> ExecutePlugInsAsync(Messa
             foreach (var plugin in _plugsins)
             {
                 var nm = plugin.ToString();
-                if (configItem is not null && configItem.PlugInAssemblies.Any(a => a.StartsWith(plugin.ToString()!)))
+                if (configItem is not null && configItem.PlugInAssemblies.Exists(a => a.StartsWith(plugin.ToString()!)))
                 {
                     _logger.ExecutingInputDataPlugIn(plugin.Name);
                     (hl7File, fileMetadata) = await plugin.ExecuteAsync(hl7File, fileMetadata).ConfigureAwait(false);

diff --git a/src/InformaticsGateway/Services/Export/ExportServiceBase.cs b/src/InformaticsGateway/Services/Export/ExportServiceBase.cs
@@ -138,7 +138,6 @@ public async Task StopAsync(CancellationToken cancellationToken)
             await Task.Delay(250).ConfigureAwait(false);
 #pragma warning restore CA2016 // Forward the 'CancellationToken' parameter to methods
             _cancellationTokenSource.Dispose();
-            return;
         }
 
         private void SetupPolling()

diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpExtract.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpExtract.cs
@@ -105,9 +105,9 @@ public async Task<Message> ExtractInfo(Hl7FileStorageMetadata meta, Message mess
             switch (type)
             {
                 case DataLinkType.PatientId:
-                    return await _externalAppDetailsRepository.GetByPatientIdOutboundAsync(tagId, new CancellationToken()).ConfigureAwait(false); ;
+                    return await _externalAppDetailsRepository.GetByPatientIdOutboundAsync(tagId, new CancellationToken()).ConfigureAwait(false);
                 case DataLinkType.StudyInstanceUid:
-                    return await _externalAppDetailsRepository.GetByStudyIdOutboundAsync(tagId, new CancellationToken()).ConfigureAwait(false); ;
+                    return await _externalAppDetailsRepository.GetByStudyIdOutboundAsync(tagId, new CancellationToken()).ConfigureAwait(false);
                 default:
                     break;
             }

diff --git a/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs b/src/InformaticsGateway/Services/HealthLevel7/MllpService.cs
@@ -62,7 +62,7 @@ internal sealed class MllpService : IMllpService, IHostedService, IDisposable, I
         private readonly IMllpExtract _mIIpExtract;
         private readonly IInputHL7DataPlugInEngine _inputHL7DataPlugInEngine;
         private readonly IHl7ApplicationConfigRepository _hl7ApplicationConfigRepository;
-        private DateTime _lastConfigRead = new(2000, 1, 1);
+        private DateTime _lastConfigRead = new DateTime(2000, 1, 1);
 
         public int ActiveConnections
         {
@@ -218,12 +218,11 @@ private async Task ConfigurePlugInEngine()
             if (configs is not null && configs.Any() && configs.Max(c => c.LastModified) > _lastConfigRead)
             {
                 var pluginAssemblies = new List<string>();
-                foreach (var config in configs.Where(p => p.PlugInAssemblies is not null && p.PlugInAssemblies.Count > 0))
+                foreach (var config in configs.Where(p => p.PlugInAssemblies?.Count > 0))
                 {
                     try
                     {
-                        var addMe = config.PlugInAssemblies.Where(p => pluginAssemblies.Any(a => a == p) is false);
-                        pluginAssemblies.AddRange(config.PlugInAssemblies.Where(p => pluginAssemblies.Any(a => a == p) is false));
+                        pluginAssemblies.AddRange(config.PlugInAssemblies.Where(p => pluginAssemblies.Contains(p) is false));
                     }
                     catch (Exception ex)
                     {