merge bug26208 into default

Author: michaelklishin

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

@@ -181,6 +181,16 @@ void ExchangeDeclare(string exchange,
         [AmqpMethodDoNotImplement(null)]
         void ExchangeDeclarePassive(string exchange);
 
+        /// <summary>
+        /// Same as ExchangeDeclare but sets nowait to true and returns void (as there
+        /// will be no response from the server).
+        /// </summary>
+        void ExchangeDeclareNowait(string exchange,
+                                   string type,
+                                   bool durable,
+                                   bool autoDelete,
+                                   IDictionary<string, object> arguments);
+
         ///<summary>(Spec method) Delete an exchange.</summary>
         [AmqpMethodDoNotImplement(null)]
         void ExchangeDelete(string exchange, bool ifUnused);
@@ -242,6 +252,13 @@ void ExchangeUnbind(string destination,
         QueueDeclareOk QueueDeclare(string queue, bool durable, bool exclusive,
                     bool autoDelete, IDictionary<string, object> arguments);
 
+        /// <summary>
+        /// Same as QueueDeclare but sets nowait to true and returns void (as there
+        /// will be no response from the server).
+        /// </summary>
+        void QueueDeclareNowait(string queue, bool durable, bool exclusive,
+                                bool autoDelete, IDictionary<string, object> arguments);
+
         ///<summary>(Spec method) Bind a queue to an exchange.</summary>
         [AmqpMethodDoNotImplement(null)]
         void QueueBind(string queue,

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

@@ -797,6 +797,15 @@ public void ExchangeDeclarePassive(string exchange)
             _Private_ExchangeDeclare(exchange, "", true, false, false, false, false, null);
         }
 
+		public void ExchangeDeclareNowait(string exchange,
+									string type,
+									bool durable,
+									bool autoDelete,
+									IDictionary<string, object> arguments)
+		{
+			_Private_ExchangeDeclare(exchange, type, false, durable, autoDelete, false, true, arguments);
+		}
+
         public abstract void _Private_ExchangeDeclare(string exchange,
                                                       string type,
                                                       bool passive,
@@ -875,6 +884,12 @@ public QueueDeclareOk QueueDeclarePassive(string queue)
             return QueueDeclare(queue, true, false, false, false, null);
         }
 
+		public void QueueDeclareNowait(string queue, bool durable, bool exclusive,
+			bool autoDelete, IDictionary<string, object> arguments)
+		{
+			_Private_QueueDeclare(queue, false, durable, exclusive, autoDelete, true, arguments);
+		}
+
         public QueueDeclareOk QueueDeclare(string queue, bool durable, bool exclusive,
                                    bool autoDelete, IDictionary<string, object> arguments)
         {

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

@@ -85,5 +85,18 @@ public void TestConcurrentQueueDeclare()
             Assert.IsNotNull(nse);
             Model.ExchangeDelete(x);
         }
+
+        [Test]
+        public void TestExchangeDeclareNowait()
+        {
+            string x = GenerateExchangeName ();
+            try
+            {
+                Model.ExchangeDeclareNowait(x, "fanout", false, true, null);
+                Model.ExchangeDeclarePassive(x);
+            } finally {
+                Model.ExchangeDelete(x);
+            }
+        }
     }
 }

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

@@ -85,5 +85,13 @@ public void TestConcurrentQueueDeclare()
             Assert.IsNotNull(nse);
             Model.QueueDelete(q);
         }
+
+        [Test]
+        public void TestQueueDeclareNowait()
+        {
+            string q = GenerateQueueName ();
+            Model.QueueDeclareNowait(q, false, true, false, null);
+            Model.QueueDeclarePassive(q);
+        }
     }
 }