Skip to content

Commit cdf9651

Browse files
author
Emile Joubert
committed
Synchronise binding and consuming with Java client
1 parent 28ba841 commit cdf9651

File tree

10 files changed

+171
-131
lines changed

10 files changed

+171
-131
lines changed

‎projects/client/RabbitMQ.Client/src/client/api/IModel.cs‎

Lines changed: 91 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -207,31 +207,43 @@ void ExchangeDeclare(string exchange,
207207
[AmqpMethodDoNotImplement(null)]
208208
void ExchangeDeclarePassive(string exchange);
209209

210-
///<summary>(Spec method) Delete an exchange.</summary>
210+
///<summary>(Spec method) Delete an exchange.</summary>
211211
[AmqpMethodDoNotImplement(null)]
212212
void ExchangeDelete(string exchange, bool ifUnused);
213213

214-
///<summary>(Spec method) Delete an exchange.</summary>
215-
///<remarks>
216-
/// The exchange is deleted regardless of any queue bindings.
214+
///<summary>(Spec method) Delete an exchange.</summary>
215+
///<remarks>
216+
/// The exchange is deleted regardless of any queue bindings.
217217
///</remarks>
218218
[AmqpMethodDoNotImplement(null)]
219219
void ExchangeDelete(string exchange);
220220

221-
///<summary>(Extension method) Bind an exchange to an exchange.</summary>
221+
///<summary>(Extension method) Bind an exchange to an exchange.</summary>
222222
[AmqpMethodDoNotImplement(null)]
223223
void ExchangeBind(string destination,
224224
string source,
225225
string routingKey,
226-
IDictionary arguments);
227-
228-
///<summary>(Extension method) Unbind an exchange from an exchange.</summary>
226+
IDictionary arguments);
227+
228+
///<summary>(Extension method) Bind an exchange to an exchange.</summary>
229+
[AmqpMethodDoNotImplement(null)]
230+
void ExchangeBind(string destination,
231+
string source,
232+
string routingKey);
233+
234+
///<summary>(Extension method) Unbind an exchange from an exchange.</summary>
229235
[AmqpMethodDoNotImplement(null)]
230236
void ExchangeUnbind(string destination,
231237
string source,
232238
string routingKey,
233239
IDictionary arguments);
234240

241+
///<summary>(Extension method) Unbind an exchange from an exchange.</summary>
242+
[AmqpMethodDoNotImplement(null)]
243+
void ExchangeUnbind(string destination,
244+
string source,
245+
string routingKey);
246+
235247
///<summary>(Spec method) Declare a queue.</summary>
236248
///<remarks>
237249
///The queue is declared non-passive, non-durable,
@@ -256,13 +268,19 @@ void ExchangeUnbind(string destination,
256268
string QueueDeclare(string queue, bool durable, bool exclusive,
257269
bool autoDelete, IDictionary arguments);
258270

259-
///<summary>(Spec method) Bind a queue to an exchange.</summary>
271+
///<summary>(Spec method) Bind a queue to an exchange.</summary>
260272
[AmqpMethodDoNotImplement(null)]
261273
void QueueBind(string queue,
262274
string exchange,
263275
string routingKey,
264276
IDictionary arguments);
265277

278+
///<summary>(Spec method) Bind a queue to an exchange.</summary>
279+
[AmqpMethodDoNotImplement(null)]
280+
void QueueBind(string queue,
281+
string exchange,
282+
string routingKey);
283+
266284
///<summary>(Spec method) Unbind a queue from an exchange.</summary>
267285
///<remarks>
268286
///Note: This operation is only supported when communicating
@@ -279,7 +297,7 @@ void QueueUnbind(string queue,
279297
///<summary>(Spec method) Purge a queue of messages.</summary>
280298
///<remarks>
281299
///Returns the number of messages purged.
282-
///</remarks>
300+
///</remarks>
283301
[AmqpMethodDoNotImplement(null)]
284302
uint QueuePurge(string queue);
285303

@@ -288,7 +306,7 @@ void QueueUnbind(string queue,
288306
///Returns the number of messages purged during queue
289307
///deletion.
290308
///<code>uint.MaxValue</code>.
291-
///</remarks>
309+
///</remarks>
292310
[AmqpMethodDoNotImplement(null)]
293311
uint QueueDelete(string queue,
294312
bool ifUnused,
@@ -317,7 +335,7 @@ uint QueueDelete(string queue,
317335
///</remarks>
318336
[AmqpMethodDoNotImplement(null)]
319337
string BasicConsume(string queue,
320-
IDictionary arguments,
338+
bool noAck,
321339
IBasicConsumer consumer);
322340

323341
///<summary>Start a Basic content-class consumer.</summary>
@@ -329,7 +347,7 @@ string BasicConsume(string queue,
329347
[AmqpMethodDoNotImplement(null)]
330348
string BasicConsume(string queue,
331349
bool noAck,
332-
IDictionary arguments,
350+
string consumerTag,
333351
IBasicConsumer consumer);
334352

335353
///<summary>Start a Basic content-class consumer.</summary>
@@ -580,43 +598,43 @@ void _Private_ExchangeDeclare(string exchange,
580598
bool @internal,
581599
[AmqpNowaitArgument(null)]
582600
bool nowait,
583-
IDictionary arguments);
584-
585-
///<summary>Used to send a Exchange.Delete method. Called by the
586-
///public delete method.
587-
///</summary>
588-
[AmqpMethodMapping(null, "exchange", "delete")]
589-
void _Private_ExchangeDelete(string exchange,
590-
bool ifUnused,
601+
IDictionary arguments);
602+
603+
///<summary>Used to send a Exchange.Delete method. Called by the
604+
///public delete method.
605+
///</summary>
606+
[AmqpMethodMapping(null, "exchange", "delete")]
607+
void _Private_ExchangeDelete(string exchange,
608+
bool ifUnused,
591609
[AmqpNowaitArgument(null)]
592-
bool nowait);
593-
594-
///<summary>Used to send a Exchange.Bind method. Called by the
595-
///public bind method.
596-
///</summary>
597-
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8"),
598-
AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid"),
599-
AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
600-
[AmqpMethodMapping(null, "exchange", "bind")]
601-
void _Private_ExchangeBind(string destination,
602-
string source,
603-
string routingKey,
610+
bool nowait);
611+
612+
///<summary>Used to send a Exchange.Bind method. Called by the
613+
///public bind method.
614+
///</summary>
615+
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8"),
616+
AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid"),
617+
AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
618+
[AmqpMethodMapping(null, "exchange", "bind")]
619+
void _Private_ExchangeBind(string destination,
620+
string source,
621+
string routingKey,
604622
[AmqpNowaitArgument(null)]
605-
bool nowait,
606-
IDictionary arguments);
607-
608-
///<summary>Used to send a Exchange.Unbind method. Called by the
609-
///public unbind method.
610-
///</summary>
611-
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8"),
612-
AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid"),
613-
AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
614-
[AmqpMethodMapping(null, "exchange", "unbind")]
615-
void _Private_ExchangeUnbind(string destination,
616-
string source,
617-
string routingKey,
623+
bool nowait,
624+
IDictionary arguments);
625+
626+
///<summary>Used to send a Exchange.Unbind method. Called by the
627+
///public unbind method.
628+
///</summary>
629+
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8"),
630+
AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid"),
631+
AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
632+
[AmqpMethodMapping(null, "exchange", "unbind")]
633+
void _Private_ExchangeUnbind(string destination,
634+
string source,
635+
string routingKey,
618636
[AmqpNowaitArgument(null)]
619-
bool nowait,
637+
bool nowait,
620638
IDictionary arguments);
621639

622640
///<summary>Used to send a Queue.Declare method. Called by the
@@ -630,34 +648,34 @@ string _Private_QueueDeclare(string queue,
630648
bool autoDelete,
631649
[AmqpNowaitArgument(null)]
632650
bool nowait,
633-
IDictionary arguments);
634-
635-
///<summary>Used to send a Queue.Bind method. Called by the
636-
///public bind method.</summary>
637-
[AmqpMethodMapping(null, "queue", "bind")]
638-
void _Private_QueueBind(string queue,
639-
string exchange,
640-
string routingKey,
651+
IDictionary arguments);
652+
653+
///<summary>Used to send a Queue.Bind method. Called by the
654+
///public bind method.</summary>
655+
[AmqpMethodMapping(null, "queue", "bind")]
656+
void _Private_QueueBind(string queue,
657+
string exchange,
658+
string routingKey,
641659
[AmqpNowaitArgument(null)]
642-
bool nowait,
643-
IDictionary arguments);
644-
645-
///<summary>Used to send a Queue.Purge method. Called by the
646-
///public purge method.</summary>
647-
[return: AmqpFieldMapping(null, "messageCount")]
648-
[AmqpMethodMapping(null, "queue", "purge")]
649-
uint _Private_QueuePurge(string queue,
660+
bool nowait,
661+
IDictionary arguments);
662+
663+
///<summary>Used to send a Queue.Purge method. Called by the
664+
///public purge method.</summary>
665+
[return: AmqpFieldMapping(null, "messageCount")]
666+
[AmqpMethodMapping(null, "queue", "purge")]
667+
uint _Private_QueuePurge(string queue,
650668
[AmqpNowaitArgument(null, "0xFFFFFFFF")]
651-
bool nowait);
652-
653-
654-
///<summary>Used to send a Queue.Delete method. Called by the
655-
///public delete method.</summary>
656-
[AmqpMethodMapping(null, "queue", "delete")]
657-
[return: AmqpFieldMapping(null, "messageCount")]
658-
uint _Private_QueueDelete(string queue,
659-
bool ifUnused,
660-
bool ifEmpty,
669+
bool nowait);
670+
671+
672+
///<summary>Used to send a Queue.Delete method. Called by the
673+
///public delete method.</summary>
674+
[AmqpMethodMapping(null, "queue", "delete")]
675+
[return: AmqpFieldMapping(null, "messageCount")]
676+
uint _Private_QueueDelete(string queue,
677+
bool ifUnused,
678+
bool ifEmpty,
661679
[AmqpNowaitArgument(null, "0xFFFFFFFF")]
662680
bool nowait);
663681

0 commit comments

Comments
 (0)