Rename RecoveringConsumer to RecoveringConsumerAsync

Author: lukebakken

projects/RabbitMQ.Client/PublicAPI.Shipped.txt

@@ -455,7 +455,6 @@ RabbitMQ.Client.IConnection.FrameMax.get -> uint
 RabbitMQ.Client.IConnection.Heartbeat.get -> System.TimeSpan
 RabbitMQ.Client.IConnection.IsOpen.get -> bool
 RabbitMQ.Client.IConnection.Protocol.get -> RabbitMQ.Client.IProtocol
-RabbitMQ.Client.IConnection.RecoveringConsumer -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.RecoveringConsumerEventArgs>
 RabbitMQ.Client.IConnection.ServerProperties.get -> System.Collections.Generic.IDictionary<string, object>
 RabbitMQ.Client.IConnection.ShutdownReport.get -> System.Collections.Generic.IEnumerable<RabbitMQ.Client.ShutdownReportEntry>
 RabbitMQ.Client.IConnectionExtensions
@@ -895,3 +894,4 @@ RabbitMQ.Client.IConnection.RecoverySucceededAsync -> RabbitMQ.Client.Events.Asy
 RabbitMQ.Client.IConnection.ConnectionRecoveryErrorAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConnectionRecoveryErrorEventArgs!>!
 RabbitMQ.Client.IConnection.ConsumerTagChangeAfterRecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConsumerTagChangedAfterRecoveryEventArgs!>!
 RabbitMQ.Client.IConnection.QueueNameChangedAfterRecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.QueueNameChangedAfterRecoveryEventArgs!>!
+RabbitMQ.Client.IConnection.RecoveringConsumerAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.RecoveringConsumerEventArgs!>!

projects/RabbitMQ.Client/client/api/IConnection.cs

@@ -204,7 +204,7 @@ public interface IConnection : INetworkConnection, IDisposable
         /// <remarks>
         /// This event will never fire for connections that disable automatic recovery.
         /// </remarks>
-        public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumer;
+        public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumerAsync;
 
         event AsyncEventHandler<EventArgs> ConnectionUnblocked;
 

projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs

@@ -520,7 +520,7 @@ internal async ValueTask RecoverConsumersAsync(AutorecoveringChannel channelToRe
                 try
                 {
                     _recordedEntitiesSemaphore.Release();
-                    await _consumerAboutToBeRecoveredWrapper.InvokeAsync(this, new RecoveringConsumerEventArgs(consumer.ConsumerTag, consumer.Arguments))
+                    await _recoveringConsumerAsyncWrapper.InvokeAsync(this, new RecoveringConsumerEventArgs(consumer.ConsumerTag, consumer.Arguments))
                         .ConfigureAwait(false);
                 }
                 finally

projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs

@@ -140,12 +140,12 @@ public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueName
         }
         private AsyncEventingWrapper<QueueNameChangedAfterRecoveryEventArgs> _queueNameChangedAfterRecoveryAsyncWrapper;
 
-        public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumer
+        public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumerAsync
         {
-            add => _consumerAboutToBeRecoveredWrapper.AddHandler(value);
-            remove => _consumerAboutToBeRecoveredWrapper.RemoveHandler(value);
+            add => _recoveringConsumerAsyncWrapper.AddHandler(value);
+            remove => _recoveringConsumerAsyncWrapper.RemoveHandler(value);
         }
-        private AsyncEventingWrapper<RecoveringConsumerEventArgs> _consumerAboutToBeRecoveredWrapper;
+        private AsyncEventingWrapper<RecoveringConsumerEventArgs> _recoveringConsumerAsyncWrapper;
 
         public string? ClientProvidedName => _config.ClientProvidedName;
 

projects/RabbitMQ.Client/client/impl/Connection.cs

@@ -139,7 +139,7 @@ public event AsyncEventHandler<EventArgs> ConnectionUnblocked
         }
         private AsyncEventingWrapper<EventArgs> _connectionUnblockedWrapper;
 
-        public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumer
+        public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumerAsync
         {
             add => _consumerAboutToBeRecoveredWrapper.AddHandler(value);
             remove => _consumerAboutToBeRecoveredWrapper.RemoveHandler(value);

projects/Test/Integration/ConnectionRecovery/EventHandlerRecovery/Connection/TestRecoveringConsumerEventHandlers.cs

@@ -56,7 +56,7 @@ public async Task TestRecoveringConsumerEventHandlers_Called(int iterations)
             await _channel.BasicConsumeAsync(q, true, cons);
 
             int counter = 0;
-            ((AutorecoveringConnection)_conn).RecoveringConsumer += (sender, args) =>
+            ((AutorecoveringConnection)_conn).RecoveringConsumerAsync += (sender, args) =>
             {
                 Interlocked.Increment(ref counter);
                 return Task.CompletedTask;
@@ -88,7 +88,7 @@ public async Task TestRecoveringConsumerEventHandler_EventArgumentsArePassedDown
 
             bool ctagMatches = false;
             bool consumerArgumentMatches = false;
-            ((AutorecoveringConnection)_conn).RecoveringConsumer += (sender, args) =>
+            ((AutorecoveringConnection)_conn).RecoveringConsumerAsync += (sender, args) =>
             {
                 // We cannot assert here because NUnit throws when an assertion fails. This exception is caught and
                 // passed to a CallbackExceptionHandler, instead of failing the test. Instead, we have to do this trick