Merged bug23214 (basic.consume's 'filter' should be called 'arguments')

Simon MacMullen · Simon MacMullen · commit a3df973c84b6 · 2010-09-01T12:06:13.000+01:00
diff --git a/docs/wikipages/data.ApiGen.txt b/docs/wikipages/data.ApiGen.txt
@@ -337,10 +337,9 @@ parameter concerned:
     void _Private_BasicConsume(...,
                                bool exclusive,
                                bool nowait,
-                                 [AmqpFieldMapping(
-                                   "RabbitMQ.Client.Framing.v0_8qpid",
-                                                   "arguments")]
-                               IDictionary filter);
+                               [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9",
+                                                 "filter")]
+                               IDictionary arguments);
 
 The parameter to the attribute specifies the specification version to
 which the attribute should apply, or null if it should apply to any
@@ -562,14 +561,14 @@ QueueUnbind.
                                bool exclusive,
                                bool nowait,
                                [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
-                               [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_8qpid",
-                                                 "arguments")]
-                               IDictionary filter);
-
-In the example above, the "filter" parameter is unsupported in
-standard 0-8, and in QPid-specific 0-8 it is named "arguments" instead
-of "filter". In all other implementations (currently only 0-9), it is
-assumed to be supported and named "filter".
+                               [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9",
+                                                 "filter")]
+                               IDictionary arguments);
+
+In the example above, the "arguments" parameter is unsupported in
+standard 0-8, and in 0-9 t is named "filter" instead of
+"arguments". In all other implementations, it is assumed to be
+supported and named "arguments".
 
 The parameter to the attribute specifies the specification version to
 which the attribute should apply, or null if it should apply to any
diff --git a/projects/client/RabbitMQ.Client/src/client/api/IModel.cs b/projects/client/RabbitMQ.Client/src/client/api/IModel.cs
@@ -280,7 +280,7 @@ uint QueueDelete(string queue,
         ///</remarks>
         [AmqpMethodDoNotImplement(null)]
         string BasicConsume(string queue,
-                            IDictionary filter,
+                            IDictionary arguments,
                             IBasicConsumer consumer);
 
         ///<summary>Start a Basic content-class consumer.</summary>
@@ -292,7 +292,7 @@ string BasicConsume(string queue,
         [AmqpMethodDoNotImplement(null)]
         string BasicConsume(string queue,
                             bool noAck,
-                            IDictionary filter,
+                            IDictionary arguments,
                             IBasicConsumer consumer);
 
         ///<summary>Start a Basic content-class consumer.</summary>
@@ -304,7 +304,7 @@ string BasicConsume(string queue,
         string BasicConsume(string queue,
                             bool noAck,
                             string consumerTag,
-                            IDictionary filter,
+                            IDictionary arguments,
                             IBasicConsumer consumer);
 
         ///<summary>Start a Basic content-class consumer.</summary>
@@ -314,7 +314,7 @@ string BasicConsume(string queue,
                             string consumerTag,
                             bool noLocal,
                             bool exclusive,
-                            IDictionary filter,
+                            IDictionary arguments,
                             IBasicConsumer consumer);
 
         ///<summary>Delete a Basic content-class consumer.</summary>
@@ -553,11 +553,9 @@ void _Private_BasicConsume(string queue,
                                    bool exclusive,
                                    bool nowait,
                                    [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
-                                   [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_8qpid",
-                                                     "arguments")]
-                                   [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1",
-                                                     "arguments")]
-                                   IDictionary filter);
+                                   [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9",
+                                                     "filter")]
+                                   IDictionary arguments);
 
         ///<summary>Handle incoming Basic.ConsumeOk methods.</summary>
         void HandleBasicConsumeOk(string consumerTag);
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs
@@ -572,27 +572,27 @@ public abstract uint QueueDelete(string queue,
                                          bool nowait);
 
         public string BasicConsume(string queue,
-                                   IDictionary filter,
+                                   IDictionary arguments,
                                    IBasicConsumer consumer)
         {
-            return BasicConsume(queue, false, filter, consumer);
+            return BasicConsume(queue, false, arguments, consumer);
         }
 
         public string BasicConsume(string queue,
                                    bool noAck,
-                                   IDictionary filter,
+                                   IDictionary arguments,
                                    IBasicConsumer consumer)
         {
-            return BasicConsume(queue, noAck, "", filter, consumer);
+            return BasicConsume(queue, noAck, "", arguments, consumer);
         }
 
         public string BasicConsume(string queue,
                                    bool noAck,
                                    string consumerTag,
-                                   IDictionary filter,
+                                   IDictionary arguments,
                                    IBasicConsumer consumer)
         {
-            return BasicConsume(queue, noAck, consumerTag, false, false, filter, consumer);
+            return BasicConsume(queue, noAck, consumerTag, false, false, arguments, consumer);
         }
 
         public class BasicConsumerRpcContinuation : SimpleBlockingRpcContinuation
@@ -607,7 +607,7 @@ public string BasicConsume(string queue,
                                    string consumerTag,
                                    bool noLocal,
                                    bool exclusive,
-                                   IDictionary filter,
+                                   IDictionary arguments,
                                    IBasicConsumer consumer)
         {
             ModelShutdown += new ModelShutdownEventHandler(consumer.HandleModelShutdown);
@@ -621,7 +621,7 @@ public string BasicConsume(string queue,
             try
             {
                 _Private_BasicConsume(queue, consumerTag, noLocal, noAck, exclusive,
-                    /*nowait:*/ false, filter);
+                    /*nowait:*/ false, arguments);
             }
             catch (AlreadyClosedException)
             {
@@ -744,7 +744,7 @@ public abstract void _Private_BasicConsume(string queue,
                                                    bool noAck,
                                                    bool exclusive,
                                                    bool nowait,
-                                                   IDictionary filter);
+                                                   IDictionary arguments);
 
         public abstract void _Private_BasicCancel(string consumerTag,
                                                   bool nowait);

Original file line number	Diff line number	Diff line change
`@@ -572,27 +572,27 @@ public abstract uint QueueDelete(string queue,`
`572`	`572`	`bool nowait);`
`573`	`573`
`574`	`574`	`public string BasicConsume(string queue,`
`575`		`- IDictionary filter,`
	`575`	`+ IDictionary arguments,`
`576`	`576`	`IBasicConsumer consumer)`
`577`	`577`	`{`
`578`		`- return BasicConsume(queue, false, filter, consumer);`
	`578`	`+ return BasicConsume(queue, false, arguments, consumer);`
`579`	`579`	`}`
`580`	`580`
`581`	`581`	`public string BasicConsume(string queue,`
`582`	`582`	`bool noAck,`
`583`		`- IDictionary filter,`
	`583`	`+ IDictionary arguments,`
`584`	`584`	`IBasicConsumer consumer)`
`585`	`585`	`{`
`586`		`- return BasicConsume(queue, noAck, "", filter, consumer);`
	`586`	`+ return BasicConsume(queue, noAck, "", arguments, consumer);`
`587`	`587`	`}`
`588`	`588`
`589`	`589`	`public string BasicConsume(string queue,`
`590`	`590`	`bool noAck,`
`591`	`591`	`string consumerTag,`
`592`		`- IDictionary filter,`
	`592`	`+ IDictionary arguments,`
`593`	`593`	`IBasicConsumer consumer)`
`594`	`594`	`{`
`595`		`- return BasicConsume(queue, noAck, consumerTag, false, false, filter, consumer);`
	`595`	`+ return BasicConsume(queue, noAck, consumerTag, false, false, arguments, consumer);`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`public class BasicConsumerRpcContinuation : SimpleBlockingRpcContinuation`
`@@ -607,7 +607,7 @@ public string BasicConsume(string queue,`
`607`	`607`	`string consumerTag,`
`608`	`608`	`bool noLocal,`
`609`	`609`	`bool exclusive,`
`610`		`- IDictionary filter,`
	`610`	`+ IDictionary arguments,`
`611`	`611`	`IBasicConsumer consumer)`
`612`	`612`	`{`
`613`	`613`	`ModelShutdown += new ModelShutdownEventHandler(consumer.HandleModelShutdown);`
`@@ -621,7 +621,7 @@ public string BasicConsume(string queue,`
`621`	`621`	`try`
`622`	`622`	`{`
`623`	`623`	`_Private_BasicConsume(queue, consumerTag, noLocal, noAck, exclusive,`
`624`		`- /nowait:/ false, filter);`
	`624`	`+ /nowait:/ false, arguments);`
`625`	`625`	`}`
`626`	`626`	`catch (AlreadyClosedException)`
`627`	`627`	`{`
`@@ -744,7 +744,7 @@ public abstract void _Private_BasicConsume(string queue,`
`744`	`744`	`bool noAck,`
`745`	`745`	`bool exclusive,`
`746`	`746`	`bool nowait,`
`747`		`- IDictionary filter);`
	`747`	`+ IDictionary arguments);`
`748`	`748`
`749`	`749`	`public abstract void _Private_BasicCancel(string consumerTag,`
`750`	`750`	`bool nowait);`