Skip to content

Commit 31e9ccc

Browse files
lukebakkenlukebakken
committed
Rename ConnectionUnblocked to ConnectionUnblockedAsync 
1 parent 9015943 commit 31e9ccc

File tree

8 files changed

+35
-21
lines changed

8 files changed

+35
-21
lines changed

‎projects/RabbitMQ.Client/PublicAPI.Shipped.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ RabbitMQ.Client.IConnection.ChannelMax.get -> ushort
449449
RabbitMQ.Client.IConnection.ClientProperties.get -> System.Collections.Generic.IDictionary<string, object>
450450
RabbitMQ.Client.IConnection.ClientProvidedName.get -> string
451451
RabbitMQ.Client.IConnection.CloseReason.get -> RabbitMQ.Client.ShutdownEventArgs
452-
RabbitMQ.Client.IConnection.ConnectionUnblocked -> RabbitMQ.Client.Events.AsyncEventHandler<System.EventArgs>
453452
RabbitMQ.Client.IConnection.Endpoint.get -> RabbitMQ.Client.AmqpTcpEndpoint
454453
RabbitMQ.Client.IConnection.FrameMax.get -> uint
455454
RabbitMQ.Client.IConnection.Heartbeat.get -> System.TimeSpan
@@ -895,3 +894,4 @@ RabbitMQ.Client.IConnection.ConnectionRecoveryErrorAsync -> RabbitMQ.Client.Even
895894
RabbitMQ.Client.IConnection.ConsumerTagChangeAfterRecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConsumerTagChangedAfterRecoveryEventArgs!>!
896895
RabbitMQ.Client.IConnection.QueueNameChangedAfterRecoveryAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.QueueNameChangedAfterRecoveryEventArgs!>!
897896
RabbitMQ.Client.IConnection.RecoveringConsumerAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.RecoveringConsumerEventArgs!>!
897+
RabbitMQ.Client.IConnection.ConnectionUnblockedAsync -> RabbitMQ.Client.Events.AsyncEventHandler<System.EventArgs!>!

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ public interface IConnection : INetworkConnection, IDisposable
145145
/// </remarks>
146146
event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync;
147147

148-
event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlockedAsync;
149-
150148
/// <summary>
151149
/// Raised when the connection is destroyed.
152150
/// </summary>
@@ -206,7 +204,15 @@ public interface IConnection : INetworkConnection, IDisposable
206204
/// </remarks>
207205
public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumerAsync;
208206

209-
event AsyncEventHandler<EventArgs> ConnectionUnblocked;
207+
/// <summary>
208+
/// Raised when a connection is blocked by the AMQP broker.
209+
/// </summary>
210+
event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlockedAsync;
211+
212+
/// <summary>
213+
/// Raised when a connection is unblocked by the AMQP broker.
214+
/// </summary>
215+
event AsyncEventHandler<EventArgs> ConnectionUnblockedAsync;
210216

211217
/// <summary>
212218
/// This method updates the secret used to authenticate this connection.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ public event AsyncEventHandler<ShutdownEventArgs> ConnectionShutdownAsync
131131
remove => InnerConnection.ConnectionShutdownAsync -= value;
132132
}
133133

134-
public event AsyncEventHandler<EventArgs> ConnectionUnblocked
134+
public event AsyncEventHandler<EventArgs> ConnectionUnblockedAsync
135135
{
136-
add => InnerConnection.ConnectionUnblocked += value;
137-
remove => InnerConnection.ConnectionUnblocked -= value;
136+
add => InnerConnection.ConnectionUnblockedAsync += value;
137+
remove => InnerConnection.ConnectionUnblockedAsync -= value;
138138
}
139139

140140
public event AsyncEventHandler<ConsumerTagChangedAfterRecoveryEventArgs> ConsumerTagChangeAfterRecoveryAsync

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ internal Task HandleConnectionBlockedAsync(string reason)
6565

6666
internal Task HandleConnectionUnblockedAsync()
6767
{
68-
if (!_connectionUnblockedWrapper.IsEmpty)
68+
if (!_connectionUnblockedAsyncWrapper.IsEmpty)
6969
{
70-
return _connectionUnblockedWrapper.InvokeAsync(this, EventArgs.Empty);
70+
return _connectionUnblockedAsyncWrapper.InvokeAsync(this, EventArgs.Empty);
7171
}
7272
return Task.CompletedTask;
7373
}

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,18 @@ internal Connection(ConnectionConfig config, IFrameHandler frameHandler)
6565
_frameHandler = frameHandler;
6666

6767
Func<Exception, string, Task> onException = (exception, context) => OnCallbackExceptionAsync(CallbackExceptionEventArgs.Build(exception, context));
68-
_callbackExceptionAsyncWrapper = new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);
69-
_connectionBlockedAsyncWrapper = new AsyncEventingWrapper<ConnectionBlockedEventArgs>("OnConnectionBlocked", onException);
70-
_connectionUnblockedWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionUnblocked", onException);
71-
_connectionShutdownAsyncWrapper = new AsyncEventingWrapper<ShutdownEventArgs>("OnShutdown", onException);
68+
69+
_callbackExceptionAsyncWrapper =
70+
new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);
71+
72+
_connectionBlockedAsyncWrapper =
73+
new AsyncEventingWrapper<ConnectionBlockedEventArgs>("OnConnectionBlocked", onException);
74+
75+
_connectionUnblockedAsyncWrapper =
76+
new AsyncEventingWrapper<EventArgs>("OnConnectionUnblocked", onException);
77+
78+
_connectionShutdownAsyncWrapper =
79+
new AsyncEventingWrapper<ShutdownEventArgs>("OnShutdown", onException);
7280

7381
_sessionManager = new SessionManager(this, 0, config.MaxInboundMessageBodySize);
7482
_session0 = new MainSession(this, config.MaxInboundMessageBodySize);
@@ -132,12 +140,12 @@ public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlockedAsyn
132140
}
133141
private AsyncEventingWrapper<ConnectionBlockedEventArgs> _connectionBlockedAsyncWrapper;
134142

135-
public event AsyncEventHandler<EventArgs> ConnectionUnblocked
143+
public event AsyncEventHandler<EventArgs> ConnectionUnblockedAsync
136144
{
137-
add => _connectionUnblockedWrapper.AddHandler(value);
138-
remove => _connectionUnblockedWrapper.RemoveHandler(value);
145+
add => _connectionUnblockedAsyncWrapper.AddHandler(value);
146+
remove => _connectionUnblockedAsyncWrapper.RemoveHandler(value);
139147
}
140-
private AsyncEventingWrapper<EventArgs> _connectionUnblockedWrapper;
148+
private AsyncEventingWrapper<EventArgs> _connectionUnblockedAsyncWrapper;
141149

142150
public event AsyncEventHandler<RecoveringConsumerEventArgs> RecoveringConsumerAsync
143151
{
@@ -209,7 +217,7 @@ internal void TakeOver(Connection other)
209217
{
210218
_callbackExceptionAsyncWrapper.Takeover(other._callbackExceptionAsyncWrapper);
211219
_connectionBlockedAsyncWrapper.Takeover(other._connectionBlockedAsyncWrapper);
212-
_connectionUnblockedWrapper.Takeover(other._connectionUnblockedWrapper);
220+
_connectionUnblockedAsyncWrapper.Takeover(other._connectionUnblockedAsyncWrapper);
213221
_connectionShutdownAsyncWrapper.Takeover(other._connectionShutdownAsyncWrapper);
214222
// TODO Why are other wrappers not taken over?
215223
}

‎projects/Test/SequentialIntegration/TestConnectionBlocked.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public async Task TestConnectionBlockedNotification()
6666
await UnblockAsync();
6767
};
6868

69-
_conn.ConnectionUnblocked += (object sender, EventArgs ea) =>
69+
_conn.ConnectionUnblockedAsync += (object sender, EventArgs ea) =>
7070
{
7171
tcs.SetResult(true);
7272
return Task.CompletedTask;

‎projects/Test/SequentialIntegration/TestConnectionBlockedChannelLeak.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public async Task TestConnectionBlockedChannelLeak_GH1573()
8888
return Task.CompletedTask;
8989
};
9090

91-
_conn.ConnectionUnblocked += (object sender, EventArgs ea) =>
91+
_conn.ConnectionUnblockedAsync += (object sender, EventArgs ea) =>
9292
{
9393
connectionUnblockedTcs.SetResult(true);
9494
return Task.CompletedTask;

‎projects/Test/SequentialIntegration/TestConnectionRecovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ public async Task TestShutdownEventHandlersRecoveryOnConnectionAfterTwoDelayedSe
336336
public async Task TestUnblockedListenersRecovery()
337337
{
338338
var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
339-
_conn.ConnectionUnblocked += (source, ea) =>
339+
_conn.ConnectionUnblockedAsync += (source, ea) =>
340340
{
341341
tcs.SetResult(true);
342342
return Task.CompletedTask;

0 commit comments

Comments
 (0)