Rename QueueNameChangedAfterRecovery to QueueNameChangedAfterRecoveryAsync

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.QueueNameChangedAfterRecovery -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.QueueNameChangedAfterRecoveryEventArgs>
 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>
@@ -895,3 +894,4 @@ RabbitMQ.Client.IConnection.ConnectionShutdownAsync -> RabbitMQ.Client.Events.As
 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!>!
+RabbitMQ.Client.IConnection.QueueNameChangedAfterRecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.QueueNameChangedAfterRecoveryEventArgs!>!

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

@@ -192,7 +192,7 @@ public interface IConnection : INetworkConnection, IDisposable
         /// <remarks>
         /// This event will never fire for connections that disable automatic recovery.
         /// </remarks>
-        event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangedAfterRecovery;
+        event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangedAfterRecoveryAsync;
 
         /// <summary>
         /// Raised when a consumer is about to be recovered. This event raises when topology recovery

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

@@ -381,12 +381,12 @@ await RecordQueueAsync(new RecordedQueue(newName, recordedQueue),
                             recordedEntitiesSemaphoreHeld: recordedEntitiesSemaphoreHeld, cancellationToken)
                             .ConfigureAwait(false);
 
-                        if (!_queueNameChangedAfterRecoveryWrapper.IsEmpty)
+                        if (!_queueNameChangedAfterRecoveryAsyncWrapper.IsEmpty)
                         {
                             try
                             {
                                 _recordedEntitiesSemaphore.Release();
-                                await _queueNameChangedAfterRecoveryWrapper.InvokeAsync(this, new QueueNameChangedAfterRecoveryEventArgs(oldName, newName))
+                                await _queueNameChangedAfterRecoveryAsyncWrapper.InvokeAsync(this, new QueueNameChangedAfterRecoveryEventArgs(oldName, newName))
                                     .ConfigureAwait(false);
                             }
                             finally

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

@@ -70,7 +70,7 @@ internal AutorecoveringConnection(ConnectionConfig config, IEndpointResolver end
             _recoverySucceededAsyncWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionRecovery", onExceptionAsync);
             _connectionRecoveryErrorAsyncWrapper = new AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs>("OnConnectionRecoveryError", onExceptionAsync);
             _consumerTagChangeAfterRecoveryAsyncWrapper = new AsyncEventingWrapper<ConsumerTagChangedAfterRecoveryEventArgs>("OnConsumerRecovery", onExceptionAsync);
-            _queueNameChangedAfterRecoveryWrapper = new AsyncEventingWrapper<QueueNameChangedAfterRecoveryEventArgs>("OnQueueRecovery", onExceptionAsync);
+            _queueNameChangedAfterRecoveryAsyncWrapper = new AsyncEventingWrapper<QueueNameChangedAfterRecoveryEventArgs>("OnQueueRecovery", onExceptionAsync);
 
             Task onExceptionAsync(Exception exception, string context) =>
                 _innerConnection.OnCallbackExceptionAsync(CallbackExceptionEventArgs.Build(exception, context));
@@ -133,12 +133,12 @@ public event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> Consume
         }
         private AsyncEventingWrapper<ConsumerTagChangedAfterRecoveryEventArgs> _consumerTagChangeAfterRecoveryAsyncWrapper;
 
-        public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangedAfterRecovery
+        public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangedAfterRecoveryAsync
         {
-            add => _queueNameChangedAfterRecoveryWrapper.AddHandler(value);
-            remove => _queueNameChangedAfterRecoveryWrapper.RemoveHandler(value);
+            add => _queueNameChangedAfterRecoveryAsyncWrapper.AddHandler(value);
+            remove => _queueNameChangedAfterRecoveryAsyncWrapper.RemoveHandler(value);
         }
-        private AsyncEventingWrapper<QueueNameChangedAfterRecoveryEventArgs> _queueNameChangedAfterRecoveryWrapper;
+        private AsyncEventingWrapper<QueueNameChangedAfterRecoveryEventArgs> _queueNameChangedAfterRecoveryAsyncWrapper;
 
         public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumer
         {

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

@@ -199,7 +199,7 @@ public event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> Consume
         /// <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<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangedAfterRecovery
+        public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueNameChangedAfterRecoveryAsync
         {
             add { }
             remove { }

projects/Test/Integration/ConnectionRecovery/TestQueueRecovery.cs

@@ -81,7 +81,7 @@ public async Task TestServerNamedQueueRecovery()
                 tcs.SetResult(true);
                 return Task.CompletedTask;
             };
-            connection.QueueNameChangedAfterRecovery += (source, ea) =>
+            connection.QueueNameChangedAfterRecoveryAsync += (source, ea) =>
             {
                 nameAfter = ea.NameAfter;
                 return Task.CompletedTask;

projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs

@@ -167,7 +167,7 @@ public async Task TestConsumerRecoveryOnClientNamedQueueWithOneRecovery()
                     await AssertConsumerCountAsync(ch, q1, 1);
 
                     bool queueNameChangeAfterRecoveryCalled = false;
-                    c.QueueNameChangedAfterRecovery += (source, ea) =>
+                    c.QueueNameChangedAfterRecoveryAsync += (source, ea) =>
                     {
                         queueNameChangeAfterRecoveryCalled = true;
                         return Task.CompletedTask;
@@ -226,7 +226,7 @@ public async Task TestConsumerRecoveryWithServerNamedQueue()
                     bool queueNameBeforeIsEqual = false;
                     bool queueNameChangeAfterRecoveryCalled = false;
                     string qnameAfterRecovery = null;
-                    c.QueueNameChangedAfterRecovery += (source, ea) =>
+                    c.QueueNameChangedAfterRecoveryAsync += (source, ea) =>
                     {
                         queueNameChangeAfterRecoveryCalled = true;
                         queueNameBeforeIsEqual = qname.Equals(ea.NameBefore);

projects/Test/SequentialIntegration/TestConnectionRecovery.cs

@@ -223,7 +223,7 @@ public async Task TestServerNamedTransientAutoDeleteQueueAndBindingRecovery()
             string nameAfter = null;
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
-            ((AutorecoveringConnection)_conn).QueueNameChangedAfterRecovery += (source, ea) =>
+            ((AutorecoveringConnection)_conn).QueueNameChangedAfterRecoveryAsync += (source, ea) =>
             {
                 nameBefore = ea.NameBefore;
                 nameAfter = ea.NameAfter;