Skip to content

Commit 8c7f8f9

Browse files
committed
Rename CallbackException event to CallbackExceptionAsync
1 parent 7337fad commit 8c7f8f9

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

projects/RabbitMQ.Client/PublicAPI.Shipped.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,6 @@ RabbitMQ.Client.IChannel.IsClosed.get -> bool
445445
RabbitMQ.Client.IChannel.IsOpen.get -> bool
446446
RabbitMQ.Client.IChannelExtensions
447447
RabbitMQ.Client.IConnection
448-
RabbitMQ.Client.IConnection.CallbackException -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.CallbackExceptionEventArgs>
449448
RabbitMQ.Client.IConnection.ChannelMax.get -> ushort
450449
RabbitMQ.Client.IConnection.ClientProperties.get -> System.Collections.Generic.IDictionary<string, object>
451450
RabbitMQ.Client.IConnection.ClientProvidedName.get -> string
@@ -895,3 +894,4 @@ RabbitMQ.Client.IChannel.ConfirmSelectAsync(bool trackConfirmations = true, Syst
895894
const RabbitMQ.Client.Constants.DefaultConsumerDispatchConcurrency = 1 -> ushort
896895
readonly RabbitMQ.Client.ConnectionConfig.ConsumerDispatchConcurrency -> ushort
897896
RabbitMQ.Client.IConnection.CreateChannelAsync(ushort? consumerDispatchConcurrency = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IChannel!>!
897+
RabbitMQ.Client.IConnection.CallbackExceptionAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.CallbackExceptionEventArgs!>!

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public interface IConnection : INetworkConnection, IDisposable
143143
/// <see cref="IConnection"/>, then this event will be signalled whenever one
144144
/// of those event handlers throws an exception, as well.
145145
/// </remarks>
146-
event AsyncEventHandler<CallbackExceptionEventArgs> CallbackException;
146+
event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync;
147147

148148
event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked;
149149

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecov
102102
}
103103
private AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs> _connectionRecoveryErrorWrapper;
104104

105-
public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackException
105+
public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync
106106
{
107-
add => InnerConnection.CallbackException += value;
108-
remove => InnerConnection.CallbackException -= value;
107+
add => InnerConnection.CallbackExceptionAsync += value;
108+
remove => InnerConnection.CallbackExceptionAsync -= value;
109109
}
110110

111111
public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked

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

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

6767
Func<Exception, string, Task> onException = (exception, context) => OnCallbackExceptionAsync(CallbackExceptionEventArgs.Build(exception, context));
68-
_callbackExceptionWrapper = new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);
68+
_callbackExceptionAsyncWrapper = new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);
6969
_connectionBlockedWrapper = new AsyncEventingWrapper<ConnectionBlockedEventArgs>("OnConnectionBlocked", onException);
7070
_connectionUnblockedWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionUnblocked", onException);
7171
_connectionShutdownWrapper = new AsyncEventingWrapper<ShutdownEventArgs>("OnShutdown", onException);
@@ -118,12 +118,12 @@ internal IFrameHandler FrameHandler
118118
get { return _frameHandler; }
119119
}
120120

121-
public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackException
121+
public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync
122122
{
123-
add => _callbackExceptionWrapper.AddHandler(value);
124-
remove => _callbackExceptionWrapper.RemoveHandler(value);
123+
add => _callbackExceptionAsyncWrapper.AddHandler(value);
124+
remove => _callbackExceptionAsyncWrapper.RemoveHandler(value);
125125
}
126-
private AsyncEventingWrapper<CallbackExceptionEventArgs> _callbackExceptionWrapper;
126+
private AsyncEventingWrapper<CallbackExceptionEventArgs> _callbackExceptionAsyncWrapper;
127127

128128
public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked
129129
{
@@ -207,7 +207,7 @@ public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueName
207207

208208
internal void TakeOver(Connection other)
209209
{
210-
_callbackExceptionWrapper.Takeover(other._callbackExceptionWrapper);
210+
_callbackExceptionAsyncWrapper.Takeover(other._callbackExceptionAsyncWrapper);
211211
_connectionBlockedWrapper.Takeover(other._connectionBlockedWrapper);
212212
_connectionUnblockedWrapper.Takeover(other._connectionUnblockedWrapper);
213213
_connectionShutdownWrapper.Takeover(other._connectionShutdownWrapper);
@@ -464,7 +464,7 @@ private void LogCloseError(string error, Exception ex)
464464

465465
internal Task OnCallbackExceptionAsync(CallbackExceptionEventArgs args)
466466
{
467-
return _callbackExceptionWrapper.InvokeAsync(this, args);
467+
return _callbackExceptionAsyncWrapper.InvokeAsync(this, args);
468468
}
469469

470470
internal ValueTask WriteAsync(RentedMemory frames, CancellationToken cancellationToken)

projects/Test/Common/IntegrationFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ protected void AddCallbackExceptionHandlers(IConnection conn, IChannel channel)
240240
return Task.CompletedTask;
241241
};
242242

243-
conn.CallbackException += (o, ea) =>
243+
conn.CallbackExceptionAsync += (o, ea) =>
244244
{
245245
_connectionCallbackException = ea.Exception;
246246

projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public async Task TestTopologyRecoveryConsumerFilter()
300300
connectionRecoveryTcs.SetException(ea.Exception);
301301
return Task.CompletedTask;
302302
};
303-
conn.CallbackException += (source, ea) =>
303+
conn.CallbackExceptionAsync += (source, ea) =>
304304
{
305305
connectionRecoveryTcs.SetException(ea.Exception);
306306
return Task.CompletedTask;

projects/Test/Integration/TestConnectionTopologyRecovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public async Task TestTopologyRecoveryDefaultFilterRecoversAllEntities()
259259
connectionRecoveryTcs.SetException(ea.Exception);
260260
return Task.CompletedTask;
261261
};
262-
conn.CallbackException += (source, ea) =>
262+
conn.CallbackExceptionAsync += (source, ea) =>
263263
{
264264
connectionRecoveryTcs.SetException(ea.Exception);
265265
return Task.CompletedTask;

projects/Test/Integration/TestToxiproxy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public async Task TestCloseConnection()
8585
{
8686
using (IConnection conn = await cf.CreateConnectionAsync())
8787
{
88-
conn.CallbackException += (s, ea) =>
88+
conn.CallbackExceptionAsync += (s, ea) =>
8989
{
9090
_output.WriteLine($"[ERROR] unexpected callback exception {ea.Detail} {ea.Exception}");
9191
recoverySucceededTcs.SetResult(false);

0 commit comments

Comments
 (0)