Made batch message handlers work with BasicDeliverEventArgs. Removed BatchMessageHandler.

Author: Anton Vorontsov

examples/Examples.BatchMessageHandler/AnotherCustomBatchMessageHandler.cs

@@ -1,12 +1,12 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using RabbitMQ.Client.Core.DependencyInjection;
 using RabbitMQ.Client.Core.DependencyInjection.BatchMessageHandlers;
 using RabbitMQ.Client.Core.DependencyInjection.Models;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
+using RabbitMQ.Client.Events;
 
 namespace Examples.BatchMessageHandler
 {
@@ -28,13 +28,12 @@ public CustomBatchMessageHandler(
         // You have to be aware that BaseBatchMessageHandler does not declare the specified queue. So if it does not exists an exception will be thrown.
         public override string QueueName { get; set; } = "queue.name";
 
-        public override Task HandleMessages(IEnumerable<ReadOnlyMemory<byte>> messages, CancellationToken cancellationToken)
+        public override Task HandleMessages(IEnumerable<BasicDeliverEventArgs> messages, CancellationToken cancellationToken)
         {
             _logger.LogInformation("Handling a batch of messages.");
             foreach (var message in messages)
             {
-                var stringifiedMessage = Encoding.UTF8.GetString(message.ToArray());
-                _logger.LogInformation(stringifiedMessage);
+                _logger.LogInformation(message.GetMessage());
             }
             return Task.CompletedTask;
         }

examples/Examples.BatchMessageHandler/CustomBatchMessageHandler.cs

@@ -21,16 +21,18 @@ 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
-                     {
-                         HostName = "127.0.0.1",
-                         Port = 5672,
-                         UserName = "guest",
-                         Password = "guest"
-                     };
-                    services.AddBatchMessageHandler<AnotherCustomBatchMessageHandler>(rabbitMqConfiguration);
+                    var rabbitMqConfiguration = new RabbitMqClientOptions
+                    {
+                        HostName = "127.0.0.1",
+                        Port = 5672,
+                        UserName = "guest",
+                        Password = "guest"
+                    };
+                    services.AddBatchMessageHandler<CustomBatchMessageHandler>(rabbitMqConfiguration);
+                    
+                    // Use either of them. Do not register batch message handlers multiple times in your real project.
                 })
                 .ConfigureLogging((hostingContext, logging) =>
                 {

examples/Examples.BatchMessageHandler/Program.cs

@@ -108,15 +108,13 @@ public Task StartAsync(CancellationToken cancellationToken)
 
         async Task ProcessBatchOfMessages(CancellationToken cancellationToken)
         {
-
             var messages = GetMessages();
             if (!messages.Any())
             {
                 return;
             }
 
-            var byteMessages = messages.Select(x => x.Body).ToList();
-            await HandleMessages(byteMessages, cancellationToken).ConfigureAwait(false);
+            await HandleMessages(messages, cancellationToken).ConfigureAwait(false);
             var latestDeliveryTag = messages.Max(x => x.DeliveryTag);
             Channel.BasicAck(latestDeliveryTag, true);
         }
@@ -152,11 +150,11 @@ void ValidateProperties()
         /// <summary>
         /// Handle a batch of messages.
         /// </summary>
-        /// <param name="messages">A collection of messages as bytes.</param>
+        /// <param name="messages">A collection of messages.</param>
         /// <param name="cancellationToken">Cancellation token.</param>
         /// <returns></returns>
-        public abstract Task HandleMessages(IEnumerable<ReadOnlyMemory<byte>> messages, CancellationToken cancellationToken);
-
+        public abstract Task HandleMessages(IEnumerable<BasicDeliverEventArgs> messages, CancellationToken cancellationToken);
+        
         public Task StopAsync(CancellationToken cancellationToken)
         {
             _timer?.Change(Timeout.Infinite, 0);

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

@@ -6,6 +6,7 @@
 using RabbitMQ.Client.Core.DependencyInjection.BatchMessageHandlers;
 using RabbitMQ.Client.Core.DependencyInjection.Models;
 using RabbitMQ.Client.Core.DependencyInjection.Services;
+using RabbitMQ.Client.Events;
 
 namespace RabbitMQ.Client.Core.DependencyInjection.Tests.Stubs
 {
@@ -29,11 +30,11 @@ public StubBaseBatchMessageHandler(
 
         public override TimeSpan? MessageHandlingPeriod { get; set; }
 
-        public override Task HandleMessages(IEnumerable<ReadOnlyMemory<byte>> messages, CancellationToken cancellationToken)
+        public override Task HandleMessages(IEnumerable<BasicDeliverEventArgs> messages, CancellationToken cancellationToken)
         {
             foreach (var message in messages)
             {
-                _caller.Call(message);
+                _caller.Call(message.Body);
             }
             _caller.EmptyCall();
             return Task.CompletedTask;