Synchronise queue and exchange declaration with Java client

Author: Emile Joubert

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

@@ -170,18 +170,26 @@ public interface IModel: IDisposable
         [return: AmqpFieldMapping(null, "active")]
         void ChannelFlow(bool active);
 
+        ///<summary>(Spec method) Declare an exchange.</summary>
+        ///<remarks>
+        ///The exchange is declared non-passive and non-internal.
+        ///The "nowait" option is not exercised.
+        ///</remarks>
+        [AmqpMethodDoNotImplement(null)]
+        void ExchangeDeclare(string exchange,
+                             string type,
+                             bool durable,
+                             bool autoDelete,
+                             IDictionary arguments);
+
         ///<summary>(Spec method) Declare an exchange.</summary>
         ///<remarks>
         ///The exchange is declared non-passive, non-autodelete, and
         ///non-internal, with no arguments. The "nowait" option is not
         ///exercised.
         ///</remarks>
         [AmqpMethodDoNotImplement(null)]
-        void ExchangeDeclare(string exchange, 
-                             string type,
-                             bool durable,
-                             bool autoDelete,
-                             IDictionary arguments);
+        void ExchangeDeclare(string exchange, string type, bool durable);
 
         ///<summary>(Spec method) Declare an exchange.</summary>
         ///<remarks>
@@ -241,26 +249,15 @@ void ExchangeUnbind(string destination,
         [AmqpMethodDoNotImplement(null)]
         string QueueDeclare();
 
-        ///<summary>(Spec method) Declare a queue.</summary>
+        ///<summary>Declare a queue passively.</summary>
         ///<remarks>
-        ///The queue is declared non-passive, non-durable,
+        ///The queue is declared passive, non-durable,
         ///non-exclusive, and non-autodelete, with no arguments.
+        ///The queue is declared passively; i.e. only check if it exists.
         ///</remarks>
-        [AmqpMethodDoNotImplement(null)]
-        string QueueDeclare(string queue);
-
         [AmqpMethodDoNotImplement(null)]
         string QueueDeclarePassive(string queue);
 
-        ///<summary>(Spec method) Declare a queue.</summary>
-        ///<remarks>
-        ///The queue is declared non-passive, non-exclusive, and
-        ///non-autodelete, with no arguments.
-        ///</remarks>
-        [AmqpMethodDoNotImplement(null)]
-        string QueueDeclare(string queue,
-                            bool durable);
-
         ///<summary>(Spec method) Declare a queue.</summary>
         [AmqpMethodDoNotImplement(null)]
         string QueueDeclare(string queue, bool durable, bool exclusive,

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

@@ -722,25 +722,15 @@ public abstract void ExchangeUnbind(string destination,
         //TODO: Mark these as virtual, maybe the model has an optimized way
         //      of dealing with missing parameters.
         public string QueueDeclare()
-        {
-            return _Private_QueueDeclare("", false, false, true, true, false, null);
-        }
-
-        public string QueueDeclare(string queue)
-        {
-            return _Private_QueueDeclare(queue, false, false, false, false, false, null);
+        {
+            return QueueDeclare("", false, true, true, null);
         }
 
         public string QueueDeclarePassive(string queue)
         {
             return _Private_QueueDeclare(queue, true, false, false, false, false, null);
         }
 
-        public string QueueDeclare(string queue, bool durable)
-        {
-            return _Private_QueueDeclare(queue, false, durable, false, false, false, null);
-        }
-
         public string QueueDeclare(string queue, bool durable, bool exclusive,
                                    bool autoDelete, IDictionary arguments)
         {

projects/client/Unit/src/unit/TestSsl.cs

@@ -67,8 +67,8 @@ public void SendReceive(ConnectionFactory cf) {
             IModel ch = conn.CreateModel();
 
             ch.ExchangeDeclare("Exchange_TestSslEndPoint", ExchangeType.Direct);
-            ch.QueueDeclare("Queue_TestSslEndpoint");
-            ch.QueueBind("Queue_TestSslEndpoint", "Exchange_TestSslEndPoint", "Key_TestSslEndpoint", false, null);
+            String qName = ch.QueueDeclare();
+            ch.QueueBind(qName, "Exchange_TestSslEndPoint", "Key_TestSslEndpoint", false, null);
 
             string message = "Hello C# SSL Client World";
             byte[] msgBytes =  System.Text.Encoding.UTF8.GetBytes(message);

projects/examples/client/DeclareQueue/src/examples/DeclareQueue.cs

@@ -106,7 +106,7 @@ public static int Main(string[] args) {
                 {
                     using (IModel ch = conn.CreateModel()) {
 
-                        string finalName = ch.QueueDeclare(inputQueueName, durable, 
+                        string finalName = ch.QueueDeclare(inputQueueName, durable,
                                                            false, false, arguments);
                         Console.WriteLine("{0}\t{1}", finalName, durable);
 

projects/examples/client/LogTail/src/examples/LogTail.cs

@@ -86,7 +86,7 @@ public static int Main(string[] args) {
             using (IConnection conn = cf.CreateConnection())
                 {
                     using (IModel ch = conn.CreateModel()) {
-                        ch.QueueDeclare(routingKey);
+                        ch.QueueDeclare(routingKey, false, true, true, null);
                         Subscription sub = new Subscription(ch, routingKey);
                         if (exchange != "") {
                             ch.ExchangeDeclare(exchange, exchangeType);

projects/examples/client/LowlevelLogTail/src/examples/LowlevelLogTail.cs

@@ -89,7 +89,7 @@ public static int Main(string[] args) {
                         {
                             string queueName;
                             if (exchange == "") {
-                                ch.QueueDeclare(routingKey);
+                                ch.QueueDeclare(routingKey, false, true, true, null);
                                 queueName = routingKey;
                             } else {
                                 ch.ExchangeDeclare(exchange, exchangeType);

projects/examples/client/SingleGet/src/examples/SingleGet.cs

@@ -79,9 +79,9 @@ public static int Main(string[] args) {
             conn.ConnectionShutdown += new ConnectionShutdownEventHandler(LogConnClose);
 
             using (IModel ch = conn.CreateModel()) {
-                conn.AutoClose = true;
-
-                ch.QueueDeclare(queueName);
+                conn.AutoClose = true;
+
+                ch.QueueDeclare(queueName, false, true, true, null);
                 BasicGetResult result = ch.BasicGet(queueName, false);
                 if (result == null) {
                     Console.WriteLine("No message available.");