Merge branch 'master' of https://github.com/AntonyVorontsov/RabbitMQ.Client.Core.DependencyInjection

Author: Anton Vorontsov

examples/Examples.SslProducer/Program.cs

@@ -46,9 +46,9 @@ static void ConfigureServices(IServiceCollection services)
             var rabbitMqConfiguration = Configuration.GetSection("RabbitMq");
             // There are both examples of json and manual configuration.
             //var rabbitMqConfiguration = GetClientOptions();
-            
+
             var exchangeOptions = GetExchangeOptions();
-            
+
             services.AddRabbitMqClient(rabbitMqConfiguration)
                 .AddProductionExchange("exchange.name", exchangeOptions);
         }

src/RabbitMQ.Client.Core.DependencyInjection/BatchMessageHandlers/BaseBatchMessageHandler.cs

@@ -47,7 +47,7 @@ public abstract class BaseBatchMessageHandler : IHostedService, IDisposable
         readonly IRabbitMqConnectionFactory _rabbitMqConnectionFactory;
         readonly RabbitMqClientOptions _clientOptions;
         readonly ILogger<BaseBatchMessageHandler> _logger;
-        
+
         bool _disposed = false;
 
         protected BaseBatchMessageHandler(
@@ -142,7 +142,7 @@ public void Dispose()
             Dispose(true);
             GC.SuppressFinalize(this);
         }
-        
+
         ~BaseBatchMessageHandler()
         {
             Dispose(false);

src/RabbitMQ.Client.Core.DependencyInjection/Configuration/RabbitMqSslOption.cs

@@ -11,22 +11,22 @@ public class RabbitMqSslOption
         /// Canonical server name.
         /// </summary>
         public string ServerName { get; set; }
-        
+
         /// <summary>
         /// Path to the certificate.
         /// </summary>
         public string CertificatePath { get; set; }
-        
+
         /// <summary>
-        /// A passphrase for the certificate.
+        /// A pass-phrase for the certificate.
         /// </summary>
         public string CertificatePassphrase { get; set; }
 
         /// <summary>
         /// Flag that defines if certificate should be used.
         /// </summary>
         public bool Enabled { get; set; } = true;
-        
+
         /// <summary>
         /// Acceptable policy errors.
         /// </summary>

src/RabbitMQ.Client.Core.DependencyInjection/Configuration/RabbitMqTcpEndpoint.cs

@@ -14,7 +14,7 @@ public class RabbitMqTcpEndpoint
         /// Tcp connection port.
         /// </summary>
         public int Port { get; set; } = 5672;
-        
+
         /// <summary>
         /// Ssl option.
         /// </summary>

src/RabbitMQ.Client.Core.DependencyInjection/Exceptions/InitialConnectionException.cs

@@ -11,7 +11,7 @@ public class InitialConnectionException : Exception
         /// The number of retries which has been attempted.
         /// </summary>
         public int NumberOfRetries { get; set; }
-        
+
         public InitialConnectionException(string message, Exception innerException) : base(message, innerException)
         {
         }

src/RabbitMQ.Client.Core.DependencyInjection/RabbitMQ.Client.Core.DependencyInjection.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <PackageTags>RabbitMQ</PackageTags>
     <RepositoryUrl>https://github.com/AntonyVorontsov/RabbitMQ.Client.Core.DependencyInjection</RepositoryUrl>
     <Company />

src/RabbitMQ.Client.Core.DependencyInjection/Services/QueueService.cs

@@ -346,7 +346,7 @@ void ConfigureConnectionInfrastructure(RabbitMqConnectionOptionsContainer option
                 ConsumingChannel = ConsumingConnection.CreateModel();
                 ConsumingChannel.CallbackException += HandleChannelCallbackException;
                 ConsumingChannel.BasicRecoverOk += HandleChannelBasicRecoverOk;
-                
+
                 _consumer = _rabbitMqConnectionFactory.CreateConsumer(ConsumingChannel);
             }
         }
@@ -498,7 +498,7 @@ static Dictionary<string, object> CreateArguments(string exchangeName, string ro
                 { "x-message-ttl", secondsDelay * 1000 },
                 { "x-expires", secondsDelay * 1000 + QueueExpirationTime }
             };
-        
+
         async Task ConsumerOnReceived(object sender, BasicDeliverEventArgs eventArgs)
         {
             await _messageHandlingService.HandleMessageReceivingEvent(eventArgs, this);

tests/RabbitMQ.Client.Core.DependencyInjection.Tests/IntegrationTests/QueueServiceTests.cs

@@ -19,13 +19,13 @@ public class QueueServiceTests
         const string DefaultExchangeName = "exchange.name";
         const string FirstRoutingKey = "first.routing.key";
         const string SecondRoutingKey = "second.routing.key";
-        
+
         [Fact]
         public async Task ShouldProperlyPublishAndConsumeMessages()
         {
             var connectionFactoryMock = new Mock<RabbitMqConnectionFactory> { CallBase = true }
                 .As<IRabbitMqConnectionFactory>();
-            
+
             AsyncEventingBasicConsumer consumer = null;
             connectionFactoryMock.Setup(x => x.CreateConsumer(It.IsAny<IModel>()))
                 .Returns<IModel>(channel =>
@@ -35,7 +35,7 @@ public async Task ShouldProperlyPublishAndConsumeMessages()
                 });
 
             var callerMock = new Mock<IStubCaller>();
-            
+
             var serviceCollection = new ServiceCollection();
             serviceCollection
                 .AddSingleton(connectionFactoryMock.Object)
@@ -46,12 +46,12 @@ public async Task ShouldProperlyPublishAndConsumeMessages()
                 .AddNonCyclicMessageHandlerTransient<StubNonCyclicMessageHandler>(FirstRoutingKey)
                 .AddAsyncMessageHandlerTransient<StubAsyncMessageHandler>(SecondRoutingKey)
                 .AddAsyncNonCyclicMessageHandlerTransient<StubAsyncNonCyclicMessageHandler>(SecondRoutingKey);
-            
+
             var serviceProvider = serviceCollection.BuildServiceProvider();
             var queueService = serviceProvider.GetRequiredService<IQueueService>();
             queueService.StartConsuming();
-            
-            var resetEvent = new AutoResetEvent(false);
+
+            using var resetEvent = new AutoResetEvent(false);
             consumer.Received += (sender, @event) =>
             {
                 resetEvent.Set();
@@ -61,7 +61,7 @@ public async Task ShouldProperlyPublishAndConsumeMessages()
             await queueService.SendAsync(new { Message = "message" }, DefaultExchangeName, FirstRoutingKey);
             resetEvent.WaitOne(_globalTestsTimeout);
             callerMock.Verify(x => x.Call(It.IsAny<string>()), Times.Exactly(2));
-            
+
             await queueService.SendAsync(new { Message = "message" }, DefaultExchangeName, SecondRoutingKey);
             resetEvent.WaitOne(_globalTestsTimeout);
             callerMock.Verify(x => x.CallAsync(It.IsAny<string>()), Times.Exactly(2));

tests/RabbitMQ.Client.Core.DependencyInjection.Tests/IntegrationTests/RabbitMqConnectionFactoryTests.cs

@@ -22,7 +22,7 @@ public void ShouldProperlyRetryCreatingInitialConnection(int retries)
             };
             ExecuteUnsuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         [Theory]
         [InlineData(1)]
         [InlineData(5)]
@@ -38,7 +38,7 @@ public void ShouldProperlyRetryCreatingInitialConnectionWithConnectionName(int r
             };
             ExecuteUnsuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         [Theory]
         [InlineData(1)]
         [InlineData(5)]
@@ -59,7 +59,7 @@ public void ShouldProperlyRetryCreatingInitialConnectionWithTcpEndpoints(int ret
             };
             ExecuteUnsuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         [Theory]
         [InlineData(1)]
         [InlineData(5)]
@@ -74,7 +74,7 @@ public void ShouldProperlyRetryCreatingInitialConnectionWithHostNames(int retrie
             };
             ExecuteUnsuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         [Theory]
         [InlineData(1)]
         [InlineData(5)]
@@ -102,7 +102,7 @@ public void ShouldProperlyCreateInitialConnection()
             };
             ExecuteSuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         [Fact]
         public void ShouldProperlyCreateInitialConnectionWithConnectionName()
         {
@@ -115,7 +115,7 @@ public void ShouldProperlyCreateInitialConnectionWithConnectionName()
             };
             ExecuteSuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         [Fact]
         public void ShouldProperlyCreateInitialConnectionWithTcpEndpoints()
         {
@@ -133,7 +133,7 @@ public void ShouldProperlyCreateInitialConnectionWithTcpEndpoints()
             };
             ExecuteSuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         [Fact]
         public void ShouldProperlyCreateInitialConnectionWithHostNames()
         {
@@ -145,7 +145,7 @@ public void ShouldProperlyCreateInitialConnectionWithHostNames()
             };
             ExecuteSuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         [Fact]
         public void ShouldProperlyCreateInitialConnectionWithHostNamesAndNamedConnection()
         {
@@ -158,14 +158,14 @@ public void ShouldProperlyCreateInitialConnectionWithHostNamesAndNamedConnection
             };
             ExecuteSuccessfulConnectionCreationAndAssertResults(connectionOptions);
         }
-        
+
         static void ExecuteUnsuccessfulConnectionCreationAndAssertResults(RabbitMqClientOptions connectionOptions)
         {
             var connectionFactory = new RabbitMqConnectionFactory();
             var exception = Assert.Throws<InitialConnectionException>(() => connectionFactory.CreateRabbitMqConnection(connectionOptions));
             Assert.Equal(connectionOptions.InitialConnectionRetries, exception.NumberOfRetries);
         }
-        
+
         static void ExecuteSuccessfulConnectionCreationAndAssertResults(RabbitMqClientOptions connectionOptions)
         {
             var connectionFactory = new RabbitMqConnectionFactory();

tests/RabbitMQ.Client.Core.DependencyInjection.Tests/Stubs/IStubCaller.cs

@@ -10,7 +10,7 @@ public interface IStubCaller
         void Call(ReadOnlyMemory<byte> message);
 
         void Call(string message);
-        
+
         Task CallAsync(string message);
     }
 }