Rename ConnectionBlocked to ConnectionBlockedAsync

Author: lukebakken

projects/RabbitMQ.Client/PublicAPI.Shipped.txt

@@ -449,7 +449,6 @@ RabbitMQ.Client.IConnection.ChannelMax.get -> ushort
 RabbitMQ.Client.IConnection.ClientProperties.get -> System.Collections.Generic.IDictionary<string, object>
 RabbitMQ.Client.IConnection.ClientProvidedName.get -> string
 RabbitMQ.Client.IConnection.CloseReason.get -> RabbitMQ.Client.ShutdownEventArgs
-RabbitMQ.Client.IConnection.ConnectionBlocked -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConnectionBlockedEventArgs>
 RabbitMQ.Client.IConnection.ConnectionRecoveryError -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConnectionRecoveryErrorEventArgs>
 RabbitMQ.Client.IConnection.ConnectionShutdown -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.ShutdownEventArgs>
 RabbitMQ.Client.IConnection.ConnectionUnblocked -> RabbitMQ.Client.Events.AsyncEventHandler<System.EventArgs>
@@ -895,3 +894,4 @@ const RabbitMQ.Client.Constants.DefaultConsumerDispatchConcurrency = 1 -> ushort
 readonly RabbitMQ.Client.ConnectionConfig.ConsumerDispatchConcurrency -> ushort
 RabbitMQ.Client.IConnection.CreateChannelAsync(ushort? consumerDispatchConcurrency = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IChannel!>!
 RabbitMQ.Client.IConnection.CallbackExceptionAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.CallbackExceptionEventArgs!>!
+RabbitMQ.Client.IConnection.ConnectionBlockedAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConnectionBlockedEventArgs!>!

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

@@ -145,7 +145,7 @@ public interface IConnection : INetworkConnection, IDisposable
         /// </remarks>
         event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync;
 
-        event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked;
+        event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlockedAsync;
 
         /// <summary>
         /// Raised when the connection is destroyed.

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

@@ -108,10 +108,10 @@ public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsyn
             remove => InnerConnection.CallbackExceptionAsync -= value;
         }
 
-        public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked
+        public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlockedAsync
         {
-            add => InnerConnection.ConnectionBlocked += value;
-            remove => InnerConnection.ConnectionBlocked -= value;
+            add => InnerConnection.ConnectionBlockedAsync += value;
+            remove => InnerConnection.ConnectionBlockedAsync -= value;
         }
 
         public event AsyncEventHandler<ShutdownEventArgs> ConnectionShutdown

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

@@ -56,9 +56,9 @@ internal void NotifyReceivedCloseOk()
 
         internal Task HandleConnectionBlockedAsync(string reason)
         {
-            if (!_connectionBlockedWrapper.IsEmpty)
+            if (!_connectionBlockedAsyncWrapper.IsEmpty)
             {
-                return _connectionBlockedWrapper.InvokeAsync(this, new ConnectionBlockedEventArgs(reason));
+                return _connectionBlockedAsyncWrapper.InvokeAsync(this, new ConnectionBlockedEventArgs(reason));
             }
             return Task.CompletedTask;
         }

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

@@ -66,7 +66,7 @@ internal Connection(ConnectionConfig config, IFrameHandler frameHandler)
 
             Func<Exception, string, Task> onException = (exception, context) => OnCallbackExceptionAsync(CallbackExceptionEventArgs.Build(exception, context));
             _callbackExceptionAsyncWrapper = new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);
-            _connectionBlockedWrapper = new AsyncEventingWrapper<ConnectionBlockedEventArgs>("OnConnectionBlocked", onException);
+            _connectionBlockedAsyncWrapper = new AsyncEventingWrapper<ConnectionBlockedEventArgs>("OnConnectionBlocked", onException);
             _connectionUnblockedWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionUnblocked", onException);
             _connectionShutdownWrapper = new AsyncEventingWrapper<ShutdownEventArgs>("OnShutdown", onException);
 
@@ -125,12 +125,12 @@ public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsyn
         }
         private AsyncEventingWrapper<CallbackExceptionEventArgs> _callbackExceptionAsyncWrapper;
 
-        public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked
+        public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlockedAsync
         {
-            add => _connectionBlockedWrapper.AddHandler(value);
-            remove => _connectionBlockedWrapper.RemoveHandler(value);
+            add => _connectionBlockedAsyncWrapper.AddHandler(value);
+            remove => _connectionBlockedAsyncWrapper.RemoveHandler(value);
         }
-        private AsyncEventingWrapper<ConnectionBlockedEventArgs> _connectionBlockedWrapper;
+        private AsyncEventingWrapper<ConnectionBlockedEventArgs> _connectionBlockedAsyncWrapper;
 
         public event AsyncEventHandler<EventArgs> ConnectionUnblocked
         {
@@ -208,7 +208,7 @@ public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueName
         internal void TakeOver(Connection other)
         {
             _callbackExceptionAsyncWrapper.Takeover(other._callbackExceptionAsyncWrapper);
-            _connectionBlockedWrapper.Takeover(other._connectionBlockedWrapper);
+            _connectionBlockedAsyncWrapper.Takeover(other._connectionBlockedAsyncWrapper);
             _connectionUnblockedWrapper.Takeover(other._connectionUnblockedWrapper);
             _connectionShutdownWrapper.Takeover(other._connectionShutdownWrapper);
             // TODO Why are other wrappers not taken over?

projects/Test/SequentialIntegration/TestConnectionBlocked.cs

@@ -60,7 +60,7 @@ public override async Task DisposeAsync()
         public async Task TestConnectionBlockedNotification()
         {
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-            _conn.ConnectionBlocked += async (object sender, ConnectionBlockedEventArgs args) =>
+            _conn.ConnectionBlockedAsync += async (object sender, ConnectionBlockedEventArgs args) =>
             {
                 // TODO should this continue to be doing fire and forget?
                 await UnblockAsync();

projects/Test/SequentialIntegration/TestConnectionBlockedChannelLeak.cs

@@ -82,7 +82,7 @@ public async Task TestConnectionBlockedChannelLeak_GH1573()
 
             string exchangeName = GenerateExchangeName();
 
-            _conn.ConnectionBlocked += (object sender, ConnectionBlockedEventArgs args) =>
+            _conn.ConnectionBlockedAsync += (object sender, ConnectionBlockedEventArgs args) =>
             {
                 connectionBlockedTcs.SetResult(true);
                 return Task.CompletedTask;

projects/Test/SequentialIntegration/TestConnectionRecovery.cs

@@ -146,7 +146,7 @@ public async Task TestBlockedListenersRecovery()
             try
             {
                 var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                _conn.ConnectionBlocked += (c, reason) =>
+                _conn.ConnectionBlockedAsync += (c, reason) =>
                 {
                     tcs.SetResult(true);
                     return Task.CompletedTask;