gh-65 address SonarQube issues

mocsharp · mocsharp · commit 203b8a8d7c58 · 2022-03-14T10:37:49.000-07:00
Signed-off-by: Victor Chang &lt;vicchang@nvidia.com&gt;
diff --git a/src/Api/Storage/Payload.cs b/src/Api/Storage/Payload.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using Ardalis.GuardClauses;
 using Monai.Deploy.InformaticsGateway.Common;
 namespace Monai.Deploy.InformaticsGateway.Api.Storage
diff --git a/src/DicomWebClient/API/MimeMappings.cs b/src/DicomWebClient/API/MimeMappings.cs
@@ -29,7 +29,7 @@ public static class MimeMappings
     {
         public const string MultiPartRelated = "multipart/related";
 
-        public static readonly Dictionary<MimeType, string> MimeTypeMappings = new()
+        public static readonly IReadOnlyDictionary<MimeType, string> MimeTypeMappings = new Dictionary<MimeType, string>()
         {
             { MimeType.Dicom, "application/dicom" },
             { MimeType.DicomJson, "application/dicom+json" },
@@ -46,7 +46,7 @@ public static class MimeMappings
             { MimeType.VideoMpeg2, "video/mpeg2" },
         };
 
-        public static readonly Dictionary<DicomUID, MimeType> SupportedMediaTypes = new()
+        public static readonly IReadOnlyDictionary<DicomUID, MimeType> SupportedMediaTypes = new Dictionary<DicomUID, MimeType>()
         {
             { DicomUID.ExplicitVRLittleEndian, MimeType.Dicom },
             { DicomUID.RLELossless, MimeType.Dicom },
diff --git a/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj b/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj
@@ -35,6 +35,7 @@ SPDX-License-Identifier: Apache License 2.0
     <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DicomWebClient/Services/WadoService.cs b/src/DicomWebClient/Services/WadoService.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Ardalis.GuardClauses;
@@ -100,10 +101,7 @@ public async Task<DicomFile> Retrieve(
 
             try
             {
-                await foreach (var item in response.ToDicomAsyncEnumerable())
-                {
-                    return item;
-                }
+                await response.ToDicomAsyncEnumerable().FirstOrDefaultAsync();
             }
             catch (Exception ex)
             {
@@ -239,10 +237,7 @@ public async Task<T> RetrieveMetadata<T>(
 
             try
             {
-                await foreach (var metadata in GetMetadata<T>(instancMetadataUri))
-                {
-                    return metadata;
-                }
+                await GetMetadata<T>(instancMetadataUri).FirstOrDefaultAsync();
             }
             catch (Exception ex) when (ex is not UnsupportedReturnTypeException)
             {
diff --git a/src/InformaticsGateway/Services/Export/ExportServiceBase.cs b/src/InformaticsGateway/Services/Export/ExportServiceBase.cs
@@ -279,7 +279,7 @@ private void ReportingActionBlock(ExportRequestDataMessage exportRequestData)
                    _messagePublisher.Publish(_configuration.Messaging.Topics.ExportComplete, jsonMessage.ToMessage());
                });
 
-            lock(SyncRoot)
+            lock (SyncRoot)
             {
                 _exportRequests.Remove(exportRequestData.ExportTaskId);
             }
diff --git a/src/InformaticsGateway/Test/Services/Export/ExportServiceBaseTest.cs b/src/InformaticsGateway/Test/Services/Export/ExportServiceBaseTest.cs
@@ -205,7 +205,7 @@ public async Task DataflowTest_EndToEnd()
                 {
                     callback(new MemoryStream(Encoding.UTF8.GetBytes(testData)));
                 });
-            var countdownEvent = new CountdownEvent(5  * 3);
+            var countdownEvent = new CountdownEvent(5 * 3);
             var service = new TestExportService(_logger.Object, _configuration, _serviceScopeFactory.Object, _storageInfoProvider.Object);
             service.ReportActionCompleted += (sender, e) =>
             {
diff --git a/tests/Integration.Test/Drivers/DicomInstanceGenerator.cs b/tests/Integration.Test/Drivers/DicomInstanceGenerator.cs
@@ -47,8 +47,8 @@ public class StudyGenerationSpecs
 
         private readonly int _instance;
         private readonly ISpecFlowOutputHelper _outputHelper;
-        private DicomDataset _baseDataset;
-        private Random _random;
+        private readonly DicomDataset _baseDataset;
+        private readonly Random _random;
 
         public DicomInstanceGenerator(ISpecFlowOutputHelper outputHelper)
         {
diff --git a/tests/Integration.Test/Hooks/RabbitMqHooks.cs b/tests/Integration.Test/Hooks/RabbitMqHooks.cs
@@ -23,15 +23,15 @@ namespace Monai.Deploy.InformaticsGateway.Integration.Test.Hooks
     public sealed class RabbitMqHooks
     {
         internal static readonly string ScenarioContextKey = "MESSAAGES";
-        private readonly string QueueNameWorkflowQueue = "workflow-queue";
-        private readonly string QueueNameExportQueue = "export-queue";
+        private readonly string _queueNameWorkflowQueue = "workflow-queue";
+        private readonly string _queueNameExportQueue = "export-queue";
         private readonly ISpecFlowOutputHelper _outputHelper;
         private readonly Configurations _configuration;
         private readonly ScenarioContext _scenarioContext;
-        private ConnectionFactory _connectionFactory;
-        private MessageBrokerConfigurationKeys _configurationKeys;
-        private IConnection _connection;
-        private IModel _channel;
+        private readonly ConnectionFactory _connectionFactory;
+        private readonly MessageBrokerConfigurationKeys _configurationKeys;
+        private readonly IConnection _connection;
+        private readonly IModel _channel;
         private string _consumerTag;
         public CountdownEvent MessageWaitHandle { get; private set; }
 
@@ -59,13 +59,13 @@ public RabbitMqHooks(ISpecFlowOutputHelper outputHelper, Configurations configur
         [BeforeScenario("@messaging_export_complete")]
         public void BeforeMessagingExportComplete()
         {
-            BeforeMessagingSubscribeTo(QueueNameExportQueue, _configurationKeys.ExportComplete);
+            BeforeMessagingSubscribeTo(_queueNameExportQueue, _configurationKeys.ExportComplete);
         }
 
         [BeforeScenario("@messaging_workflow_request")]
         public void BeforeMessagingWorkflowRequest()
         {
-            BeforeMessagingSubscribeTo(QueueNameWorkflowQueue, _configurationKeys.WorkflowRequest);
+            BeforeMessagingSubscribeTo(_queueNameWorkflowQueue, _configurationKeys.WorkflowRequest);
         }
 
         private void BeforeMessagingSubscribeTo(string queue, string routingKey)
diff --git a/tests/Integration.Test/Hooks/ScpHooks.cs b/tests/Integration.Test/Hooks/ScpHooks.cs
@@ -18,18 +18,19 @@ namespace Monai.Deploy.InformaticsGateway.Integration.Test.Hooks
     [Binding]
     public sealed class ScpHooks
     {
+        private static IDicomServer s_dicomServer;
+
         internal static readonly string KeyServerData = "SERVER-DATA";
         internal static readonly string FeatureScpAeTitle = "TEST-SCP";
         internal static readonly int FeatureScpPort = 1105;
-        private static IDicomServer _dicomServer;
 
         [BeforeFeature("@scp")]
         public static void BeforeMessagingExportComplete(ISpecFlowOutputHelper outputHelper, FeatureContext featureContext)
         {
             try
             {
                 var data = new ServerData { Context = featureContext, OutputHelper = outputHelper };
-                _dicomServer = DicomServerFactory.Create<CStoreScp>(FeatureScpPort, userState: data);
+                s_dicomServer = DicomServerFactory.Create<CStoreScp>(FeatureScpPort, userState: data);
                 featureContext[KeyServerData] = data;
             }
             catch (Exception ex)
@@ -44,8 +45,8 @@ public static void AfterScenario(ISpecFlowOutputHelper outputHelper, FeatureCont
             try
             {
                 featureContext.Remove(KeyServerData);
-                _dicomServer?.Stop();
-                _dicomServer?.Dispose();
+                s_dicomServer?.Stop();
+                s_dicomServer?.Dispose();
             }
             catch (Exception ex)
             {
diff --git a/tests/Integration.Test/StepDefinitions/AcrApiStepDefinitions.cs b/tests/Integration.Test/StepDefinitions/AcrApiStepDefinitions.cs
@@ -1,4 +1,7 @@
-using System;
+// SPDX-FileCopyrightText: � 2021-2022 MONAI Consortium
+// SPDX-FileCopyrightText: � 2019-2021 NVIDIA Corporation
+// SPDX-License-Identifier: Apache License 2.0
+
 using System.Text;
 using FellowOakDicom;
 using FellowOakDicom.Network;
@@ -13,7 +16,6 @@
 using Monai.Deploy.InformaticsGateway.Integration.Test.Drivers;
 using Monai.Deploy.InformaticsGateway.Integration.Test.Hooks;
 using Polly;
-using TechTalk.SpecFlow;
 using TechTalk.SpecFlow.Infrastructure;
 
 namespace Monai.Deploy.InformaticsGateway.Integration.Test.StepDefinitions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static class MimeMappings`
`29`	`29`	`{`
`30`	`30`	`public const string MultiPartRelated = "multipart/related";`
`31`	`31`
`32`		`- public static readonly Dictionary<MimeType, string> MimeTypeMappings = new()`
	`32`	`+ public static readonly IReadOnlyDictionary<MimeType, string> MimeTypeMappings = new Dictionary<MimeType, string>()`
`33`	`33`	`{`
`34`	`34`	`{ MimeType.Dicom, "application/dicom" },`
`35`	`35`	`{ MimeType.DicomJson, "application/dicom+json" },`
`@@ -46,7 +46,7 @@ public static class MimeMappings`
`46`	`46`	`{ MimeType.VideoMpeg2, "video/mpeg2" },`
`47`	`47`	`};`
`48`	`48`
`49`		`- public static readonly Dictionary<DicomUID, MimeType> SupportedMediaTypes = new()`
	`49`	`+ public static readonly IReadOnlyDictionary<DicomUID, MimeType> SupportedMediaTypes = new Dictionary<DicomUID, MimeType>()`
`50`	`50`	`{`
`51`	`51`	`{ DicomUID.ExplicitVRLittleEndian, MimeType.Dicom },`
`52`	`52`	`{ DicomUID.RLELossless, MimeType.Dicom },`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections.Generic;`
	`7`	`+using System.Linq;`
`7`	`8`	`using System.Net.Http;`
`8`	`9`	`using System.Threading.Tasks;`
`9`	`10`	`using Ardalis.GuardClauses;`
`@@ -100,10 +101,7 @@ public async Task<DicomFile> Retrieve(`
`100`	`101`
`101`	`102`	`try`
`102`	`103`	`{`
`103`		`- await foreach (var item in response.ToDicomAsyncEnumerable())`
`104`		`- {`
`105`		`- return item;`
`106`		`- }`
	`104`	`+ await response.ToDicomAsyncEnumerable().FirstOrDefaultAsync();`
`107`	`105`	`}`
`108`	`106`	`catch (Exception ex)`
`109`	`107`	`{`
`@@ -239,10 +237,7 @@ public async Task<T> RetrieveMetadata<T>(`
`239`	`237`
`240`	`238`	`try`
`241`	`239`	`{`
`242`		`- await foreach (var metadata in GetMetadata<T>(instancMetadataUri))`
`243`		`- {`
`244`		`- return metadata;`
`245`		`- }`
	`240`	`+ await GetMetadata<T>(instancMetadataUri).FirstOrDefaultAsync();`
`246`	`241`	`}`
`247`	`242`	`catch (Exception ex) when (ex is not UnsupportedReturnTypeException)`
`248`	`243`	`{`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ private void ReportingActionBlock(ExportRequestDataMessage exportRequestData)`
`279`	`279`	`_messagePublisher.Publish(_configuration.Messaging.Topics.ExportComplete, jsonMessage.ToMessage());`
`280`	`280`	`});`
`281`	`281`
`282`		`- lock(SyncRoot)`
	`282`	`+ lock (SyncRoot)`
`283`	`283`	`{`
`284`	`284`	`_exportRequests.Remove(exportRequestData.ExportTaskId);`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public async Task DataflowTest_EndToEnd()`
`205`	`205`	`{`
`206`	`206`	`callback(new MemoryStream(Encoding.UTF8.GetBytes(testData)));`
`207`	`207`	`});`
`208`		`- var countdownEvent = new CountdownEvent(5 * 3);`
	`208`	`+ var countdownEvent = new CountdownEvent(5 * 3);`
`209`	`209`	`var service = new TestExportService(_logger.Object, _configuration, _serviceScopeFactory.Object, _storageInfoProvider.Object);`
`210`	`210`	`service.ReportActionCompleted += (sender, e) =>`
`211`	`211`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ public class StudyGenerationSpecs`
`47`	`47`
`48`	`48`	`private readonly int _instance;`
`49`	`49`	`private readonly ISpecFlowOutputHelper _outputHelper;`
`50`		`- private DicomDataset _baseDataset;`
`51`		`- private Random _random;`
	`50`	`+ private readonly DicomDataset _baseDataset;`
	`51`	`+ private readonly Random _random;`
`52`	`52`
`53`	`53`	`public DicomInstanceGenerator(ISpecFlowOutputHelper outputHelper)`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,18 +18,19 @@ namespace Monai.Deploy.InformaticsGateway.Integration.Test.Hooks`
`18`	`18`	`[Binding]`
`19`	`19`	`public sealed class ScpHooks`
`20`	`20`	`{`
	`21`	`+ private static IDicomServer s_dicomServer;`
	`22`	`+`
`21`	`23`	`internal static readonly string KeyServerData = "SERVER-DATA";`
`22`	`24`	`internal static readonly string FeatureScpAeTitle = "TEST-SCP";`
`23`	`25`	`internal static readonly int FeatureScpPort = 1105;`
`24`		`- private static IDicomServer _dicomServer;`
`25`	`26`
`26`	`27`	`[BeforeFeature("@scp")]`
`27`	`28`	`public static void BeforeMessagingExportComplete(ISpecFlowOutputHelper outputHelper, FeatureContext featureContext)`
`28`	`29`	`{`
`29`	`30`	`try`
`30`	`31`	`{`
`31`	`32`	`var data = new ServerData { Context = featureContext, OutputHelper = outputHelper };`
`32`		`- _dicomServer = DicomServerFactory.Create<CStoreScp>(FeatureScpPort, userState: data);`
	`33`	`+ s_dicomServer = DicomServerFactory.Create<CStoreScp>(FeatureScpPort, userState: data);`
`33`	`34`	`featureContext[KeyServerData] = data;`
`34`	`35`	`}`
`35`	`36`	`catch (Exception ex)`
`@@ -44,8 +45,8 @@ public static void AfterScenario(ISpecFlowOutputHelper outputHelper, FeatureCont`
`44`	`45`	`try`
`45`	`46`	`{`
`46`	`47`	`featureContext.Remove(KeyServerData);`
`47`		`- _dicomServer?.Stop();`
`48`		`- _dicomServer?.Dispose();`
	`48`	`+ s_dicomServer?.Stop();`
	`49`	`+ s_dicomServer?.Dispose();`
`49`	`50`	`}`
`50`	`51`	`catch (Exception ex)`
`51`	`52`	`{`