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

Anton Vorontsov · Anton Vorontsov · commit 1fdab175b66a · 2020-05-05T23:48:39.000+03:00
diff --git a/examples/Examples.AdvancedConfiguration/Controllers/ExampleController.cs b/examples/Examples.AdvancedConfiguration/Controllers/ExampleController.cs
@@ -1,7 +1,6 @@
 ﻿using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
 
 namespace Examples.AdvancedConfiguration.Controllers
diff --git a/examples/Examples.AdvancedConfiguration/MessageHandlers/CustomAsyncMessageHandler.cs b/examples/Examples.AdvancedConfiguration/MessageHandlers/CustomAsyncMessageHandler.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;
 
 namespace Examples.AdvancedConfiguration.MessageHandlers
diff --git a/examples/Examples.AdvancedConfiguration/MessageHandlers/CustomAsyncNonCyclicMessageHandler.cs b/examples/Examples.AdvancedConfiguration/MessageHandlers/CustomAsyncNonCyclicMessageHandler.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
 
diff --git a/examples/Examples.AdvancedConfiguration/MessageHandlers/CustomMessageHandler.cs b/examples/Examples.AdvancedConfiguration/MessageHandlers/CustomMessageHandler.cs
@@ -1,4 +1,3 @@
-using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;
 
 namespace Examples.AdvancedConfiguration.MessageHandlers
diff --git a/examples/Examples.AdvancedConfiguration/MessageHandlers/CustomNonCyclicMessageHandler.cs b/examples/Examples.AdvancedConfiguration/MessageHandlers/CustomNonCyclicMessageHandler.cs
@@ -1,4 +1,3 @@
-using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
 
diff --git a/examples/Examples.AdvancedConfiguration/Services/ConsumingHostedService.cs b/examples/Examples.AdvancedConfiguration/Services/ConsumingHostedService.cs
@@ -1,7 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
-using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
 
 namespace Examples.AdvancedConfiguration.Services
diff --git a/examples/Examples.AdvancedConfiguration/Startup.cs b/examples/Examples.AdvancedConfiguration/Startup.cs
@@ -1,7 +1,6 @@
 using Examples.AdvancedConfiguration.MessageHandlers;
 using Examples.AdvancedConfiguration.Services;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection;
diff --git a/examples/Examples.BatchMessageHandler/AnotherCustomBatchMessageHandler.cs b/examples/Examples.BatchMessageHandler/AnotherCustomBatchMessageHandler.cs
@@ -9,7 +9,7 @@ namespace Examples.BatchMessageHandler
     public class AnotherCustomBatchMessageHandler : RabbitMQ.Client.Core.DependencyInjection.BatchMessageHandlers.BatchMessageHandler
     {
         readonly ILogger<AnotherCustomBatchMessageHandler> _logger;
-        
+
         public AnotherCustomBatchMessageHandler(
             IEnumerable<BatchConsumerConnectionOptions> batchConsumerConnectionOptions,
             ILogger<AnotherCustomBatchMessageHandler> logger)
@@ -19,9 +19,9 @@ public AnotherCustomBatchMessageHandler(
         }
 
         protected override ushort PrefetchCount { get; set; } = 5;
-        
+
         protected override string QueueName { get; set; } = "another.queue.name";
-        
+
         protected override Task HandleMessage(IEnumerable<string> messages, CancellationToken cancellationToken)
         {
             _logger.LogInformation("Handling a batch of messages.");
diff --git a/examples/Examples.BatchMessageHandler/CustomBatchMessageHandler.cs b/examples/Examples.BatchMessageHandler/CustomBatchMessageHandler.cs
@@ -12,19 +12,19 @@ namespace Examples.BatchMessageHandler
     public class CustomBatchMessageHandler : BaseBatchMessageHandler
     {
         readonly ILogger<CustomBatchMessageHandler> _logger;
-        
+
         public CustomBatchMessageHandler(
             IEnumerable<BatchConsumerConnectionOptions> batchConsumerConnectionOptions,
             ILogger<CustomBatchMessageHandler> logger)
             : base(batchConsumerConnectionOptions, logger)
         {
             _logger = logger;
         }
-        
+
         protected override ushort PrefetchCount { get; set; } = 3;
 
         protected override string QueueName { get; set; } = "queue.name";
-        
+
         protected override Task HandleMessages(IEnumerable<ReadOnlyMemory<byte>> messages, CancellationToken cancellationToken)
         {
             _logger.LogInformation("Handling a batch of messages.");
diff --git a/examples/Examples.BatchMessageHandler/Program.cs b/examples/Examples.BatchMessageHandler/Program.cs
@@ -21,7 +21,7 @@ public static async Task Main()
                     // Let's configure two different BatchMessageHandlers with different methods.
                     // First - configuring an appsettings.json section.
                     services.AddBatchMessageHandler<CustomBatchMessageHandler>(hostContext.Configuration.GetSection("RabbitMq"));
-                    
+
                     // Second one - passing configuration instance.
                      var rabbitMqConfiguration = new RabbitMqClientOptions
                      {
@@ -32,7 +32,7 @@ public static async Task Main()
                      };
                     services.AddBatchMessageHandler<AnotherCustomBatchMessageHandler>(rabbitMqConfiguration);
                 })
-                .ConfigureLogging((hostingContext, logging) => 
+                .ConfigureLogging((hostingContext, logging) =>
                 {
                     logging.AddConsole();
                 });
diff --git a/examples/Examples.ConsumerConsole/CustomAsyncMessageHandler.cs b/examples/Examples.ConsumerConsole/CustomAsyncMessageHandler.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Core.DependencyInjection;
 using System.Threading.Tasks;
 using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;
 
diff --git a/examples/Examples.ConsumerConsole/CustomAsyncNonCyclicMessageHandler.cs b/examples/Examples.ConsumerConsole/CustomAsyncNonCyclicMessageHandler.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Core.DependencyInjection;
 using System.Threading.Tasks;
 using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
diff --git a/examples/Examples.ConsumerHost/ConsumingService.cs b/examples/Examples.ConsumerHost/ConsumingService.cs
@@ -1,6 +1,5 @@
 ﻿using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Core.DependencyInjection;
 using System.Threading;
 using System.Threading.Tasks;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
diff --git a/examples/Examples.ConsumerHost/CustomMessageHandler.cs b/examples/Examples.ConsumerHost/CustomMessageHandler.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;
 
 namespace Examples.ConsumerHost
diff --git a/examples/Examples.ConsumerHost/CustomNonCyclicMessageHandler.cs b/examples/Examples.ConsumerHost/CustomNonCyclicMessageHandler.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
 
diff --git a/examples/Examples.Producer/Message.cs b/examples/Examples.Producer/Message.cs
@@ -7,7 +7,7 @@ public class Message
         public string Name { get; set; }
 
         public bool Flag { get; set; }
-        
+
         public int Index { get; set; }
 
         public IEnumerable<int> Numbers { get; set; }
diff --git a/readme.md b/readme.md
@@ -247,7 +247,7 @@ You have to set up values for `QueueName` and `PrefetchCount` properties. These
 public class CustomBatchMessageHandler : BatchMessageHandler
 {
     readonly ILogger<CustomBatchMessageHandler> _logger;
-    
+
     public CustomBatchMessageHandler(
         IEnumerable<BatchConsumerConnectionOptions> batchConsumerConnectionOptions,
         ILogger<CustomBatchMessageHandler> logger)
@@ -257,9 +257,9 @@ public class CustomBatchMessageHandler : BatchMessageHandler
     }
 
     protected override ushort PrefetchCount { get; set; } = 50;
-    
+
     protected override string QueueName { get; set; } = "another.queue.name";
-    
+
     protected override Task HandleMessage(IEnumerable<string> messages, CancellationToken cancellationToken)
     {
         _logger.LogInformation("Handling a batch of messages.");
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/BatchMessageHandlerDependencyInjectionExtensions.cs b/src/RabbitMQ.Client.Core.DependencyInjection/BatchMessageHandlerDependencyInjectionExtensions.cs
@@ -30,7 +30,7 @@ public static IServiceCollection AddBatchMessageHandler<TBatchMessageHandler>(th
             services.AddHostedService<TBatchMessageHandler>();
             return services;
         }
-        
+
         /// <summary>
         /// Add batch message handler.
         /// </summary>
@@ -59,7 +59,7 @@ static IServiceCollection ConfigureBatchConsumerConnectionOptions<TBatchMessageH
             services.Add(serviceDescriptor);
             return services;
         }
-        
+
         static void CheckIfBatchMessageHandlerAlreadyConfigured<TBatchMessageHandler>(this IServiceCollection services)
         {
             var descriptor = services.FirstOrDefault(x => x.ImplementationType == typeof(TBatchMessageHandler));
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/BatchMessageHandlers/BaseBatchMessageHandler.cs b/src/RabbitMQ.Client.Core.DependencyInjection/BatchMessageHandlers/BaseBatchMessageHandler.cs
@@ -23,17 +23,17 @@ public abstract class BaseBatchMessageHandler : IHostedService, IDisposable
         /// A connection which is in use by batch message handler.
         /// </summary>
         protected IConnection Connection { get; private set; }
-        
+
         /// <summary>
         /// A channel that has been created using the connection.
         /// </summary>
         protected IModel Channel { get;  private set; }
-        
+
         /// <summary>
-        /// Prefetch size value that can be overriden.
+        /// Prefetch size value that can be overridden.
         /// </summary>
         protected virtual uint PrefetchSize { get; set; } = 0;
-        
+
         /// <summary>
         /// Queue name which will be read by that batch message handler.
         /// </summary>
@@ -68,7 +68,7 @@ public Task StartAsync(CancellationToken cancellationToken)
             Connection = RabbitMqFactoryExtensions.CreateRabbitMqConnection(_clientOptions);
             Channel = Connection.CreateModel();
             Channel.BasicQos(PrefetchSize, PrefetchCount, false);
-            
+
             var messages = new ConcurrentBag<BasicDeliverEventArgs>();
             var consumer = new AsyncEventingBasicConsumer(Channel);
             consumer.Received += async (sender, eventArgs) =>
@@ -78,7 +78,7 @@ public Task StartAsync(CancellationToken cancellationToken)
                 {
                     return;
                 }
-                
+
                 var byteMessages = messages.Select(x => x.Body).ToList();
                 await HandleMessages(byteMessages, cancellationToken).ConfigureAwait(false);
                 var latestDeliveryTag = messages.Max(x => x.DeliveryTag);
@@ -115,7 +115,7 @@ public Task StopAsync(CancellationToken cancellationToken)
             _logger.LogInformation($"Batch message handler {GetType()} has been stopped.");
             return Task.CompletedTask;
         }
-        
+
         protected virtual void Dispose(bool disposing)
         {
             Connection?.Dispose();
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/BatchMessageHandlers/BatchMessageHandler.cs b/src/RabbitMQ.Client.Core.DependencyInjection/BatchMessageHandlers/BatchMessageHandler.cs
@@ -16,11 +16,11 @@ public abstract class BatchMessageHandler : BaseBatchMessageHandler
     {
         protected BatchMessageHandler(
             IEnumerable<BatchConsumerConnectionOptions> batchConsumerConnectionOptions,
-            ILogger<BatchMessageHandler> logger) 
+            ILogger<BatchMessageHandler> logger)
             : base(batchConsumerConnectionOptions, logger)
         {
         }
-        
+
         /// <summary>
         /// Handle a batch of messages.
         /// </summary>
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/Exceptions/BatchMessageHandlerInvalidPropertyValueException.cs b/src/RabbitMQ.Client.Core.DependencyInjection/Exceptions/BatchMessageHandlerInvalidPropertyValueException.cs
@@ -11,7 +11,7 @@ public class BatchMessageHandlerInvalidPropertyValueException : Exception
         /// Property that contains invalid value.
         /// </summary>
         public string PropertyName { get; set; }
-        
+
         public BatchMessageHandlerInvalidPropertyValueException(string message, string propertyName) : base(message)
         {
             PropertyName = propertyName;
diff --git a/src/RabbitMQ.Client.Core.DependencyInjection/Models/BatchConsumerConnectionOptions.cs b/src/RabbitMQ.Client.Core.DependencyInjection/Models/BatchConsumerConnectionOptions.cs
@@ -12,7 +12,7 @@ public class BatchConsumerConnectionOptions
         /// Type of batch message handler.
         /// </summary>
         public Type Type { get; set; }
-        
+
         /// <summary>
         /// Consumer client connection options.
         /// </summary>
diff --git a/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/BatchMessageHandlerDependencyInjectionExtensionsTests.cs b/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/BatchMessageHandlerDependencyInjectionExtensionsTests.cs
@@ -23,7 +23,7 @@ await Assert.ThrowsAsync<BatchMessageHandlerAlreadyConfiguredException>(() =>
                 return Task.CompletedTask;
             });
         }
-        
+
         [Fact]
         public async Task ShouldProperlyThrowExceptionWhenRegisteringSameBatchMessageHandlerTwiceWithOptions()
         {
@@ -35,7 +35,7 @@ await Assert.ThrowsAsync<BatchMessageHandlerAlreadyConfiguredException>(() =>
                 return Task.CompletedTask;
             });
         }
-        
+
         [Fact]
         public async Task ShouldProperlyThrowExceptionWhenRegisteringSameBatchMessageHandlerTwiceWithConfigurationAndOptions()
         {
diff --git a/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/Stubs/StubBatchMessageHandler.cs b/tests/RabbitMQ.Client.Core.DependencyInjection.Tests/UnitTests/Stubs/StubBatchMessageHandler.cs
@@ -12,19 +12,19 @@ namespace RabbitMQ.Client.Core.DependencyInjection.Tests.UnitTests.Stubs
     public class StubBatchMessageHandler : BaseBatchMessageHandler
     {
         readonly ILogger<StubBatchMessageHandler> _logger;
-        
+
         public StubBatchMessageHandler(
             IEnumerable<BatchConsumerConnectionOptions> batchConsumerConnectionOptions,
             ILogger<StubBatchMessageHandler> logger)
             : base(batchConsumerConnectionOptions, logger)
         {
             _logger = logger;
         }
-        
+
         protected override ushort PrefetchCount { get; set; } = 3;
-        
+
         protected override string QueueName { get; set; } = "queue.name";
-        
+
         protected override Task HandleMessages(IEnumerable<ReadOnlyMemory<byte>> messages, CancellationToken cancellationToken)
         {
             foreach (var message in messages)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`		`-using RabbitMQ.Client.Core.DependencyInjection;`
`3`	`2`	`using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;`
`4`	`3`
`5`	`4`	`namespace Examples.AdvancedConfiguration.MessageHandlers`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using RabbitMQ.Client.Core.DependencyInjection;`
`2`	`1`	`using RabbitMQ.Client.Core.DependencyInjection.MessageHandlers;`
`3`	`2`
`4`	`3`	`namespace Examples.AdvancedConfiguration.MessageHandlers`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Examples.BatchMessageHandler`
`9`	`9`	`public class AnotherCustomBatchMessageHandler : RabbitMQ.Client.Core.DependencyInjection.BatchMessageHandlers.BatchMessageHandler`
`10`	`10`	`{`
`11`	`11`	`readonly ILogger<AnotherCustomBatchMessageHandler> _logger;`
`12`		`-`
	`12`	`+`
`13`	`13`	`public AnotherCustomBatchMessageHandler(`
`14`	`14`	`IEnumerable<BatchConsumerConnectionOptions> batchConsumerConnectionOptions,`
`15`	`15`	`ILogger<AnotherCustomBatchMessageHandler> logger)`
`@@ -19,9 +19,9 @@ public AnotherCustomBatchMessageHandler(`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`protected override ushort PrefetchCount { get; set; } = 5;`
`22`		`-`
	`22`	`+`
`23`	`23`	`protected override string QueueName { get; set; } = "another.queue.name";`
`24`		`-`
	`24`	`+`
`25`	`25`	`protected override Task HandleMessage(IEnumerable<string> messages, CancellationToken cancellationToken)`
`26`	`26`	`{`
`27`	`27`	`_logger.LogInformation("Handling a batch of messages.");`
Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,19 @@ namespace Examples.BatchMessageHandler`
`12`	`12`	`public class CustomBatchMessageHandler : BaseBatchMessageHandler`
`13`	`13`	`{`
`14`	`14`	`readonly ILogger<CustomBatchMessageHandler> _logger;`
`15`		`-`
	`15`	`+`
`16`	`16`	`public CustomBatchMessageHandler(`
`17`	`17`	`IEnumerable<BatchConsumerConnectionOptions> batchConsumerConnectionOptions,`
`18`	`18`	`ILogger<CustomBatchMessageHandler> logger)`
`19`	`19`	`: base(batchConsumerConnectionOptions, logger)`
`20`	`20`	`{`
`21`	`21`	`_logger = logger;`
`22`	`22`	`}`
`23`		`-`
	`23`	`+`
`24`	`24`	`protected override ushort PrefetchCount { get; set; } = 3;`
`25`	`25`
`26`	`26`	`protected override string QueueName { get; set; } = "queue.name";`
`27`		`-`
	`27`	`+`
`28`	`28`	`protected override Task HandleMessages(IEnumerable<ReadOnlyMemory<byte>> messages, CancellationToken cancellationToken)`
`29`	`29`	`{`
`30`	`30`	`_logger.LogInformation("Handling a batch of messages.");`