gh-65 fix warnings reported by sonarqube

Signed-off-by: Victor Chang <vicchang@nvidia.com>

Author: mocsharp

.editorconfig

@@ -4,10 +4,9 @@
 root = true
 
 # Copyright File Header
-file_header_template = Copyright [year file created] - [last year file modified], MONAI Consortium\nSPDX-License-Identifier: Apache License 2.0
+file_header_template = SPDX-FileCopyrightText: © [year file created] - [last year file modified], MONAI Consortium\nSPDX-License-Identifier: Apache License 2.0
 dotnet_diagnostic.IDE0073.severity = error
 
-
 # Default settings:
 # A newline ending every file
 # Use 4 spaces as indentation

src/Api/MessageBroker/JsonMessage.cs

@@ -9,8 +9,6 @@ namespace Monai.Deploy.InformaticsGateway.Api.MessageBroker
 {
  public sealed class JsonMessage<T> : MessageBase
  {
- public static readonly string JsonApplicationType = "application/json";
-
  /// <summary>
  /// Body of the message.
  /// </summary>
@@ -65,7 +63,7 @@ public JsonMessage(T body,
  MessageDescription = bodyDescription;
  MessageId = messageId;
  ApplicationId = applicationId;
- ContentType = JsonApplicationType;
+ ContentType = MessageContentTypes.JsonApplicationType;
  CorrelationId = correlationId;
  CreationDateTime = creationDateTime;
  DeliveryTag = deliveryTag;

src/Api/MessageBroker/MessageContentTypes.cs

@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: © 2021-2022 MONAI Consortium
+// SPDX-License-Identifier: Apache License 2.0
+
+namespace Monai.Deploy.InformaticsGateway.Api.MessageBroker
+{
+ public static class MessageContentTypes
+ {
+ public static readonly string JsonApplicationType = "application/json";
+ }
+}

src/Api/Rest/InferenceRequest.cs

@@ -215,17 +215,23 @@ private bool Validate(out string details)
  errors.Add("'transactionId' is required.");
  }
 
- if (InputResources.IsNullOrEmpty() ||
- !InputResources.Any(predicate => predicate.Interface != InputInterfaceType.Algorithm))
- {
- errors.Add("No 'inputResources' specified.");
- }
-
  if (Application is null)
  {
  errors.Add("No algorithm defined or more than one algorithms defined in 'inputResources'. 'inputResources' must include one algorithm/pipeline for the inference request.");
  }
 
+ ValidateInputResources(errors);
+ ValidateInputMetadata(errors);
+ ValidateOUtputResources(errors);
+
+ details = string.Join(" ", errors);
+ return errors.Count == 0;
+ }
+
+ private void ValidateOUtputResources(List<string> errors)
+ {
+ Guard.Against.Null(errors, nameof(errors));
+
  if (InputMetadata.Inputs.IsNullOrEmpty())
  {
  errors.Add("Request has no `inputMetadata` defined. At least one `inputs` or `inputMetadata` required.");
@@ -237,18 +243,11 @@ private bool Validate(out string details)
  CheckInputMetadataDetails(inputDetails, errors);
  }
  }
+ }
 
- foreach (var input in InputResources)
- {
- if (input.Interface == InputInterfaceType.DicomWeb)
- {
- CheckDicomWebConnectionDetails("inputResources", errors, input.ConnectionDetails);
- }
- else if (input.Interface == InputInterfaceType.Fhir)
- {
- CheckFhirConnectionDetails("inputResources", errors, input.ConnectionDetails);
- }
- }
+ private void ValidateInputMetadata(List<string> errors)
+ {
+ Guard.Against.Null(errors, nameof(errors));
 
  foreach (var output in OutputResources)
  {
@@ -261,51 +260,37 @@ private bool Validate(out string details)
  CheckFhirConnectionDetails("outputResources", errors, output.ConnectionDetails);
  }
  }
+ }
 
- details = string.Join(" ", errors);
- return errors.Count == 0;
+ private void ValidateInputResources(List<string> errors)
+ {
+ Guard.Against.Null(errors, nameof(errors));
+
+ if (InputResources.IsNullOrEmpty() ||
+ !InputResources.Any(predicate => predicate.Interface != InputInterfaceType.Algorithm))
+ {
+ errors.Add("No 'inputResources' specified.");
+ }
+
+ foreach (var input in InputResources)
+ {
+ if (input.Interface == InputInterfaceType.DicomWeb)
+ {
+ CheckDicomWebConnectionDetails("inputResources", errors, input.ConnectionDetails);
+ }
+ else if (input.Interface == InputInterfaceType.Fhir)
+ {
+ CheckFhirConnectionDetails("inputResources", errors, input.ConnectionDetails);
+ }
+ }
  }
 
  private void CheckInputMetadataDetails(InferenceRequestDetails details, List<string> errors)
  {
  switch (details.Type)
  {
  case InferenceRequestType.DicomUid:
- if (details.Studies.IsNullOrEmpty())
- {
- errors.Add("Request type is set to `DICOM_UID` but no `studies` defined.");
- }
- else
- {
- foreach (var study in details.Studies)
- {
- if (string.IsNullOrWhiteSpace(study.StudyInstanceUid))
- {
- errors.Add("`StudyInstanceUID` cannot be empty.");
- }
-
- if (study.Series is null) continue;
-
- foreach (var series in study.Series)
- {
- if (string.IsNullOrWhiteSpace(series.SeriesInstanceUid))
- {
- errors.Add("`SeriesInstanceUID` cannot be empty.");
- }
-
- if (series.Instances is null) continue;
-
- foreach (var instance in series.Instances)
- {
- if (instance.SopInstanceUid.IsNullOrEmpty() ||
- instance.SopInstanceUid.Any(p => string.IsNullOrWhiteSpace(p)))
- {
- errors.Add("`SOPInstanceUID` cannot be empty.");
- }
- }
- }
- }
- }
+ CheckInputMetadataWithTypDeicomUid(details, errors);
  break;
 
  case InferenceRequestType.DicomPatientId:
@@ -323,25 +308,66 @@ private void CheckInputMetadataDetails(InferenceRequestDetails details, List<str
  break;
 
  case InferenceRequestType.FhireResource:
- if (details.Resources.IsNullOrEmpty())
+ CheckInputMetadataWithTypeFhirResource(details, errors);
+ break;
+
+ default:
+ errors.Add($"'inputMetadata' does not yet support type '{details.Type}'.");
+ break;
+ }
+ }
+
+ private static void CheckInputMetadataWithTypeFhirResource(InferenceRequestDetails details, List<string> errors)
+ {
+ Guard.Against.Null(details, nameof(details));
+ Guard.Against.Null(errors, nameof(errors));
+
+ if (details.Resources.IsNullOrEmpty())
+ {
+ errors.Add("Request type is set to `FHIR_RESOURCE` but no FHIR `resources` defined.");
+ }
+ else
+ {
+ errors.AddRange(details.Resources.Where(resource => string.IsNullOrWhiteSpace(resource.Type)).Select(resource => "A FHIR resource type cannot be empty."));
+ }
+ }
+
+ private static void CheckInputMetadataWithTypDeicomUid(InferenceRequestDetails details, List<string> errors)
+ {
+ Guard.Against.Null(details, nameof(details));
+ Guard.Against.Null(errors, nameof(errors));
+
+ if (details.Studies.IsNullOrEmpty())
+ {
+ errors.Add("Request type is set to `DICOM_UID` but no `studies` defined.");
+ }
+ else
+ {
+ foreach (var study in details.Studies)
+ {
+ if (string.IsNullOrWhiteSpace(study.StudyInstanceUid))
  {
- errors.Add("Request type is set to `FHIR_RESOURCE` but no FHIR `resources` defined.");
+ errors.Add("`StudyInstanceUID` cannot be empty.");
  }
- else
+
+ if (study.Series is null) continue;
+
+ foreach (var series in study.Series)
  {
- foreach (var resource in details.Resources)
+ if (string.IsNullOrWhiteSpace(series.SeriesInstanceUid))
  {
- if (string.IsNullOrWhiteSpace(resource.Type))
- {
- errors.Add("A FHIR resource type cannot be empty.");
- }
+ errors.Add("`SeriesInstanceUID` cannot be empty.");
  }
- }
- break;
 
- default:
- errors.Add($"'inputMetadata' does not yet support type '{details.Type}'.");
- break;
+ if (series.Instances is null) continue;
+ errors.AddRange(
+ series.Instances
+ .Where(
+ instance => instance.SopInstanceUid.IsNullOrEmpty() ||
+ instance.SopInstanceUid.Any(p => string.IsNullOrWhiteSpace(p)))
+ .Select(instance => "`SOPInstanceUID` cannot be empty."));
+ }
+ }
  }
  }
 

src/CLI/Commands/ConfigCommand.cs

@@ -32,7 +32,7 @@ private void AddCommandRunner()
 
  endpointCommand.AddArgument(new Argument<Runner>("runner"));
  endpointCommand.Handler = CommandHandler.Create<Runner, IHost, bool>((Runner runner, IHost host, bool verbose) =>
- ConfigUpdateHandler(runner, host, verbose, (IConfigurationService options) =>
+ ConfigUpdateHandler(host, (IConfigurationService options) =>
  {
  options.Configurations.Runner = runner;
  })
@@ -46,10 +46,10 @@ private void AddCommandEndpoint()
 
  endpointCommand.AddArgument(new Argument<string>("uri"));
  endpointCommand.Handler = CommandHandler.Create<string, IHost, bool>((string uri, IHost host, bool verbose) =>
- ConfigUpdateHandler(uri, host, verbose, (IConfigurationService options) =>
-  {
-  options.Configurations.InformaticsGatewayServerEndpoint = uri;
-  })
+ ConfigUpdateHandler(host, (IConfigurationService options) =>
+ {
+ options.Configurations.InformaticsGatewayServerEndpoint = uri;
+ })
  );
  }
 
@@ -102,7 +102,7 @@ private int ShowConfigurationHandler(IHost host, bool verbose, CancellationToken
  return ExitCodes.Success;
  }
 
- private static int ConfigUpdateHandler<T>(T argument, IHost host, bool verbose, Action<IConfigurationService> updater)
+ private static int ConfigUpdateHandler(IHost host, Action<IConfigurationService> updater)
  {
  Guard.Against.Null(host, nameof(host));
  Guard.Against.Null(updater, nameof(updater));
@@ -140,13 +140,10 @@ private async Task<int> InitHandlerAsync(IHost host, bool verbose, bool yes, Can
  Guard.Against.Null(configService, nameof(configService), "Configuration service is unavailable.");
  Guard.Against.Null(confirmation, nameof(confirmation), "Confirmation prompt is unavailable.");
 
- if (!yes)
+ if (!yes && configService.IsConfigExists && !confirmation.ShowConfirmationPrompt($"Existing application configuration file already exists. Do you want to overwrite it?"))
  {
- if (configService.IsConfigExists && !confirmation.ShowConfirmationPrompt($"Existing application configuration file already exists. Do you want to overwrite it?"))
- {
- logger.Log(LogLevel.Warning, "Action cancelled.");
- return ExitCodes.Stop_Cancelled;
- }
+ logger.Log(LogLevel.Warning, "Action cancelled.");
+ return ExitCodes.Stop_Cancelled;
  }
 
  try

src/CLI/Commands/RestartCommand.cs

@@ -33,13 +33,10 @@ private async Task<int> RestartCommandHandler(IHost host, bool yes, bool verbose
  Guard.Against.Null(service, nameof(service), "Control service is unavailable.");
  Guard.Against.Null(logger, nameof(logger), "Logger is unavailable.");
 
- if (!yes)
+ if (!yes && !confirmation.ShowConfirmationPrompt($"Do you want to restart {Strings.ApplicationName}?"))
  {
- if (!confirmation.ShowConfirmationPrompt($"Do you want to restart {Strings.ApplicationName}?"))
- {
- logger.Log(LogLevel.Warning, "Action cancelled.");
- return ExitCodes.Restart_Cancelled;
- }
+ logger.Log(LogLevel.Warning, "Action cancelled.");
+ return ExitCodes.Restart_Cancelled;
  }
 
  try

src/CLI/Commands/StopCommand.cs

@@ -33,13 +33,10 @@ private async Task<int> StopCommandHandler(IHost host, bool yes, bool verbose, C
  Guard.Against.Null(confirmation, nameof(confirmation), "Confirmation prompt is unavailable.");
  Guard.Against.Null(logger, nameof(logger), "Logger is unavailable.");
 
- if (!yes)
+ if (!yes && !confirmation.ShowConfirmationPrompt($"Do you want to stop {Strings.ApplicationName}?"))
  {
- if (!confirmation.ShowConfirmationPrompt($"Do you want to stop {Strings.ApplicationName}?"))
- {
- logger.Log(LogLevel.Warning, "Action cancelled.");
- return ExitCodes.Stop_Cancelled;
- }
+ logger.Log(LogLevel.Warning, "Action cancelled.");
+ return ExitCodes.Stop_Cancelled;
  }
 
  try

src/InformaticsGateway/Common/Unsubscriber.cs

@@ -27,12 +27,9 @@ protected virtual void Dispose(bool disposing)
  {
  if (!_disposedValue)
  {
- if (disposing)
+ if (disposing && _observers.Contains(_observer))
  {
- if (_observers.Contains(_observer))
- {
- _observers.Remove(_observer);
- }
+ _observers.Remove(_observer);
  }
  _disposedValue = true;
  }