Merge branch 'develop'

Author: mocsharp

src/Api/DicomAssociationInfo.cs

@@ -15,6 +15,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 namespace Monai.Deploy.InformaticsGateway.Api
 {
@@ -30,14 +31,21 @@ public class DicomAssociationInfo : MongoDBEntityBase
         public string Errors { get; set; } = string.Empty;
         public TimeSpan Duration { get; private set; } = default!;
 
+        public HashSet<string> PayloadIds { get; private set; }
+
         public DicomAssociationInfo()
         {
             FileCount = 0;
+            PayloadIds = new HashSet<string>();
         }
 
-        public void FileReceived()
+        public void FileReceived(string? payloadId)
         {
-            FileCount++;
+            if (!string.IsNullOrWhiteSpace(payloadId))
+            {
+                FileCount++;
+                PayloadIds.Add(payloadId);
+            }
         }
 
         public void Disconnect()

src/Api/GlobalSuppressions.cs

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Sonar Code Smell", "S2094: Remove this empty class, write its code or make it an \"interface\"", Justification = "placeholder code")]

src/Api/SourceApplicationEntity.cs

@@ -69,7 +69,7 @@ public abstract record FileStorageMetadata
         /// Gets or sets the data origin of this file.
         /// </summary>
         [JsonPropertyName("dataOrigin"), JsonInclude]
-        public DataOrigin DataOrigin { get; private set; }
+        public DataOrigin DataOrigin { get; private set; } = new();
 
         /// <summary>
         /// Gets a list of workflows designated for the file.

src/Api/Storage/FileStorageMetadata.cs

@@ -40,7 +40,7 @@ public class StorageObjectMetadata
         /// Gets the file extension.
         /// </summary>
         [JsonPropertyName("fileExtension")]
-        public string FileExtension { get; init; } = default!;
+        public string FileExtension { get; init; }
 
         /// <summary>
         /// Gets or sets the content type of the file.
@@ -83,7 +83,7 @@ public class StorageObjectMetadata
         /// Gets or sets whether upload failed.
         /// </summary>
         [JsonPropertyName("isUploadFailed"), JsonInclude]
-        public bool IsUploadFailed { get; private set; } = default!;
+        public bool IsUploadFailed { get; private set; }
 
         [JsonPropertyName("isMoveCompleted"), JsonInclude]
         public bool IsMoveCompleted { get; private set; } = default!;

src/Api/Storage/StorageObjectMetadata.cs

@@ -64,7 +64,7 @@ public async Task<RunnerState> IsApplicationRunning(ImageVersion imageVersion, C
                 return new RunnerState { IsRunning = false };
             }
 
-            return new RunnerState { IsRunning = true, Id = matches.First().ID };
+            return new RunnerState { IsRunning = true, Id = matches[0].ID };
         }
 
         public async Task<ImageVersion> GetLatestApplicationVersion(CancellationToken cancellationToken = default)
@@ -98,7 +98,7 @@ public async Task<IList<ImageVersion>> GetApplicationVersions(string version, Ca
             };
             _logger.RetrievingImagesFromDocker();
             var images = await _dockerClient.Images.ListImagesAsync(parameters, cancellationToken).ConfigureAwait(false);
-            return images?.Select(p => new ImageVersion { Version = p.RepoTags.First(), Id = p.ID, Created = p.Created }).ToList();
+            return images?.Select(p => new ImageVersion { Version = p.RepoTags[0], Id = p.ID, Created = p.Created }).ToList();
         }
 
         public async Task<bool> StartApplication(ImageVersion imageVersion, CancellationToken cancellationToken = default)

src/CLI/Services/DockerRunner.cs

@@ -30,6 +30,7 @@ public interface INLogConfigurationOptionAccessor
 
     public class NLogConfigurationOptionAccessor : INLogConfigurationOptionAccessor
     {
+        public const string NlogSchema = "http://www.nlog-project.org/schemas/NLog.xsd";
         private readonly XmlDocument _xmlDocument;
         private readonly XmlNamespaceManager _namespaceManager;
 
@@ -44,7 +45,7 @@ public NLogConfigurationOptionAccessor(IFileSystem fileSystem)
             _xmlDocument = new XmlDocument();
             _xmlDocument.LoadXml(xml);
             _namespaceManager = new XmlNamespaceManager(_xmlDocument.NameTable);
-            _namespaceManager.AddNamespace("ns", "http://www.nlog-project.org/schemas/NLog.xsd");
+            _namespaceManager.AddNamespace("ns", NlogSchema);
         }
 
         public string LogStoragePath

src/CLI/Services/NLogConfigurationOptionAccessor.cs

@@ -28,7 +28,7 @@ public static Uri EnsureUriEndsWithSlash(this Uri input)
 
             var str = input.ToString();
 
-            if (!string.IsNullOrWhiteSpace(str) && !str.EndsWith("/"))
+            if (!string.IsNullOrWhiteSpace(str) && !str.EndsWith('/'))
             {
 #pragma warning disable S1075 // URIs should not be hardcoded
                 return new Uri(str + '/');

src/Client.Common/UriExtensions.cs

@@ -24,7 +24,6 @@ internal static class HttpContentExtensions
     {
         public static async System.Threading.Tasks.Task<T> ReadAsAsync<T>(this HttpContent httpContent, CancellationToken cancellationToken)
         {
-            var json = await httpContent.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
             using (var contentStream = await httpContent.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false))
             {
                 return await JsonSerializer.DeserializeAsync<T>(contentStream, Configuration.JsonSerializationOptions, cancellationToken: cancellationToken).ConfigureAwait(false);

src/Client/HttpContentExtensions.cs

@@ -1659,6 +1659,17 @@
           "System.Text.Encoding": "4.3.0"
         }
       },
+      "System.Text.Encoding.Extensions": {
+        "type": "Transitive",
+        "resolved": "4.3.0",
+        "contentHash": "YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.1.0",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0",
+          "System.Text.Encoding": "4.3.0"
+        }
+      },
       "System.Text.Encodings.Web": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -1764,6 +1775,47 @@
           "System.Xml.ReaderWriter": "4.3.0"
         }
       },
+      "System.Xml.ReaderWriter": {
+        "type": "Transitive",
+        "resolved": "4.3.0",
+        "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==",
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.IO": "4.3.0",
+          "System.IO.FileSystem": "4.3.0",
+          "System.IO.FileSystem.Primitives": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Extensions": "4.3.0",
+          "System.Runtime.InteropServices": "4.3.0",
+          "System.Text.Encoding": "4.3.0",
+          "System.Text.Encoding.Extensions": "4.3.0",
+          "System.Text.RegularExpressions": "4.3.0",
+          "System.Threading.Tasks": "4.3.0",
+          "System.Threading.Tasks.Extensions": "4.3.0"
+        }
+      },
+      "System.Xml.XDocument": {
+        "type": "Transitive",
+        "resolved": "4.3.0",
+        "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==",
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Diagnostics.Tools": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.IO": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Extensions": "4.3.0",
+          "System.Text.Encoding": "4.3.0",
+          "System.Threading": "4.3.0",
+          "System.Xml.ReaderWriter": "4.3.0"
+        }
+      },
       "xunit.abstractions": {
         "type": "Transitive",
         "resolved": "2.0.3",
@@ -1827,6 +1879,7 @@
           "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
           "Monai.Deploy.InformaticsGateway.Database.EntityFramework": "[1.0.0, )",
           "Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )",
+          "Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution": "[1.0.0, )",
           "Monai.Deploy.Messaging.RabbitMQ": "[1.0.0, )",
           "Monai.Deploy.Security": "[0.1.3, )",
           "Monai.Deploy.Storage.MinIO": "[0.2.18, )",
@@ -1889,7 +1942,8 @@
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
-          "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )"
+          "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
+          "NLog": "[5.2.3, )"
         }
       },
       "monai.deploy.informaticsgateway.database.entityframework": {
@@ -1921,6 +1975,23 @@
           "System.Linq.Async": "[6.0.1, )",
           "fo-dicom": "[5.1.1, )"
         }
+      },
+      "monai.deploy.informaticsgateway.plugins.remoteappexecution": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore": "[6.0.21, )",
+          "Microsoft.EntityFrameworkCore.Relational": "[6.0.21, )",
+          "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.21, )",
+          "Microsoft.Extensions.Configuration": "[6.0.1, )",
+          "Microsoft.Extensions.Configuration.FileExtensions": "[6.0.0, )",
+          "Microsoft.Extensions.Configuration.Json": "[6.0.0, )",
+          "Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
+          "Monai.Deploy.InformaticsGateway.Configuration": "[1.0.0, )",
+          "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
+          "MongoDB.Driver": "[2.21.0, )",
+          "NLog": "[5.2.3, )",
+          "Polly": "[7.2.4, )"
+        }
       }
     }
   }