fixup of some nullables

Signed-off-by: Neil South <[email protected]>
Project-MONAI · Sep 7, 2023 · 871894b · 871894b
1 parent e502a7b
commit 871894b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 21 deletions.
diff --git a/src/InformaticsGateway/Logging/Log.8000.HttpServices.cs b/src/InformaticsGateway/Logging/Log.8000.HttpServices.cs
@@ -125,10 +125,10 @@ public static partial class Log
 
         // DicomWeb STOW
         [LoggerMessage(EventId = 8100, Level = LogLevel.Error, Message = "Error processing DICOMWeb STOW StudyInstanceUID= {studyInstanceUid}, Workflow={workflowName}.")]
-        public static partial void ErrorDicomWebStow(this ILogger logger, string studyInstanceUid, string workflowName, Exception? ex);
+        public static partial void ErrorDicomWebStow(this ILogger logger, string? studyInstanceUid, string? workflowName, Exception? ex);
 
         [LoggerMessage(EventId = 8101, Level = LogLevel.Error, Message = "Error processing DICOMWeb STOW StudyInstanceUID is invalid '{studyInstanceUid}'.")]
-        public static partial void ErrorDicomWebStowInvalidStudyInstanceUid(this ILogger logger, string studyInstanceUid, Exception? ex);
+        public static partial void ErrorDicomWebStowInvalidStudyInstanceUid(this ILogger logger, string? studyInstanceUid, Exception? ex);
 
         [LoggerMessage(EventId = 8102, Level = LogLevel.Warning, Message = "The parameter '{parameterName} with the value of '{parameterValue}' in the multipart message is ignored.")]
         public static partial void MultipartParameterIgnored(this ILogger logger, string parameterName, string parameterValue);
@@ -155,7 +155,7 @@ public static partial class Log
         public static partial void ZeroLengthDicomWebStowStream(this ILogger logger);
 
         [LoggerMessage(EventId = 8111, Level = LogLevel.Error, Message = "Unknown virtual application entity specified {aet}.")]
-        public static partial void ErrorDicomWebStowUnknownVirtualApplicationEntity(this ILogger logger, string aet, Exception ex);
+        public static partial void ErrorDicomWebStowUnknownVirtualApplicationEntity(this ILogger logger, string? aet, Exception ex);
 
         // FHIR Serer
 

diff --git a/src/InformaticsGateway/Services/DicomWeb/IStowService.cs b/src/InformaticsGateway/Services/DicomWeb/IStowService.cs
@@ -22,6 +22,6 @@ namespace Monai.Deploy.InformaticsGateway.Services.DicomWeb
 {
     internal interface IStowService
     {
-        Task<StowResult> StoreAsync(HttpRequest request, string studyInstanceUid, string aet, string workflowName, string correlationId, CancellationToken cancellationToken);
+        Task<StowResult> StoreAsync(HttpRequest request, string? studyInstanceUid, string? aet, string? workflowName, string correlationId, CancellationToken cancellationToken);
     }
 }
diff --git a/src/InformaticsGateway/Services/DicomWeb/IStreamsWriter.cs b/src/InformaticsGateway/Services/DicomWeb/IStreamsWriter.cs
@@ -42,7 +42,7 @@ namespace Monai.Deploy.InformaticsGateway.Services.DicomWeb
 {
     internal interface IStreamsWriter
     {
-        Task<StowResult> Save(IList<Stream> streams, string studyInstanceUid, VirtualApplicationEntity? virtualApplicationEntity, string workflowName, string correlationId, string dataSource, CancellationToken cancellationToken = default);
+        Task<StowResult> Save(IList<Stream> streams, string? studyInstanceUid, VirtualApplicationEntity? virtualApplicationEntity, string? workflowName, string correlationId, string dataSource, CancellationToken cancellationToken = default);
     }
 
     internal class StreamsWriter : IStreamsWriter
@@ -79,7 +79,7 @@ public StreamsWriter(
             _storedCount = 0;
         }
 
-        public async Task<StowResult> Save(IList<Stream> streams, string studyInstanceUid, VirtualApplicationEntity? virtualApplicationEntity, string workflowName, string correlationId, string dataSource, CancellationToken cancellationToken = default)
+        public async Task<StowResult> Save(IList<Stream> streams, string? studyInstanceUid, VirtualApplicationEntity? virtualApplicationEntity, string? workflowName, string correlationId, string dataSource, CancellationToken cancellationToken = default)
         {
             if (streams.IsNullOrEmpty())
             {
@@ -154,7 +154,7 @@ private int GetStatusCode(int instancesReceived)
             }
         }
 
-        private async Task SaveInstance(Stream stream, string studyInstanceUid, IInputDataPlugInEngine inputDataPlugInEngine, string correlationId, string dataSource, string endpointName, params string[]? workflows)
+        private async Task SaveInstance(Stream stream, string? studyInstanceUid, IInputDataPlugInEngine inputDataPlugInEngine, string correlationId, string dataSource, string endpointName, params string[]? workflows)
         {
             Guard.Against.Null(stream, nameof(stream));
             Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId));

diff --git a/src/InformaticsGateway/Services/DicomWeb/StowService.cs b/src/InformaticsGateway/Services/DicomWeb/StowService.cs
@@ -51,7 +51,7 @@ public StowService(IServiceScopeFactory serviceScopeFactory, IOptions<Informatic
             _repository = scope.ServiceProvider.GetService<IVirtualApplicationEntityRepository>() ?? throw new ServiceNotFoundException(nameof(IVirtualApplicationEntityRepository));
         }
 
-        public async Task<StowResult> StoreAsync(HttpRequest request, string studyInstanceUid, string aet, string workflowName, string correlationId, CancellationToken cancellationToken)
+        public async Task<StowResult> StoreAsync(HttpRequest request, string? studyInstanceUid, string? aet, string? workflowName, string correlationId, CancellationToken cancellationToken)
         {
             Guard.Against.Null(request, nameof(request));
             Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId));

diff --git a/src/InformaticsGateway/Services/Http/DestinationAeTitleController.cs b/src/InformaticsGateway/Services/Http/DestinationAeTitleController.cs
@@ -192,7 +192,7 @@ public async Task<ActionResult<string>> Create(DestinationApplicationEntity item
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult<DestinationApplicationEntity>> Edit(DestinationApplicationEntity item)
+        public async Task<ActionResult<DestinationApplicationEntity>> Edit(DestinationApplicationEntity? item)
         {
             try
             {

diff --git a/src/InformaticsGateway/Services/Http/DicomWeb/StowController.cs b/src/InformaticsGateway/Services/Http/DicomWeb/StowController.cs
@@ -92,7 +92,7 @@ public async Task<IActionResult> StoreInstancesToStudy(string? studyInstanceUid,
         private async Task<IActionResult> StoreInstances(string? studyInstanceUid, string? aet, string? workflowName)
         {
             var correlationId = Guid.NewGuid().ToString();
-            using var logger = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "CorrelationId", correlationId }, { "StudyInstanceUID", studyInstanceUid }, { "Workflow", workflowName } });
+            using var logger = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "CorrelationId", correlationId }, { "StudyInstanceUID", studyInstanceUid ?? string.Empty }, { "Workflow", workflowName ?? string.Empty } });
 
             if (!_storageInfoProvider.HasSpaceAvailableToStore)
             {

diff --git a/src/InformaticsGateway/Test/Services/DicomWeb/StowServiceTest.cs b/src/InformaticsGateway/Test/Services/DicomWeb/StowServiceTest.cs
@@ -14,15 +14,10 @@
  * limitations under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.IO.Abstractions;
 using System.IO.Abstractions.TestingHelpers;
 using System.Net;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using FellowOakDicom;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
@@ -177,7 +172,7 @@ public async Task StoreAsync_HandlesSingleDicomInstance()
                 VirtualAeTitle = Guid.NewGuid().ToString(),
             };
 
-            _streamsWriter.Setup(p => p.Save(It.IsAny<IList<Stream>>(), It.IsAny<string>(), It.IsAny<VirtualApplicationEntity?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()));
+            _streamsWriter.Setup(p => p.Save(It.IsAny<IList<Stream>>(), It.IsAny<string>(), It.IsAny<VirtualApplicationEntity>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()));
             _repository.Setup(p => p.FindByAeTitleAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(vae);
 
             var httpRequest = new Mock<HttpRequest>();
@@ -201,7 +196,7 @@ public async Task StoreAsync_HandlesMultipleDicomInstances()
                 VirtualAeTitle = Guid.NewGuid().ToString(),
             };
 
-            _streamsWriter.Setup(p => p.Save(It.IsAny<IList<Stream>>(), It.IsAny<string>(), It.IsAny<VirtualApplicationEntity?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()));
+            _streamsWriter.Setup(p => p.Save(It.IsAny<IList<Stream>>(), It.IsAny<string>(), It.IsAny<VirtualApplicationEntity>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()));
             _repository.Setup(p => p.FindByAeTitleAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(vae);
 
             var httpRequest = new Mock<HttpRequest>();
@@ -223,7 +218,7 @@ public async Task GivenMultipleDicomInstances_WhenStoreAsyncIsCalledWithoutVirtu
             var studyInstanceUid = DicomUIDGenerator.GenerateDerivedFromUUID().UID;
             var service = new StowService(_serviceFactory.Object, _configuration);
 
-            _streamsWriter.Setup(p => p.Save(It.IsAny<IList<Stream>>(), It.IsAny<string>(), It.IsAny<VirtualApplicationEntity?>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()));
+            _streamsWriter.Setup(p => p.Save(It.IsAny<IList<Stream>>(), It.IsAny<string>(), It.IsAny<VirtualApplicationEntity>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()));
 
             var httpRequest = new Mock<HttpRequest>();
             httpRequest.SetupGet(p => p.ContentType).Returns($"{ContentTypes.MultipartRelated}; boundary={Boundary}");

diff --git a/src/InformaticsGateway/Test/Services/Http/DicomWeb/StowControllerTest.cs b/src/InformaticsGateway/Test/Services/Http/DicomWeb/StowControllerTest.cs
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using FellowOakDicom;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;