Skip to content

Commit a3df973

Browse files
author
Simon MacMullen
committed
Merged bug23214 (basic.consume's 'filter' should be called 'arguments')
2 parents 060397c + de12d54 commit a3df973

File tree

3 files changed

+27
-30
lines changed

3 files changed

+27
-30
lines changed

‎docs/wikipages/data.ApiGen.txt

100755100644
Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,9 @@ parameter concerned:
337337
void _Private_BasicConsume(...,
338338
bool exclusive,
339339
bool nowait,
340-
[AmqpFieldMapping(
341-
"RabbitMQ.Client.Framing.v0_8qpid",
342-
"arguments")]
343-
IDictionary filter);
340+
[AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9",
341+
"filter")]
342+
IDictionary arguments);
344343

345344
The parameter to the attribute specifies the specification version to
346345
which the attribute should apply, or null if it should apply to any
@@ -562,14 +561,14 @@ QueueUnbind.
562561
bool exclusive,
563562
bool nowait,
564563
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
565-
[AmqpFieldMapping("RabbitMQ.Client.Framing.v0_8qpid",
566-
"arguments")]
567-
IDictionary filter);
568-
569-
In the example above, the "filter" parameter is unsupported in
570-
standard 0-8, and in QPid-specific 0-8 it is named "arguments" instead
571-
of "filter". In all other implementations (currently only 0-9), it is
572-
assumed to be supported and named "filter".
564+
[AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9",
565+
"filter")]
566+
IDictionary arguments);
567+
568+
In the example above, the "arguments" parameter is unsupported in
569+
standard 0-8, and in 0-9 t is named "filter" instead of
570+
"arguments". In all other implementations, it is assumed to be
571+
supported and named "arguments".
573572

574573
The parameter to the attribute specifies the specification version to
575574
which the attribute should apply, or null if it should apply to any

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ uint QueueDelete(string queue,
280280
///</remarks>
281281
[AmqpMethodDoNotImplement(null)]
282282
string BasicConsume(string queue,
283-
IDictionary filter,
283+
IDictionary arguments,
284284
IBasicConsumer consumer);
285285

286286
///<summary>Start a Basic content-class consumer.</summary>
@@ -292,7 +292,7 @@ string BasicConsume(string queue,
292292
[AmqpMethodDoNotImplement(null)]
293293
string BasicConsume(string queue,
294294
bool noAck,
295-
IDictionary filter,
295+
IDictionary arguments,
296296
IBasicConsumer consumer);
297297

298298
///<summary>Start a Basic content-class consumer.</summary>
@@ -304,7 +304,7 @@ string BasicConsume(string queue,
304304
string BasicConsume(string queue,
305305
bool noAck,
306306
string consumerTag,
307-
IDictionary filter,
307+
IDictionary arguments,
308308
IBasicConsumer consumer);
309309

310310
///<summary>Start a Basic content-class consumer.</summary>
@@ -314,7 +314,7 @@ string BasicConsume(string queue,
314314
string consumerTag,
315315
bool noLocal,
316316
bool exclusive,
317-
IDictionary filter,
317+
IDictionary arguments,
318318
IBasicConsumer consumer);
319319

320320
///<summary>Delete a Basic content-class consumer.</summary>
@@ -553,11 +553,9 @@ void _Private_BasicConsume(string queue,
553553
bool exclusive,
554554
bool nowait,
555555
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
556-
[AmqpFieldMapping("RabbitMQ.Client.Framing.v0_8qpid",
557-
"arguments")]
558-
[AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1",
559-
"arguments")]
560-
IDictionary filter);
556+
[AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9",
557+
"filter")]
558+
IDictionary arguments);
561559

562560
///<summary>Handle incoming Basic.ConsumeOk methods.</summary>
563561
void HandleBasicConsumeOk(string consumerTag);

‎projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -572,27 +572,27 @@ public abstract uint QueueDelete(string queue,
572572
bool nowait);
573573

574574
public string BasicConsume(string queue,
575-
IDictionary filter,
575+
IDictionary arguments,
576576
IBasicConsumer consumer)
577577
{
578-
return BasicConsume(queue, false, filter, consumer);
578+
return BasicConsume(queue, false, arguments, consumer);
579579
}
580580

581581
public string BasicConsume(string queue,
582582
bool noAck,
583-
IDictionary filter,
583+
IDictionary arguments,
584584
IBasicConsumer consumer)
585585
{
586-
return BasicConsume(queue, noAck, "", filter, consumer);
586+
return BasicConsume(queue, noAck, "", arguments, consumer);
587587
}
588588

589589
public string BasicConsume(string queue,
590590
bool noAck,
591591
string consumerTag,
592-
IDictionary filter,
592+
IDictionary arguments,
593593
IBasicConsumer consumer)
594594
{
595-
return BasicConsume(queue, noAck, consumerTag, false, false, filter, consumer);
595+
return BasicConsume(queue, noAck, consumerTag, false, false, arguments, consumer);
596596
}
597597

598598
public class BasicConsumerRpcContinuation : SimpleBlockingRpcContinuation
@@ -607,7 +607,7 @@ public string BasicConsume(string queue,
607607
string consumerTag,
608608
bool noLocal,
609609
bool exclusive,
610-
IDictionary filter,
610+
IDictionary arguments,
611611
IBasicConsumer consumer)
612612
{
613613
ModelShutdown += new ModelShutdownEventHandler(consumer.HandleModelShutdown);
@@ -621,7 +621,7 @@ public string BasicConsume(string queue,
621621
try
622622
{
623623
_Private_BasicConsume(queue, consumerTag, noLocal, noAck, exclusive,
624-
/*nowait:*/ false, filter);
624+
/*nowait:*/ false, arguments);
625625
}
626626
catch (AlreadyClosedException)
627627
{
@@ -744,7 +744,7 @@ public abstract void _Private_BasicConsume(string queue,
744744
bool noAck,
745745
bool exclusive,
746746
bool nowait,
747-
IDictionary filter);
747+
IDictionary arguments);
748748

749749
public abstract void _Private_BasicCancel(string consumerTag,
750750
bool nowait);

0 commit comments

Comments
 (0)