Skip to content

Commit 9cd8259

Browse files
lukebakkenlukebakken
committed
* Finish converting the use of string to QueueName and RoutingKey 
1 parent a84c655 commit 9cd8259

21 files changed

+86
-72
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,8 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
988988
~static readonly RabbitMQ.Client.ConsumerTag.Empty -> RabbitMQ.Client.ConsumerTag
989989
~static readonly RabbitMQ.Client.ExchangeName.AmqDirect -> RabbitMQ.Client.ExchangeName
990990
~static readonly RabbitMQ.Client.ExchangeName.AmqFanout -> RabbitMQ.Client.ExchangeName
991+
~static readonly RabbitMQ.Client.ExchangeName.AmqHeaders -> RabbitMQ.Client.ExchangeName
992+
~static readonly RabbitMQ.Client.ExchangeName.AmqTopic -> RabbitMQ.Client.ExchangeName
991993
~static readonly RabbitMQ.Client.ExchangeName.Empty -> RabbitMQ.Client.ExchangeName
992994
~static readonly RabbitMQ.Client.ExchangeType.Direct -> RabbitMQ.Client.ExchangeType
993995
~static readonly RabbitMQ.Client.ExchangeType.Fanout -> RabbitMQ.Client.ExchangeType

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ public class ExchangeName : AmqpString
233233
public static readonly ExchangeName Empty = new ExchangeName();
234234
public static readonly ExchangeName AmqDirect = new ExchangeName("amq.direct");
235235
public static readonly ExchangeName AmqFanout = new ExchangeName("amq.fanout");
236+
public static readonly ExchangeName AmqTopic = new ExchangeName("amq.topic");
237+
public static readonly ExchangeName AmqHeaders = new ExchangeName("amq.headers");
236238

237239
private ExchangeName() : base()
238240
{

‎projects/Test/Integration/TestAsyncConsumer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public async Task TestBasicRoundtripConcurrent()
118118
return Task.CompletedTask;
119119
};
120120

121-
await _channel.BasicConsumeAsync(q.QueueName, true, ConsumerTag.Empty, false, false, null, consumer);
121+
await _channel.BasicConsumeAsync(qname, true, ConsumerTag.Empty, false, false, null, consumer);
122122

123123
// ensure we get a delivery
124124
await AssertRanToCompletion(publish1SyncSource.Task, publish2SyncSource.Task);

‎projects/Test/Integration/TestConsumerCancelNotify.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public Task TestConsumerCancelEvent()
6262
[Fact]
6363
public async Task TestCorrectConsumerTag()
6464
{
65-
string q1 = GenerateQueueName();
66-
string q2 = GenerateQueueName();
65+
QueueName q1 = GenerateQueueName();
66+
QueueName q2 = GenerateQueueName();
6767

6868
await _channel.QueueDeclareAsync(q1, false, false, false);
6969
await _channel.QueueDeclareAsync(q2, false, false, false);

‎projects/Test/Integration/TestConsumerOperationDispatch.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ public async Task TestDeliveryOrderingWithSingleChannel()
114114
for (int i = 0; i < Y; i++)
115115
{
116116
IChannel ch = await _conn.CreateChannelAsync();
117-
QueueDeclareOk q = await ch.QueueDeclareAsync("", durable: false, exclusive: true, autoDelete: true, arguments: null);
117+
QueueDeclareOk q = await ch.QueueDeclareAsync(QueueName.Empty, durable: false, exclusive: true, autoDelete: true, arguments: null);
118118
var qname = new QueueName(q.QueueName);
119-
await ch.QueueBindAsync(queue: qname, exchange: _x, routingKey: "");
119+
await ch.QueueBindAsync(queue: qname, exchange: _x, routingKey: RoutingKey.Empty);
120120
_channels.Add(ch);
121121
_queues.Add(q);
122122
var cons = new CollectingConsumer(ch);
@@ -126,7 +126,7 @@ public async Task TestDeliveryOrderingWithSingleChannel()
126126

127127
for (int i = 0; i < N; i++)
128128
{
129-
await _channel.BasicPublishAsync(_x, "", _encoding.GetBytes("msg"));
129+
await _channel.BasicPublishAsync(_x, RoutingKey.Empty, _encoding.GetBytes("msg"));
130130
}
131131

132132
if (IntegrationFixture.IsRunningInCI)
@@ -163,9 +163,9 @@ public async Task TestChannelShutdownDoesNotShutDownDispatcher()
163163
IChannel ch1 = await _conn.CreateChannelAsync();
164164
IChannel ch2 = await _conn.CreateChannelAsync();
165165

166-
string q1 = (await ch1.QueueDeclareAsync()).QueueName;
167-
string q2 = (await ch2.QueueDeclareAsync()).QueueName;
168-
await ch2.QueueBindAsync(queue: q2, exchange: _x, routingKey: "");
166+
QueueDeclareOk q1 = await ch1.QueueDeclareAsync();
167+
QueueDeclareOk q2 = await ch2.QueueDeclareAsync();
168+
await ch2.QueueBindAsync(queue: q2, exchange: _x, routingKey: RoutingKey.Empty);
169169

170170
var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
171171
await ch1.BasicConsumeAsync(q1, true, new EventingBasicConsumer(ch1));
@@ -178,7 +178,7 @@ public async Task TestChannelShutdownDoesNotShutDownDispatcher()
178178
// closing this channel must not affect ch2
179179
await ch1.CloseAsync();
180180

181-
await ch2.BasicPublishAsync(_x, "", _encoding.GetBytes("msg"));
181+
await ch2.BasicPublishAsync(_x, RoutingKey.Empty, _encoding.GetBytes("msg"));
182182
await WaitAsync(tcs, "received event");
183183
}
184184

@@ -210,7 +210,7 @@ public override void HandleChannelShutdown(object channel, ShutdownEventArgs rea
210210
[Fact]
211211
public async Task TestChannelShutdownHandler()
212212
{
213-
string q = await _channel.QueueDeclareAsync();
213+
QueueDeclareOk q = await _channel.QueueDeclareAsync();
214214
var c = new ShutdownLatchConsumer();
215215

216216
await _channel.BasicConsumeAsync(queue: q, autoAck: true, consumer: c);

‎projects/Test/Integration/TestEventingConsumer.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public TestEventingConsumer(ITestOutputHelper output) : base(output)
4646
[Fact]
4747
public async Task TestEventingConsumerRegistrationEvents()
4848
{
49-
string q = await _channel.QueueDeclareAsync();
49+
QueueDeclareOk q = await _channel.QueueDeclareAsync();
5050

5151
var registeredTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
5252
object registeredSender = null;
@@ -86,7 +86,8 @@ public async Task TestEventingConsumerRegistrationEvents()
8686
public async Task TestEventingConsumerDeliveryEvents()
8787
{
8888
var tcs0 = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
89-
string q = await _channel.QueueDeclareAsync();
89+
QueueDeclareOk q = await _channel.QueueDeclareAsync();
90+
QueueName qname = (QueueName)q;
9091

9192
bool receivedInvoked = false;
9293
object receivedSender = null;
@@ -100,7 +101,7 @@ public async Task TestEventingConsumerDeliveryEvents()
100101
};
101102

102103
await _channel.BasicConsumeAsync(q, true, ec);
103-
await _channel.BasicPublishAsync(ExchangeName.Empty, q, _encoding.GetBytes("msg"));
104+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, _encoding.GetBytes("msg"));
104105

105106
await WaitAsync(tcs0, "received event");
106107
var tcs1 = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);

‎projects/Test/Integration/TestExceptionMessages.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
using System;
3333
using System.Threading.Tasks;
34+
using RabbitMQ.Client;
3435
using RabbitMQ.Client.Exceptions;
3536
using Xunit;
3637
using Xunit.Abstractions;
@@ -46,7 +47,7 @@ public TestExceptionMessages(ITestOutputHelper output) : base(output)
4647
[Fact]
4748
public async Task TestAlreadyClosedExceptionMessage()
4849
{
49-
string uuid = Guid.NewGuid().ToString();
50+
QueueName uuid = new QueueName(Guid.NewGuid().ToString());
5051
try
5152
{
5253
await _channel.QueueDeclarePassiveAsync(uuid);

‎projects/Test/Integration/TestExchangeDeclare.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ async Task f()
6666
await Task.Delay(S_Random.Next(5, 50));
6767
ExchangeName exchangeName = GenerateExchangeName();
6868
await _channel.ExchangeDeclareAsync(exchange: exchangeName, type: ExchangeType.Fanout, false, false);
69-
await _channel.ExchangeBindAsync(destination: ex_destination, source: exchangeName, routingKey: "unused");
69+
await _channel.ExchangeBindAsync(destination: ex_destination, source: exchangeName,
70+
routingKey: new RoutingKey("unused"));
7071
exchangeNames.Add(exchangeName);
7172
}
7273
catch (NotSupportedException e)
@@ -89,7 +90,7 @@ async Task f()
8990
try
9091
{
9192
await Task.Delay(S_Random.Next(5, 50));
92-
await _channel.ExchangeUnbindAsync(destination: ex_destination, source: exchangeName, routingKey: "unused",
93+
await _channel.ExchangeUnbindAsync(destination: ex_destination, source: exchangeName, routingKey: (RoutingKey)"unused",
9394
noWait: false, arguments: null);
9495
await _channel.ExchangeDeleteAsync(exchange: exchangeName, ifUnused: false);
9596
}

‎projects/Test/Integration/TestExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public async Task TestConfirmBarrier()
4949
await _channel.ConfirmSelectAsync();
5050
for (int i = 0; i < 10; i++)
5151
{
52-
await _channel.BasicPublishAsync(ExchangeName.Empty, string.Empty);
52+
await _channel.BasicPublishAsync(ExchangeName.Empty, RoutingKey.Empty);
5353
}
5454
Assert.True(await _channel.WaitForConfirmsAsync());
5555
}
@@ -67,7 +67,7 @@ public async Task TestExchangeBinding()
6767

6868
await _channel.ExchangeDeclareAsync((ExchangeName)"src", ExchangeType.Direct, false, false);
6969
await _channel.ExchangeDeclareAsync((ExchangeName)"dest", ExchangeType.Direct, false, false);
70-
QueueName queue = await _channel.QueueDeclareAsync(string.Empty, false, false, true);
70+
QueueName queue = await _channel.QueueDeclareAsync(QueueName.Empty, false, false, true);
7171

7272
await _channel.ExchangeBindAsync((ExchangeName)"dest", (ExchangeName)"src", RoutingKey.Empty);
7373
await _channel.QueueBindAsync(queue, (ExchangeName)"dest", RoutingKey.Empty);

‎projects/Test/Integration/TestFloodPublishing.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ public async Task TestMultithreadFloodPublishing()
156156
});
157157
};
158158

159-
QueueDeclareOk q = await _channel.QueueDeclareAsync(queue: string.Empty,
159+
QueueDeclareOk q = await _channel.QueueDeclareAsync(queue: QueueName.Empty,
160160
passive: false, durable: false, exclusive: true, autoDelete: false, arguments: null);
161-
string queueName = q.QueueName;
161+
QueueName qname = (QueueName)q;
162162

163163
Task pub = Task.Run(async () =>
164164
{
@@ -181,7 +181,7 @@ public async Task TestMultithreadFloodPublishing()
181181

182182
for (int i = 0; i < publishCount && false == stop; i++)
183183
{
184-
await pubCh.BasicPublishAsync(ExchangeName.Empty, queueName, sendBody, true);
184+
await pubCh.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, sendBody, true);
185185
}
186186

187187
await pubCh.WaitForConfirmsOrDieAsync();
@@ -222,8 +222,8 @@ public async Task TestMultithreadFloodPublishing()
222222
await Task.Yield();
223223
};
224224

225-
await consumeCh.BasicConsumeAsync(queue: queueName, autoAck: true,
226-
consumerTag: string.Empty, noLocal: false, exclusive: false,
225+
await consumeCh.BasicConsumeAsync(queue: qname, autoAck: true,
226+
consumerTag: ConsumerTag.Empty, noLocal: false, exclusive: false,
227227
arguments: null, consumer: consumer);
228228

229229
Assert.True(await tcs.Task);

0 commit comments

Comments
 (0)