Skip to content

Commit 4be0367

Browse files
lukebakkendanielmarbach
lukebakken
authored and
danielmarbach
committed
Ensure that PublicAPI.Shipped.txt contains new signatures and method names.
Ensure code compiles.
1 parent 9b8c8e8 commit 4be0367

File tree

12 files changed

+106
-73
lines changed

12 files changed

+106
-73
lines changed

‎projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ public AsyncBasicConsumerFake(ManualResetEventSlim autoResetEvent)
1717
_autoResetEvent = autoResetEvent;
1818
}
1919

20-
public Task HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,
21-
IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
20+
public Task HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered,
21+
string exchange, string routingKey, IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body,
22+
CancellationToken cancellationToken = default)
2223
{
2324
if (Interlocked.Increment(ref _current) == Count)
2425
{
@@ -28,14 +29,16 @@ public Task HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool
2829
return Task.CompletedTask;
2930
}
3031

31-
public Task HandleBasicCancelAsync(string consumerTag) => Task.CompletedTask;
32+
public Task HandleBasicCancelAsync(string consumerTag, CancellationToken cancellationToken = default) => Task.CompletedTask;
3233

33-
public Task HandleBasicCancelOkAsync(string consumerTag) => Task.CompletedTask;
34+
public Task HandleBasicCancelOkAsync(string consumerTag, CancellationToken cancellationToken = default) => Task.CompletedTask;
3435

35-
public Task HandleBasicConsumeOkAsync(string consumerTag) => Task.CompletedTask;
36+
public Task HandleBasicConsumeOkAsync(string consumerTag, CancellationToken cancellationToken = default) => Task.CompletedTask;
3637

3738
public Task HandleChannelShutdownAsync(object channel, ShutdownEventArgs reason) => Task.CompletedTask;
3839

40+
public Task OnCancelAsync(string[] consumerTags, CancellationToken cancellationToken = default) => Task.CompletedTask;
41+
3942
public IChannel Channel { get; }
4043
}
4144
}

‎projects/Benchmarks/Networking/Networking_BasicDeliver_Commons.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ public CountingConsumer(IChannel channel, uint messageCount) : base(channel)
4242
}
4343

4444
/// <inheritdoc />
45-
public override Task HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
45+
public override Task HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered,
46+
string exchange, string routingKey, IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body,
47+
CancellationToken cancellationToken = default)
4648
{
4749
if (Interlocked.Decrement(ref _remainingCount) == 0)
4850
{

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

Lines changed: 38 additions & 33 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public string[] ConsumerTags
5757
/// <param name="cancellationToken">The cancellation token.</param>
5858
public virtual Task HandleBasicCancelAsync(string consumerTag, CancellationToken cancellationToken = default)
5959
{
60-
return OnCancelAsync(new []{ consumerTag }, cancellationToken);
60+
return OnCancelAsync(new[] { consumerTag }, cancellationToken);
6161
}
6262

6363
/// <summary>
@@ -67,7 +67,7 @@ public virtual Task HandleBasicCancelAsync(string consumerTag, CancellationToken
6767
/// <param name="cancellationToken">The cancellation token.</param>
6868
public virtual Task HandleBasicCancelOkAsync(string consumerTag, CancellationToken cancellationToken = default)
6969
{
70-
return OnCancelAsync(new []{ consumerTag }, cancellationToken);
70+
return OnCancelAsync(new[] { consumerTag }, cancellationToken);
7171
}
7272

7373
/// <summary>
@@ -98,7 +98,7 @@ public virtual Task HandleBasicDeliverAsync(string consumerTag,
9898
string exchange,
9999
string routingKey,
100100
IReadOnlyBasicProperties properties,
101-
ReadOnlyMemory<byte> body,
101+
ReadOnlyMemory<byte> body,
102102
CancellationToken cancellationToken = default)
103103
{
104104
// Nothing to do here.
@@ -118,14 +118,15 @@ public virtual Task HandleChannelShutdownAsync(object channel, ShutdownEventArgs
118118

119119
/// <summary>
120120
/// Default implementation - overridable in subclasses.</summary>
121-
/// <param name="consumerTags">The set of consumer tags that where cancelled</param>
121+
/// <param name="consumerTags">The set of consumer tags that were cancelled</param>
122122
/// <param name="cancellationToken">The cancellation token.</param>
123123
/// <remarks>
124124
/// This default implementation simply sets the <see cref="IsRunning"/> property to false, and takes no further action.
125125
/// </remarks>
126126
protected virtual Task OnCancelAsync(string[] consumerTags, CancellationToken cancellationToken = default)
127127
{
128128
IsRunning = false;
129+
129130
foreach (string consumerTag in consumerTags)
130131
{
131132
_consumerTags.Remove(consumerTag);

‎projects/Test/Common/TestConnectionRecoveryBase.cs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ public AckingBasicConsumer(IChannel channel, ushort totalMessageCount, TaskCompl
278278
{
279279
}
280280

281-
public override Task PostHandleDeliveryAsync(ulong deliveryTag)
281+
public override Task PostHandleDeliveryAsync(ulong deliveryTag,
282+
CancellationToken cancellationToken = default)
282283
{
283-
return Channel.BasicAckAsync(deliveryTag, false).AsTask();
284+
return Channel.BasicAckAsync(deliveryTag, false, cancellationToken).AsTask();
284285
}
285286
}
286287

@@ -291,9 +292,10 @@ public NackingBasicConsumer(IChannel channel, ushort totalMessageCount, TaskComp
291292
{
292293
}
293294

294-
public override Task PostHandleDeliveryAsync(ulong deliveryTag)
295+
public override Task PostHandleDeliveryAsync(ulong deliveryTag,
296+
CancellationToken cancellationToken = default)
295297
{
296-
return Channel.BasicNackAsync(deliveryTag, false, false).AsTask();
298+
return Channel.BasicNackAsync(deliveryTag, false, false, cancellationToken).AsTask();
297299
}
298300
}
299301

@@ -304,9 +306,10 @@ public RejectingBasicConsumer(IChannel channel, ushort totalMessageCount, TaskCo
304306
{
305307
}
306308

307-
public override Task PostHandleDeliveryAsync(ulong deliveryTag)
309+
public override Task PostHandleDeliveryAsync(ulong deliveryTag,
310+
CancellationToken cancellationToken = default)
308311
{
309-
return Channel.BasicRejectAsync(deliveryTag, false).AsTask();
312+
return Channel.BasicRejectAsync(deliveryTag, false, cancellationToken).AsTask();
310313
}
311314
}
312315

@@ -329,11 +332,12 @@ public override Task HandleBasicDeliverAsync(string consumerTag,
329332
string exchange,
330333
string routingKey,
331334
IReadOnlyBasicProperties properties,
332-
ReadOnlyMemory<byte> body)
335+
ReadOnlyMemory<byte> body,
336+
CancellationToken cancellationToken = default)
333337
{
334338
try
335339
{
336-
return PostHandleDeliveryAsync(deliveryTag);
340+
return PostHandleDeliveryAsync(deliveryTag, cancellationToken);
337341
}
338342
finally
339343
{
@@ -345,7 +349,8 @@ public override Task HandleBasicDeliverAsync(string consumerTag,
345349
}
346350
}
347351

348-
public virtual Task PostHandleDeliveryAsync(ulong deliveryTag)
352+
public virtual Task PostHandleDeliveryAsync(ulong deliveryTag,
353+
CancellationToken cancellationToken = default)
349354
{
350355
return Task.CompletedTask;
351356
}

‎projects/Test/Integration/TestAsyncConsumer.cs‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -780,29 +780,35 @@ public DefaultAsyncConsumer(IChannel channel, string logPrefix, ITestOutputHelpe
780780
_output = output;
781781
}
782782

783-
public override Task HandleBasicCancelAsync(string consumerTag)
783+
public override Task HandleBasicCancelAsync(string consumerTag,
784+
CancellationToken cancellationToken = default)
784785
{
785786
_output.WriteLine("[ERROR] {0} HandleBasicCancelAsync {1}", _logPrefix, consumerTag);
786-
return base.HandleBasicCancelAsync(consumerTag);
787+
return base.HandleBasicCancelAsync(consumerTag, cancellationToken);
787788
}
788789

789-
public override Task HandleBasicCancelOkAsync(string consumerTag)
790+
public override Task HandleBasicCancelOkAsync(string consumerTag,
791+
CancellationToken cancellationToken = default)
790792
{
791793
_output.WriteLine("[ERROR] {0} HandleBasicCancelOkAsync {1}", _logPrefix, consumerTag);
792-
return base.HandleBasicCancelOkAsync(consumerTag);
794+
return base.HandleBasicCancelOkAsync(consumerTag, cancellationToken);
793795
}
794796

795-
public override Task HandleBasicConsumeOkAsync(string consumerTag)
797+
public override Task HandleBasicConsumeOkAsync(string consumerTag,
798+
CancellationToken cancellationToken = default)
796799
{
797800
_output.WriteLine("[ERROR] {0} HandleBasicConsumeOkAsync {1}", _logPrefix, consumerTag);
798-
return base.HandleBasicConsumeOkAsync(consumerTag);
801+
return base.HandleBasicConsumeOkAsync(consumerTag, cancellationToken);
799802
}
800803

801804
public override async Task HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered,
802-
string exchange, string routingKey, IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
805+
string exchange, string routingKey, IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body,
806+
CancellationToken cancellationToken = default)
803807
{
804808
_output.WriteLine("[ERROR] {0} HandleBasicDeliverAsync {1}", _logPrefix, consumerTag);
805-
await base.HandleBasicDeliverAsync(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);
809+
await base.HandleBasicDeliverAsync(consumerTag, deliveryTag, redelivered,
810+
exchange, routingKey, properties, body,
811+
cancellationToken);
806812
}
807813

808814
public override Task HandleChannelShutdownAsync(object channel, ShutdownEventArgs reason)
@@ -811,10 +817,11 @@ public override Task HandleChannelShutdownAsync(object channel, ShutdownEventArg
811817
return base.HandleChannelShutdownAsync(channel, reason);
812818
}
813819

814-
public override Task OnCancelAsync(params string[] consumerTags)
820+
protected override Task OnCancelAsync(string[] consumerTags,
821+
CancellationToken cancellationToken = default)
815822
{
816823
_output.WriteLine("[ERROR] {0} OnCancel {1}", _logPrefix, consumerTags[0]);
817-
return base.OnCancelAsync(consumerTags);
824+
return base.OnCancelAsync(consumerTags, cancellationToken);
818825
}
819826
}
820827
}

‎projects/Test/Integration/TestAsyncConsumerCancelNotify.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System.Linq;
33+
using System.Threading;
3334
using System.Threading.Tasks;
3435
using RabbitMQ.Client;
3536
using RabbitMQ.Client.Events;
@@ -114,15 +115,16 @@ public CancelNotificationConsumer(IChannel channel, TestAsyncConsumerCancelNotif
114115
}
115116
}
116117

117-
public override Task HandleBasicCancelAsync(string consumerTag)
118+
public override Task HandleBasicCancelAsync(string consumerTag,
119+
CancellationToken cancellationToken = default)
118120
{
119121
if (!_eventMode)
120122
{
121123
_testClass._consumerTag = consumerTag;
122124
_testClass._tcs.SetResult(true);
123125
}
124126

125-
return base.HandleBasicCancelAsync(consumerTag);
127+
return base.HandleBasicCancelAsync(consumerTag, cancellationToken);
126128
}
127129

128130
private Task CancelledAsync(object sender, ConsumerEventArgs arg)

‎projects/Test/Integration/TestAsyncConsumerExceptions.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ public override Task HandleBasicDeliverAsync(string consumerTag,
136136
string exchange,
137137
string routingKey,
138138
IReadOnlyBasicProperties properties,
139-
ReadOnlyMemory<byte> body)
139+
ReadOnlyMemory<byte> body,
140+
CancellationToken cancellationToken = default)
140141
{
141142
return Task.FromException(TestException);
142143
}
@@ -148,7 +149,8 @@ public ConsumerFailingOnCancel(IChannel channel) : base(channel)
148149
{
149150
}
150151

151-
public override Task HandleBasicCancelAsync(string consumerTag)
152+
public override Task HandleBasicCancelAsync(string consumerTag,
153+
CancellationToken cancellationToken = default)
152154
{
153155
return Task.FromException(TestException);
154156
}
@@ -172,7 +174,8 @@ public ConsumerFailingOnConsumeOk(IChannel channel) : base(channel)
172174
{
173175
}
174176

175-
public override Task HandleBasicConsumeOkAsync(string consumerTag)
177+
public override Task HandleBasicConsumeOkAsync(string consumerTag,
178+
CancellationToken cancellationToken = default)
176179
{
177180
return Task.FromException(TestException);
178181
}
@@ -184,7 +187,8 @@ public ConsumerFailingOnCancelOk(IChannel channel) : base(channel)
184187
{
185188
}
186189

187-
public override Task HandleBasicCancelOkAsync(string consumerTag)
190+
public override Task HandleBasicCancelOkAsync(string consumerTag,
191+
CancellationToken cancellationToken = default)
188192
{
189193
return Task.FromException(TestException);
190194
}

‎projects/Test/Integration/TestAsyncConsumerOperationDispatch.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ public CollectingConsumer(IChannel channel)
8686

8787
public override Task HandleBasicDeliverAsync(string consumerTag,
8888
ulong deliveryTag, bool redelivered, string exchange, string routingKey,
89-
IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
89+
IReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body,
90+
CancellationToken cancellationToken = default)
9091
{
9192
// we test concurrent dispatch from the moment basic.delivery is returned.
9293
// delivery tags have guaranteed ordering and we verify that it is preserved
@@ -98,7 +99,8 @@ public override Task HandleBasicDeliverAsync(string consumerTag,
9899
s_counter.Signal();
99100
}
100101

101-
return Channel.BasicAckAsync(deliveryTag: deliveryTag, multiple: false).AsTask();
102+
return Channel.BasicAckAsync(deliveryTag: deliveryTag, multiple: false,
103+
cancellationToken: cancellationToken).AsTask();
102104
}
103105
}
104106

‎projects/Test/Integration/TestMainLoop.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
//---------------------------------------------------------------------------
3131

3232
using System;
33+
using System.Threading;
3334
using System.Threading.Tasks;
3435
using RabbitMQ.Client;
3536
using RabbitMQ.Client.Events;
@@ -62,7 +63,8 @@ public override Task HandleBasicDeliverAsync(string consumerTag,
6263
string exchange,
6364
string routingKey,
6465
IReadOnlyBasicProperties properties,
65-
ReadOnlyMemory<byte> body)
66+
ReadOnlyMemory<byte> body,
67+
CancellationToken cancellationToken = default)
6668
{
6769
throw new Exception("I am a bad consumer");
6870
}

0 commit comments

Comments
 (0)