Merge pull request #1682 from bcgov/dev

Dev

Author: JamesPasta

applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Web.Tests/Components/CurrencyDefinitionWidgetTests.cs

@@ -16,18 +16,7 @@ public class CurrencyDefinitionWidgetTests : GrantManagerWebTestBase
 
         public CurrencyDefinitionWidgetTests()
         {
-            // Remove EventLog logger to avoid ObjectDisposedException in test environment
-            var loggerFactory = GetRequiredService<Microsoft.Extensions.Logging.ILoggerFactory>();
-            foreach (var provider in loggerFactory
-                .GetType()
-                .GetField("_providers", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
-                ?.GetValue(loggerFactory) as System.Collections.IEnumerable ?? new object[0])
-            {
-                if (provider.GetType().Name.Contains("EventLogLoggerProvider"))
-                {
-                    (provider as IDisposable)?.Dispose();
-                }
-            }
+            // Lazily resolve services needed by the ViewComponent
             lazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
         }
 
@@ -44,7 +33,7 @@ public async Task CurrencyDefinitionWidgetReturnsCorrectLimits()
                 ViewContext = viewContext
             };
 
-            var viewComponent = new CurrencyDefinitionWidget()
+            var viewComponent = new CurrencyDefinitionWidget
             {
                 ViewComponentContext = viewComponentContext,
                 LazyServiceProvider = lazyServiceProvider

applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Web.Tests/Components/TextAreaDefinitionWidgetTests.cs

@@ -19,6 +19,7 @@ public TextAreaDefinitionWidgetTests()
             lazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
         }
 
+
         [Fact]
         public async Task TextAreaDefinitionWidgetReturnsCorrectRowsCount()
         {

applications/Unity.GrantManager/modules/Unity.SharedKernel/MessageBrokers.RabbitMQ/ChannelProvider.cs

@@ -1,74 +1,78 @@
-using Microsoft.Extensions.Logging;
-using RabbitMQ.Client;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
+using Microsoft.Extensions.Logging;
+using RabbitMQ.Client;
 using Unity.Modules.Shared.MessageBrokers.RabbitMQ.Interfaces;
 
 namespace Unity.Modules.Shared.MessageBrokers.RabbitMQ
 {
-    public sealed class ChannelProvider : IChannelProvider, IDisposable
+    public sealed class PooledChannelProvider(
+        IConnectionProvider connectionProvider,
+        ILogger<PooledChannelProvider> logger,
+        int maxChannels = PooledChannelProvider.DefaultMaxChannels) : IChannelProvider
     {
-        private readonly IConnectionProvider _connectionProvider;
-        private readonly ILogger<ChannelProvider> _logger;
-        private readonly int _maxChannels;
+        private readonly IConnectionProvider _connectionProvider = connectionProvider ?? throw new ArgumentNullException(nameof(connectionProvider));
+        private readonly ILogger<PooledChannelProvider> _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        private readonly int _maxChannels = maxChannels;
         private readonly ConcurrentQueue<IModel> _channelPool = new();
         private int _currentChannelCount;
         private bool _disposed;
-        private const int DefaultMaxChannels = 10000;
 
-        public ChannelProvider(IConnectionProvider connectionProvider, ILogger<ChannelProvider> logger, int maxChannels = DefaultMaxChannels)
-        {
-            _connectionProvider = connectionProvider ?? throw new ArgumentNullException(nameof(connectionProvider));
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _maxChannels = maxChannels;
-        }
+        private const int DefaultMaxChannels = 1000;
 
+        /// <summary>
+        /// Get a channel from the pool or create a new one if under max limit
+        /// </summary>
         public IModel? GetChannel()
         {
             ThrowIfDisposed();
 
-            // Try to reuse a channel from the pool
+            // Try to reuse a channel
             while (_channelPool.TryDequeue(out var channel))
             {
-                if (channel.IsOpen)
-                    return channel;
-
+                if (channel.IsOpen) return channel;
                 DisposeChannel(channel);
             }
 
-            // Try to create a new channel if we haven't reached max
+            // Create a new channel if we have capacity
             if (Interlocked.Increment(ref _currentChannelCount) <= _maxChannels)
             {
                 try
                 {
                     var connection = _connectionProvider.GetConnection();
                     if (connection != null && connection.IsOpen)
+                    {
                         return connection.CreateModel();
+                    }
 
                     _logger.LogWarning("RabbitMQ connection is not open.");
-                    Interlocked.Decrement(ref _currentChannelCount); // failed to create
+                    Interlocked.Decrement(ref _currentChannelCount);
                 }
                 catch (Exception ex)
                 {
                     _logger.LogError(ex, "Error creating RabbitMQ channel.");
-                    Interlocked.Decrement(ref _currentChannelCount); // failed to create
+                    Interlocked.Decrement(ref _currentChannelCount);
                 }
             }
             else
             {
-                Interlocked.Decrement(ref _currentChannelCount); // revert increment since max reached
+                Interlocked.Decrement(ref _currentChannelCount);
                 _logger.LogWarning("Max channel count reached ({MaxChannels}). Cannot create new channel.", _maxChannels);
             }
 
             return null;
         }
 
+        /// <summary>
+        /// Return a channel to the pool
+        /// </summary>
         public void ReturnChannel(IModel channel)
         {
-            if (_disposed)
+            if (_disposed || channel == null)
             {
-                DisposeChannel(channel);
+                if (channel != null)
+                    DisposeChannel(channel);
                 return;
             }
 
@@ -80,39 +84,22 @@ public void ReturnChannel(IModel channel)
 
         private void DisposeChannel(IModel channel)
         {
-            try
-            {
-                if (channel.IsOpen)
-                    channel.Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Exception while closing RabbitMQ channel.");
-            }
+            if (channel == null) return;
 
-            try
-            {
-                channel.Dispose();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Exception while disposing RabbitMQ channel.");
-            }
+            try { if (channel.IsOpen) channel.Close(); } catch (Exception ex) { _logger.LogWarning(ex, "Error closing channel."); }
+            try { channel.Dispose(); } catch (Exception ex) { _logger.LogWarning(ex, "Error disposing channel."); }
 
             Interlocked.Decrement(ref _currentChannelCount);
         }
 
         private void ThrowIfDisposed()
         {
-            if (_disposed)
-                throw new ObjectDisposedException(nameof(ChannelProvider));
+            ObjectDisposedException.ThrowIf(_disposed, nameof(PooledChannelProvider));
         }
 
         public void Dispose()
         {
-            if (_disposed)
-                return;
-
+            if (_disposed) return;
             _disposed = true;
 
             while (_channelPool.TryDequeue(out var channel))

applications/Unity.GrantManager/modules/Unity.SharedKernel/MessageBrokers.RabbitMQ/Interfaces/IQueueChannelProvider.cs

@@ -1,17 +1,20 @@
 using System;
 using RabbitMQ.Client;
 
+#pragma warning disable CA1005 // Avoid excessive parameters on generic types
+#pragma warning disable S2326
 namespace Unity.Modules.Shared.MessageBrokers.RabbitMQ.Interfaces
 {
     /// <summary>
     /// Provides a RabbitMQ channel that declares and binds a specific queue and its dead-letter queue.
     /// </summary>
     public interface IQueueChannelProvider<TQueueMessage> : IDisposable where TQueueMessage : IQueueMessage
     {
-
         /// <summary>
-        /// Gets a channel for publishing or consuming messages of the specified type.
+        /// Gets a channel for publishing or consuming messages.
         /// </summary>
         IModel GetChannel();
     }
 }
+#pragma warning restore CA1005 // Avoid excessive parameters on generic types
+#pragma warning restore S2326