Skip to content

Commit 706269d

Browse files
lukebakkenlukebakken
authored
Merge pull request #60 from rabbitmq/rename_build_async
Rename BuildAsync to BuildAndStartAsync
2 parents 6656e10 + 74d46f0 commit 706269d

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

‎RabbitMQ.AMQP.Client/IConsumerBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public interface IConsumerBuilder
2626

2727
IStreamOptions Stream();
2828

29-
Task<IConsumer> BuildAsync(CancellationToken cancellationToken = default);
29+
Task<IConsumer> BuildAndStartAsync(CancellationToken cancellationToken = default);
3030

3131
public interface IStreamOptions
3232
{

‎RabbitMQ.AMQP.Client/Impl/AmqpConsumerBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public IConsumerBuilder.IStreamOptions Stream()
5050
return new DefaultStreamOptions(this, _filters);
5151
}
5252

53-
public async Task<IConsumer> BuildAsync(CancellationToken cancellationToken = default)
53+
public async Task<IConsumer> BuildAndStartAsync(CancellationToken cancellationToken = default)
5454
{
5555
if (_handler is null)
5656
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ RabbitMQ.AMQP.Client.IConsumer.Pause() -> void
109109
RabbitMQ.AMQP.Client.IConsumer.Unpause() -> void
110110
RabbitMQ.AMQP.Client.IConsumer.UnsettledMessageCount.get -> long
111111
RabbitMQ.AMQP.Client.IConsumerBuilder
112-
RabbitMQ.AMQP.Client.IConsumerBuilder.BuildAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.AMQP.Client.IConsumer!>!
112+
RabbitMQ.AMQP.Client.IConsumerBuilder.BuildAndStartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.AMQP.Client.IConsumer!>!
113113
RabbitMQ.AMQP.Client.IConsumerBuilder.InitialCredits(int initialCredits) -> RabbitMQ.AMQP.Client.IConsumerBuilder!
114114
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions
115115
RabbitMQ.AMQP.Client.IConsumerBuilder.IStreamOptions.Builder() -> RabbitMQ.AMQP.Client.IConsumerBuilder!
@@ -230,7 +230,7 @@ RabbitMQ.AMQP.Client.Impl.AmqpConsumer.Unpause() -> void
230230
RabbitMQ.AMQP.Client.Impl.AmqpConsumer.UnsettledMessageCount.get -> long
231231
RabbitMQ.AMQP.Client.Impl.AmqpConsumerBuilder
232232
RabbitMQ.AMQP.Client.Impl.AmqpConsumerBuilder.AmqpConsumerBuilder(RabbitMQ.AMQP.Client.Impl.AmqpConnection! connection) -> void
233-
RabbitMQ.AMQP.Client.Impl.AmqpConsumerBuilder.BuildAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.AMQP.Client.IConsumer!>!
233+
RabbitMQ.AMQP.Client.Impl.AmqpConsumerBuilder.BuildAndStartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.AMQP.Client.IConsumer!>!
234234
RabbitMQ.AMQP.Client.Impl.AmqpConsumerBuilder.InitialCredits(int initialCredits) -> RabbitMQ.AMQP.Client.IConsumerBuilder!
235235
RabbitMQ.AMQP.Client.Impl.AmqpConsumerBuilder.MessageHandler(RabbitMQ.AMQP.Client.MessageHandler! handler) -> RabbitMQ.AMQP.Client.IConsumerBuilder!
236236
RabbitMQ.AMQP.Client.Impl.AmqpConsumerBuilder.Queue(RabbitMQ.AMQP.Client.IQueueSpecification! queueSpec) -> RabbitMQ.AMQP.Client.IConsumerBuilder!

‎Tests/AmqpTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ async Task MessageHandler(IContext ctx, IMessage msg)
122122
}
123123

124124
IConsumerBuilder consumerBuilder = _connection.ConsumerBuilder();
125-
IConsumer consumer = await consumerBuilder.Queue(_queueName).MessageHandler(MessageHandler).BuildAsync();
125+
IConsumer consumer = await consumerBuilder.Queue(_queueName).MessageHandler(MessageHandler).BuildAndStartAsync();
126126

127127
await WhenTaskCompletes(allMessagesReceivedTcs.Task);
128128
Assert.Equal(messageCount, messageIds.Count);
@@ -218,7 +218,7 @@ async Task MessageHandler(IContext ctx, IMessage msg)
218218
}
219219

220220
IConsumerBuilder consumerBuilder = _connection.ConsumerBuilder();
221-
IConsumer consumer = await consumerBuilder.Queue(_queueName).MessageHandler(MessageHandler).BuildAsync();
221+
IConsumer consumer = await consumerBuilder.Queue(_queueName).MessageHandler(MessageHandler).BuildAndStartAsync();
222222

223223
await WhenTaskCompletes(allMessagesReceivedTcs.Task);
224224

@@ -270,7 +270,7 @@ async Task MessageHandler(IContext ctx, IMessage msg)
270270
}
271271

272272
IConsumerBuilder consumerBuilder = _connection.ConsumerBuilder();
273-
IConsumer consumer = await consumerBuilder.Queue(queueSpecification).MessageHandler(MessageHandler).BuildAsync();
273+
IConsumer consumer = await consumerBuilder.Queue(queueSpecification).MessageHandler(MessageHandler).BuildAndStartAsync();
274274

275275
IPublisherBuilder publisherBuilder = _connection.PublisherBuilder();
276276
IPublisher publisher = await publisherBuilder.Queue(queueSpecification).BuildAsync();

‎Tests/Consumer/BasicConsumerTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public async Task SimpleConsumeMessage()
3333
await context.AcceptAsync();
3434
tcs.SetResult(message);
3535
}
36-
).BuildAsync();
36+
).BuildAndStartAsync();
3737

3838
await WhenTcsCompletes(tcs);
3939
IMessage receivedMessage = await tcs.Task;
@@ -81,7 +81,7 @@ public async Task ConsumerReQueueMessage()
8181
break;
8282
}
8383
}
84-
).BuildAsync();
84+
).BuildAndStartAsync();
8585

8686
await WhenTcsCompletes(tcs);
8787

@@ -136,7 +136,7 @@ async Task MessageHandler(IContext cxt, IMessage msg)
136136
consumer = await _connection.ConsumerBuilder()
137137
.Queue(queueSpec)
138138
.InitialCredits(initialCredits)
139-
.MessageHandler(MessageHandler).BuildAsync();
139+
.MessageHandler(MessageHandler).BuildAndStartAsync();
140140

141141
await WhenTcsCompletes(tcs);
142142

@@ -195,7 +195,7 @@ public async Task ConsumerForStreamQueueWithOffset(StreamOffsetSpecification off
195195
.Stream()
196196
.Offset(offset)
197197
.Builder()
198-
.BuildAsync();
198+
.BuildAndStartAsync();
199199

200200
// wait for the consumer to consume all messages
201201
// we can't use the TaskCompletionSource here because we don't know how many messages will be consumed
@@ -267,7 +267,7 @@ public async Task ConsumerWithStreamFilterShouldReceiveOnlyPartOfTheMessages(str
267267
.FilterValues(filters)
268268
.FilterMatchUnfiltered(false)
269269
.Offset(StreamOffsetSpecification.First).Builder()
270-
.BuildAsync();
270+
.BuildAndStartAsync();
271271

272272
int receivedWithoutFilters = 0;
273273
IConsumer consumerWithoutFilters = await _connection.ConsumerBuilder()
@@ -280,7 +280,7 @@ public async Task ConsumerWithStreamFilterShouldReceiveOnlyPartOfTheMessages(str
280280
})
281281
.Stream()
282282
.Offset(StreamOffsetSpecification.First).Builder()
283-
.BuildAsync();
283+
.BuildAndStartAsync();
284284

285285
// wait for the consumer to consume all messages
286286
await Task.Delay(500); // TODO yuck
@@ -326,7 +326,7 @@ public async Task ConsumerForStreamQueueWithOffsetValue(int offsetStart, int num
326326
.Stream()
327327
.Offset(offsetStart)
328328
.Builder()
329-
.BuildAsync();
329+
.BuildAndStartAsync();
330330

331331
// wait for the consumer to consume all messages
332332
// we can't use the TaskCompletionSource here because we don't know how many messages will be consumed
@@ -357,7 +357,7 @@ public async Task ConsumerShouldThrowWhenQueueDoesNotExist()
357357
// TODO these are timeout exceptions under the hood, compare
358358
// with the Java client
359359
ConsumerException ex = await Assert.ThrowsAsync<ConsumerException>(
360-
() => consumerBuilder.BuildAsync());
360+
() => consumerBuilder.BuildAndStartAsync());
361361
Assert.Contains(doesNotExist, ex.Message);
362362
}
363363

@@ -381,7 +381,7 @@ async Task MessageHandler(IContext cxt, IMessage msg)
381381
IConsumerBuilder consumerBuilder = _connection.ConsumerBuilder()
382382
.Queue(_queueName)
383383
.MessageHandler(MessageHandler);
384-
IConsumer consumer = await consumerBuilder.BuildAsync();
384+
IConsumer consumer = await consumerBuilder.BuildAndStartAsync();
385385

386386
await PublishAsync(queueSpecification, 1);
387387

@@ -426,7 +426,7 @@ public async Task ConsumerUnsettledMessagesGoBackToQueueAfterClosing()
426426
{
427427
receivedGreaterThanSettledTcs.TrySetResult(true);
428428
}
429-
}).BuildAsync();
429+
}).BuildAndStartAsync();
430430

431431
await WhenTcsCompletes(receivedGreaterThanSettledTcs);
432432

@@ -472,7 +472,7 @@ public async Task ConsumerWithHigherPriorityShouldGetMessagesFirst()
472472
allMessagesReceivedTcs.SetException(ex);
473473
}
474474
});
475-
IConsumer lowPriorityConsumer = await lowPriorityConsumerBuilder.BuildAsync();
475+
IConsumer lowPriorityConsumer = await lowPriorityConsumerBuilder.BuildAndStartAsync();
476476

477477
IConsumerBuilder highPriorityConsumerBuilder = _connection.ConsumerBuilder()
478478
.Queue(queueSpecification)
@@ -493,7 +493,7 @@ public async Task ConsumerWithHigherPriorityShouldGetMessagesFirst()
493493
allMessagesReceivedTcs.SetException(ex);
494494
}
495495
});
496-
IConsumer highPriorityConsumer = await highPriorityConsumerBuilder.BuildAsync();
496+
IConsumer highPriorityConsumer = await highPriorityConsumerBuilder.BuildAndStartAsync();
497497

498498
await PublishAsync(queueSpecification, messageCount);
499499

‎Tests/Consumer/ConsumerPauseTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public async Task PauseShouldStopMessageArrivalUnpauseShouldResumeIt()
4444
{
4545
messageContexts.Add(ctx);
4646
return Task.CompletedTask;
47-
}).BuildAsync();
47+
}).BuildAndStartAsync();
4848

4949
Task<bool> WaitForMessageContextCountAtLeast(int expectedCount)
5050
{
@@ -146,7 +146,7 @@ public async Task ConsumerPauseThenClose()
146146
{
147147
unsettledMessages.Add(ctx);
148148
}
149-
}).BuildAsync();
149+
}).BuildAndStartAsync();
150150

151151
DateTime start = DateTime.Now;
152152
for (int i = 0; i < 100; i++)
@@ -220,7 +220,7 @@ public async Task ConsumerGracefulShutdownExample()
220220
}
221221
await Task.Delay(TimeSpan.FromMilliseconds(r.Next(1, 10)));
222222
await ctx.AcceptAsync();
223-
}).BuildAsync();
223+
}).BuildAndStartAsync();
224224

225225
await WhenTcsCompletes(receivedTwiceInitialCreditsTcs);
226226

‎Tests/Recovery/CustomPublisherConsumerRecoveryTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public async Task PublisherAndConsumerShouldNotRestartIfRecoveryIsDisabled()
5555
{
5656
// ignored
5757
}
58-
}).BuildAsync();
58+
}).BuildAndStartAsync();
5959

6060
List<(State, State)> statesConsumer = [];
6161
consumer.ChangeState += (sender, fromState, toState, e) =>

‎Tests/Recovery/PublisherConsumerRecoveryTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public async Task ConsumerShouldChangeStatusWhenClosed()
6969
.MessageHandler((context, message) =>
7070
{
7171
return Task.CompletedTask;
72-
}).BuildAsync();
72+
}).BuildAndStartAsync();
7373

7474
List<(State, State)> states = [];
7575
consumer.ChangeState += (_, fromState, toState, _) =>
@@ -162,7 +162,7 @@ public async Task ConsumerShouldChangeStatusWhenConnectionIsKilled()
162162
.MessageHandler((context, message) =>
163163
{
164164
return Task.CompletedTask;
165-
}).BuildAsync();
165+
}).BuildAndStartAsync();
166166

167167
List<(State, State)> states = [];
168168
consumer.ChangeState += (_, fromState, toState, _) => { states.Add((fromState, toState)); };
@@ -219,7 +219,7 @@ public async Task PublishShouldRestartPublishConsumerShouldRestartConsumeWhenCon
219219
{
220220
// ignored
221221
}
222-
}).BuildAsync();
222+
}).BuildAndStartAsync();
223223

224224
const int publishBatchCount = 10;
225225

@@ -294,7 +294,7 @@ public async Task PublisherAndConsumerShouldNotRestartIfRecoveryIsDisabled()
294294
{
295295
// ignored
296296
}
297-
}).BuildAsync();
297+
}).BuildAndStartAsync();
298298

299299
List<(State, State)> statesConsumer = [];
300300
consumer.ChangeState += (_, fromState, toState, _) =>

‎docs/Examples/GettingStarted/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
Trace.WriteLine(TraceLevel.Information, $"[Consumer] Message: {message.Body()} received");
5959
await context.AcceptAsync();
6060
}
61-
).BuildAsync();
61+
).BuildAndStartAsync();
6262
// ------------------------------------------------------------------------------------
6363

6464
const int total = 10;

‎docs/Examples/HAClient/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
Interlocked.Increment(ref messagesReceived);
8181
return context.AcceptAsync();
8282
}
83-
).BuildAsync();
83+
).BuildAndStartAsync();
8484

8585
consumer.ChangeState += (sender, fromState, toState, e) =>
8686
{

0 commit comments

Comments
 (0)