Rename ConsumerTagChangeAfterRecovery to ConsumerTagChangeAfterRecoveryAsync

Author: lukebakken

projects/RabbitMQ.Client/PublicAPI.Shipped.txt

@@ -450,7 +450,6 @@ RabbitMQ.Client.IConnection.ClientProperties.get -> System.Collections.Generic.I
 RabbitMQ.Client.IConnection.ClientProvidedName.get -> string
 RabbitMQ.Client.IConnection.CloseReason.get -> RabbitMQ.Client.ShutdownEventArgs
 RabbitMQ.Client.IConnection.ConnectionUnblocked -> RabbitMQ.Client.Events.AsyncEventHandler<System.EventArgs>
-RabbitMQ.Client.IConnection.ConsumerTagChangeAfterRecovery -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConsumerTagChangedAfterRecoveryEventArgs>
 RabbitMQ.Client.IConnection.Endpoint.get -> RabbitMQ.Client.AmqpTcpEndpoint
 RabbitMQ.Client.IConnection.FrameMax.get -> uint
 RabbitMQ.Client.IConnection.Heartbeat.get -> System.TimeSpan
@@ -895,3 +894,4 @@ RabbitMQ.Client.IConnection.ConnectionBlockedAsync -> RabbitMQ.Client.Events.Asy
 RabbitMQ.Client.IConnection.ConnectionShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.ShutdownEventArgs!>!
 RabbitMQ.Client.IConnection.RecoverySucceededAsync -> RabbitMQ.Client.Events.AsyncEventHandler<System.EventArgs!>!
 RabbitMQ.Client.IConnection.ConnectionRecoveryErrorAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConnectionRecoveryErrorEventArgs!>!
+RabbitMQ.Client.IConnection.ConsumerTagChangeAfterRecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConsumerTagChangedAfterRecoveryEventArgs!>!

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

@@ -182,7 +182,7 @@ public interface IConnection : INetworkConnection, IDisposable
         /// <remarks>
         /// This event will never fire for connections that disable automatic recovery.
         /// </remarks>
-        event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecovery;
+        event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecoveryAsync;
 
         /// <summary>
         /// Raised when the name of a server-named queue declared on this connection changes during

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

@@ -537,12 +537,12 @@ await _recordedEntitiesSemaphore.WaitAsync(cancellationToken)
                     RecordedConsumer consumerWithNewConsumerTag = RecordedConsumer.WithNewConsumerTag(newTag, consumer);
                     UpdateConsumer(oldTag, newTag, consumerWithNewConsumerTag);
 
-                    if (!_consumerTagChangeAfterRecoveryWrapper.IsEmpty)
+                    if (!_consumerTagChangeAfterRecoveryAsyncWrapper.IsEmpty)
                     {
                         try
                         {
                             _recordedEntitiesSemaphore.Release();
-                            await _consumerTagChangeAfterRecoveryWrapper.InvokeAsync(this, new ConsumerTagChangedAfterRecoveryEventArgs(oldTag, newTag))
+                            await _consumerTagChangeAfterRecoveryAsyncWrapper.InvokeAsync(this, new ConsumerTagChangedAfterRecoveryEventArgs(oldTag, newTag))
                                 .ConfigureAwait(false);
                         }
                         finally

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

@@ -69,7 +69,7 @@ internal AutorecoveringConnection(ConnectionConfig config, IEndpointResolver end
             ConnectionShutdownAsync += HandleConnectionShutdown;
             _recoverySucceededAsyncWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionRecovery", onExceptionAsync);
             _connectionRecoveryErrorAsyncWrapper = new AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs>("OnConnectionRecoveryError", onExceptionAsync);
-            _consumerTagChangeAfterRecoveryWrapper = new AsyncEventingWrapper<ConsumerTagChangedAfterRecoveryEventArgs>("OnConsumerRecovery", onExceptionAsync);
+            _consumerTagChangeAfterRecoveryAsyncWrapper = new AsyncEventingWrapper<ConsumerTagChangedAfterRecoveryEventArgs>("OnConsumerRecovery", onExceptionAsync);
             _queueNameChangedAfterRecoveryWrapper = new AsyncEventingWrapper<QueueNameChangedAfterRecoveryEventArgs>("OnQueueRecovery", onExceptionAsync);
 
             Task onExceptionAsync(Exception exception, string context) =>
@@ -126,12 +126,12 @@ public event AsyncEventHandler<EventArgs> ConnectionUnblocked
             remove => InnerConnection.ConnectionUnblocked -= value;
         }
 
-        public event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecovery
+        public event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecoveryAsync
         {
-            add => _consumerTagChangeAfterRecoveryWrapper.AddHandler(value);
-            remove => _consumerTagChangeAfterRecoveryWrapper.RemoveHandler(value);
+            add => _consumerTagChangeAfterRecoveryAsyncWrapper.AddHandler(value);
+            remove => _consumerTagChangeAfterRecoveryAsyncWrapper.RemoveHandler(value);
         }
-        private AsyncEventingWrapper<ConsumerTagChangedAfterRecoveryEventArgs> _consumerTagChangeAfterRecoveryWrapper;
+        private AsyncEventingWrapper<ConsumerTagChangedAfterRecoveryEventArgs> _consumerTagChangeAfterRecoveryAsyncWrapper;
 
         public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangedAfterRecovery
         {

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

@@ -190,7 +190,7 @@ public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecov
         /// <summary>
         /// This event is never fired by non-recovering connections but it is a part of the <see cref="IConnection"/> interface.
         /// </summary>
-        public event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecovery
+        public event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecoveryAsync
         {
             add { }
             remove { }

projects/Test/Integration/ConnectionRecovery/TestConsumerRecovery.cs

@@ -58,7 +58,7 @@ public async Task TestConsumerRecoveryWithManyConsumers()
             }
 
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-            ((AutorecoveringConnection)_conn).ConsumerTagChangeAfterRecovery += (prev, current) =>
+            ((AutorecoveringConnection)_conn).ConsumerTagChangeAfterRecoveryAsync += (prev, current) =>
             {
                 tcs.TrySetResult(true);
                 return Task.CompletedTask;