Merge branch 'rabbitmq-dotnet-client-111'

Author: michaelklishin

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

@@ -139,7 +139,7 @@ public interface IModel : IDisposable
         ///
         /// Examples of cases where this event will be signalled
         /// include exceptions thrown in <see cref="IBasicConsumer"/> methods, or
-        /// exceptions thrown in <see cref="ModelShutdownEventHandler"/> delegates etc.
+        /// exceptions thrown in <see cref="ModelShutdown"/> delegates etc.
         /// </summary>
         event EventHandler<CallbackExceptionEventArgs> CallbackException;
 
@@ -258,30 +258,18 @@ string BasicConsume(string queue,
         /// (Spec method) Convenience overload of BasicPublish.
         /// </summary>
         /// <remarks>
-        /// The publication occurs with mandatory=false and immediate=false.
+        /// The publication occurs with mandatory=false
         /// </remarks>
         [AmqpMethodDoNotImplement(null)]
         void BasicPublish(string exchange, string routingKey, 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, bool mandatory,
-            bool immediate, IBasicProperties basicProperties, byte[] body);
-
         /// <summary>
         /// (Spec method) Configures QoS parameters of the Basic content-class.
         /// </summary>

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

@@ -558,12 +558,11 @@ public void _Private_BasicGet(string queue, bool noAck)
         public void _Private_BasicPublish(string exchange,
             string routingKey,
             bool mandatory,
-            bool immediate,
             IBasicProperties basicProperties,
             byte[] body)
         {
             m_delegate._Private_BasicPublish(exchange, routingKey, mandatory,
-                immediate, basicProperties, body);
+                basicProperties, body);
         }
 
         public void _Private_BasicRecover(bool requeue)
@@ -844,17 +843,6 @@ public void BasicPublish(string exchange,
                 body);
         }
 
-        public void BasicPublish(string exchange,
-            string routingKey,
-            bool mandatory,
-            bool immediate,
-            IBasicProperties basicProperties,
-            byte[] body)
-        {
-            m_delegate.BasicPublish(exchange, routingKey, mandatory, immediate,
-                basicProperties, body);
-        }
-
         public void BasicQos(uint prefetchSize,
             ushort prefetchCount,
             bool global)

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

@@ -225,7 +225,6 @@ void _Private_BasicGet(string queue,
         void _Private_BasicPublish(string exchange,
             string routingKey,
             bool mandatory,
-            bool immediate,
             [AmqpContentHeaderMapping] IBasicProperties basicProperties,
             [AmqpContentBodyMapping] byte[] body);
 

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

@@ -1018,7 +1018,6 @@ public abstract void _Private_BasicGet(string queue,
         public abstract void _Private_BasicPublish(string exchange,
             string routingKey,
             bool mandatory,
-            bool immediate,
             IBasicProperties basicProperties,
             byte[] body);
 
@@ -1216,21 +1215,6 @@ public void BasicPublish(string exchange,
             bool mandatory,
             IBasicProperties basicProperties,
             byte[] body)
-        {
-            BasicPublish(exchange,
-                routingKey,
-                mandatory,
-                false,
-                basicProperties,
-                body);
-        }
-
-        public void BasicPublish(string exchange,
-            string routingKey,
-            bool mandatory,
-            bool immediate,
-            IBasicProperties basicProperties,
-            byte[] body)
         {
             if (basicProperties == null)
             {
@@ -1250,7 +1234,6 @@ public void BasicPublish(string exchange,
             _Private_BasicPublish(exchange,
                 routingKey,
                 mandatory,
-                immediate,
                 basicProperties,
                 body);
         }