update messaging lib to fix RMQ connection issues (#187)

* gh-184 update messaging lib to fix RMQ connection issues

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

doc/dependency_decisions.yml

@@ -808,14 +808,14 @@
   - :who: mocsharp
     :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
     :versions:
-    - 0.1.5
+    - 0.1.6
     :when: 2022-08-16 23:06:21.051573547 Z
 - - :approve
   - Monai.Deploy.Messaging.RabbitMQ
   - :who: mocsharp
     :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
     :versions:
-    - 0.1.5
+    - 0.1.6
     :when: 2022-08-16 23:06:21.511789690 Z
 - - :approve
   - Monai.Deploy.Storage
@@ -2370,4 +2370,3 @@
     :versions:
     - 4.0.1
     :when: 2022-08-16 23:10:21.184627612 Z
-    

docs/compliance/third-party-licenses.md

@@ -7847,14 +7847,14 @@ Apache License
 
 
 <details>
-<summary>Monai.Deploy.Messaging 0.1.5</summary>
+<summary>Monai.Deploy.Messaging 0.1.6</summary>
 
 ## Monai.Deploy.Messaging
 
-- Version: 0.1.5
+- Version: 0.1.6
 - Authors: MONAI Consortium
 - Project URL: https://github.com/Project-MONAI/monai-deploy-messaging
-- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging/0.1.5)
+- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging/0.1.6)
 - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
 
 
@@ -8075,14 +8075,14 @@ By downloading this software, you agree to the license terms & all licenses list
 
 
 <details>
-<summary>Monai.Deploy.Messaging.RabbitMQ 0.1.5</summary>
+<summary>Monai.Deploy.Messaging.RabbitMQ 0.1.6</summary>
 
 ## Monai.Deploy.Messaging.RabbitMQ
 
-- Version: 0.1.5
+- Version: 0.1.6
 - Authors: MONAI Consortium
 - Project URL: https://github.com/Project-MONAI/monai-deploy-messaging
-- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging.RabbitMQ/0.1.5)
+- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging.RabbitMQ/0.1.6)
 - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
 
 

src/Api/Monai.Deploy.InformaticsGateway.Api.csproj

@@ -30,7 +30,7 @@
     </PackageReference>
     <PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.9" />
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.5" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.6" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.7" />
   </ItemGroup>
 

src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj

@@ -30,7 +30,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.5" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.6" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.7" />
     <PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
   </ItemGroup>

src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj

@@ -47,7 +47,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.5" />
+    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.6" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.7" />
     <PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.7" />
     <PackageReference Include="Polly" Version="7.2.3" />

src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs

@@ -46,7 +46,6 @@ internal class PayloadNotificationActionHandler : IPayloadNotificationActionHand
         private readonly IOptions<InformaticsGatewayConfiguration> _options;
 
         private readonly IServiceScope _scope;
-        private readonly IMessageBrokerPublisherService _messageBrokerPublisherService;
         private bool _disposedValue;
 
         public PayloadNotificationActionHandler(IServiceScopeFactory serviceScopeFactory,
@@ -58,7 +57,6 @@ public PayloadNotificationActionHandler(IServiceScopeFactory serviceScopeFactory
             _options = options ?? throw new ArgumentNullException(nameof(options));
 
             _scope = _serviceScopeFactory.CreateScope();
-            _messageBrokerPublisherService = _scope.ServiceProvider.GetService<IMessageBrokerPublisherService>() ?? throw new ServiceNotFoundException(nameof(IMessageBrokerPublisherService));
         }
 
         public async Task NotifyAsync(Payload payload, ActionBlock<Payload> notificationQueue, CancellationToken cancellationToken = default)
@@ -134,7 +132,8 @@ private async Task NotifyPayloadReady(Payload payload)
 
             _logger.PublishingWorkflowRequest(message.MessageId);
 
-            await _messageBrokerPublisherService.Publish(
+            var messageBrokerPublisherService = _scope.ServiceProvider.GetService<IMessageBrokerPublisherService>() ?? throw new ServiceNotFoundException(nameof(IMessageBrokerPublisherService));
+            await messageBrokerPublisherService.Publish(
                 _options.Value.Messaging.Topics.WorkflowRequest,
                 message.ToMessage()).ConfigureAwait(false);
 

src/InformaticsGateway/appsettings.Development.json

@@ -28,7 +28,7 @@
     },
     "storage": {
       "settings": {
-        "endpoint": "localhost",
+        "endpoint": "localhost:9000",
         "accessKey": "minioadmin",
         "accessToken": "minioadmin",
         "securedConnection": false

tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj

@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Minio" Version="4.0.5" />
-    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.5" />
+    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.6" />
     <PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.7" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="Polly" Version="7.2.3" />