Merge bug23896

Author: Simon MacMullen

docs/wikipages/data.ApiOverview.txt

@@ -223,8 +223,7 @@ follows:
  channel.BasicPublish(exchangeName, routingKey, null, messageBodyBytes);
 
 For fine control, you can use overloaded variants to specify the
-mandatory and immediate flags, or send messages with basic-class
-header properties:
+mandatory flag, or send messages with basic-class header properties:
 
 @code java
  byte[] messageBodyBytes = System.Text.Encoding.UTF8.GetBytes("Hello, world!");

docs/wikipages/data.MessagingPatterns.txt

@@ -107,12 +107,12 @@ Since published messages are returned to clients via AMQP's [code
 basic.return] method, and [code basic.return] is an asynchronous
 negative-acknowledgement event, the [i absence] of a [code
 basic.return] for a particular message cannot be taken as a
-confirmation of delivery: the use of "mandatory" and "immediate" only
-provides a way of raising the bar, rather than eliminating failure
-entirely.
+confirmation of delivery: the use of delivery flags only provides a
+way of raising the bar, rather than eliminating failure entirely.
 
-When using "mandatory" or "immediate", it's important to be aware that
-different AMQP servers implement the flags in different ways,
+When using delivery flags it is important to be aware that different
+AMQP servers implement the flags in different ways. For example, the
+RabbitMQ server does not support the "immediate" flag. Furthermore,
 depending on the degree of internal asynchrony and distribution that
 those servers exhibit. In particular, the interpretation of
 "mandatory" and "immediate" in situations where [code Tx]-class

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

@@ -454,8 +454,22 @@ void BasicPublish(string exchange,
                           IBasicProperties basicProperties,
                           byte[] body);
 
+        ///<summary>(Spec method) Convenience overload of BasicPublish.</summary>
+        ///<remarks>
+        ///The publication occurs with immediate=false.
+        ///</remarks>
+        [AmqpMethodDoNotImplement(null)]
+        void BasicPublish(string exchange,
+                          string routingKey,
+                          bool mandatory,
+                          IBasicProperties basicProperties,
+                          byte[] body);
+
         ///<summary>(Spec method) Publish a message using the Basic
         ///content-class.</summary>
+        ///<remarks>
+        ///Note that the RabbitMQ server does not support the 'immediate' flag.
+        ///</remarks>
         [AmqpMethodDoNotImplement(null)]
         void BasicPublish(string exchange,
                           string routingKey,

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

@@ -1244,6 +1244,19 @@ public void BasicPublish(string exchange,
             BasicPublish(exchange,
                          routingKey,
                          false,
+                         basicProperties,
+                         body);
+        }
+
+        public void BasicPublish(string exchange,
+                                 string routingKey,
+                                 bool mandatory,
+                                 IBasicProperties basicProperties,
+                                 byte[] body)
+        {
+            BasicPublish(exchange,
+                         routingKey,
+                         mandatory,
                          false,
                          basicProperties,
                          body);