Finish the big "model" -> "channel" rename

Author: lukebakken

projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs

@@ -44,9 +44,9 @@ void IBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bo
 
         public Task HandleBasicConsumeOk(string consumerTag) => Task.CompletedTask;
 
-        public Task HandleModelShutdown(object channel, ShutdownEventArgs reason) => Task.CompletedTask;
+        public Task HandleChannelShutdown(object channel, ShutdownEventArgs reason) => Task.CompletedTask;
 
-        public IChannel Model { get; }
+        public IChannel Channel { get; }
 
         event EventHandler<ConsumerEventArgs> IBasicConsumer.ConsumerCancelled
         {
@@ -68,7 +68,7 @@ void IBasicConsumer.HandleBasicConsumeOk(string consumerTag)
         {
         }
 
-        void IBasicConsumer.HandleModelShutdown(object channel, ShutdownEventArgs reason)
+        void IBasicConsumer.HandleChannelShutdown(object channel, ShutdownEventArgs reason)
         {
         }
 

projects/Benchmarks/Networking/Networking_BasicDeliver_Commons.cs

@@ -12,7 +12,7 @@ public class Networking_BasicDeliver_Commons
         public static async Task Publish_Hello_World(IConnection connection, uint messageCount, byte[] body)
         {
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-            using (var channel = connection.CreateModel())
+            using (var channel = connection.CreateChannel())
             {
                 var queue = channel.QueueDeclare();
                 var consumed = 0;

projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs

@@ -19,12 +19,12 @@ public AsyncDefaultBasicConsumer()
         }
 
         /// <summary>
-        /// Constructor which sets the Model property to the given value.
+        /// Constructor which sets the Channel property to the given value.
         /// </summary>
         /// <param name="channel">Common AMQP channel.</param>
         public AsyncDefaultBasicConsumer(IChannel channel)
         {
-            Model = channel;
+            Channel = channel;
         }
 
         /// <summary>
@@ -64,7 +64,7 @@ public event AsyncEventHandler<ConsumerEventArgs> ConsumerCancelled
         /// Retrieve the <see cref="IChannel"/> this consumer is associated with,
         ///  for use in acknowledging received messages, for instance.
         /// </summary>
-        public IChannel Model { get; set; }
+        public IChannel Channel { get; set; }
 
         /// <summary>
         ///  Called when the consumer is cancelled for reasons other than by a basicCancel:
@@ -124,7 +124,7 @@ public virtual Task HandleBasicDeliver(string consumerTag,
         /// </summary>
         /// <param name="channel">A channel this consumer was registered on.</param>
         /// <param name="reason">Shutdown context.</param>
-        public virtual Task HandleModelShutdown(object channel, ShutdownEventArgs reason)
+        public virtual Task HandleChannelShutdown(object channel, ShutdownEventArgs reason)
         {
             ShutdownReason = reason;
             return OnCancel(_consumerTags.ToArray());
@@ -170,7 +170,7 @@ void IBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bo
             throw new InvalidOperationException("Should never be called. Enable 'DispatchConsumersAsync'.");
         }
 
-        void IBasicConsumer.HandleModelShutdown(object channel, ShutdownEventArgs reason)
+        void IBasicConsumer.HandleChannelShutdown(object channel, ShutdownEventArgs reason)
         {
             throw new InvalidOperationException("Should never be called. Enable 'DispatchConsumersAsync'.");
         }

projects/RabbitMQ.Client/client/api/CachedString.cs

@@ -4,7 +4,7 @@
 namespace RabbitMQ.Client
 {
     /// <summary>
-    /// Caches a string's byte representation to be used for certain methods like IModel.BasicPublish/>.
+    /// Caches a string's byte representation to be used for certain methods like IChannel.BasicPublish/>.
     /// </summary>
     public sealed class CachedString
     {

projects/RabbitMQ.Client/client/api/ConnectionFactory.cs

@@ -61,9 +61,9 @@ namespace RabbitMQ.Client
     ///     //
     ///     IConnection conn = factory.CreateConnection();
     ///     //
-    ///     IModel ch = conn.CreateModel();
+    ///     IChannel ch = conn.CreateChannel();
     ///     //
-    ///     // ... use ch's IModel methods ...
+    ///     // ... use ch's IChannel methods ...
     ///     //
     ///     ch.Close(Constants.ReplySuccess, "Closing the channel");
     ///     conn.Close(Constants.ReplySuccess, "Closing the connection");

projects/RabbitMQ.Client/client/api/DefaultBasicConsumer.cs

@@ -58,12 +58,12 @@ public DefaultBasicConsumer()
         }
 
         /// <summary>
-        /// Constructor which sets the Model property to the given value.
+        /// Constructor which sets the Channel property to the given value.
         /// </summary>
         /// <param name="channel">Common AMQP channel.</param>
         public DefaultBasicConsumer(IChannel channel)
         {
-            Model = channel;
+            Channel = channel;
         }
 
         /// <summary>
@@ -105,7 +105,7 @@ public event EventHandler<ConsumerEventArgs> ConsumerCancelled
         /// Retrieve the <see cref="IChannel"/> this consumer is associated with,
         ///  for use in acknowledging received messages, for instance.
         /// </summary>
-        public IChannel Model { get; set; }
+        public IChannel Channel { get; set; }
 
         /// <summary>
         ///  Called when the consumer is cancelled for reasons other than by a basicCancel:
@@ -163,7 +163,7 @@ public virtual void HandleBasicDeliver(string consumerTag,
         /// </summary>
         /// <param name="channel">A channel this consumer was registered on.</param>
         /// <param name="reason">Shutdown context.</param>
-        public virtual void HandleModelShutdown(object channel, ShutdownEventArgs reason)
+        public virtual void HandleChannelShutdown(object channel, ShutdownEventArgs reason)
         {
             ShutdownReason = reason;
             OnCancel(_consumerTags.ToArray());

projects/RabbitMQ.Client/client/api/ExchangeType.cs

@@ -38,7 +38,7 @@ namespace RabbitMQ.Client
     /// </summary>
     /// <remarks>
     /// Use the static members of this class as values for the
-    /// "exchangeType" arguments for IModel methods such as
+    /// "exchangeType" arguments for IChannel methods such as
     /// ExchangeDeclare. The broker may be extended with additional
     /// exchange types that do not appear in this class.
     /// </remarks>

projects/RabbitMQ.Client/client/api/IAsyncBasicConsumer.cs

@@ -11,7 +11,7 @@ public interface IAsyncBasicConsumer
         /// Retrieve the <see cref="IChannel"/> this consumer is associated with,
         ///  for use in acknowledging received messages, for instance.
         /// </summary>
-        IChannel Model { get; }
+        IChannel Channel { get; }
 
         /// <summary>
         /// Signalled when the consumer gets cancelled.
@@ -59,6 +59,6 @@ Task HandleBasicDeliver(string consumerTag,
         ///  </summary>
         ///  <param name="channel"> Common AMQP channel.</param>
         /// <param name="reason"> Information about the reason why a particular channel, session, or connection was destroyed.</param>
-        Task HandleModelShutdown(object channel, ShutdownEventArgs reason);
+        Task HandleChannelShutdown(object channel, ShutdownEventArgs reason);
     }
 }

projects/RabbitMQ.Client/client/api/IBasicConsumer.cs

@@ -39,7 +39,7 @@ namespace RabbitMQ.Client
     ///receive messages from a queue by subscription.</summary>
     /// <remarks>
     /// <para>
-    /// See IModel.BasicConsume, IModel.BasicCancel.
+    /// See IChannel.BasicConsume, IChannel.BasicCancel.
     /// </para>
     /// <para>
     /// Note that the "Handle*" methods run in the connection's
@@ -54,7 +54,7 @@ public interface IBasicConsumer
         /// Retrieve the <see cref="IChannel"/> this consumer is associated with,
         ///  for use in acknowledging received messages, for instance.
         /// </summary>
-        IChannel Model { get; }
+        IChannel Channel { get; }
 
         /// <summary>
         /// Signalled when the consumer gets cancelled.
@@ -102,6 +102,6 @@ void HandleBasicDeliver(string consumerTag,
         ///  </summary>
         ///  <param name="channel"> Common AMQP channel.</param>
         /// <param name="reason"> Information about the reason why a particular channel, session, or connection was destroyed.</param>
-        void HandleModelShutdown(object channel, ShutdownEventArgs reason);
+        void HandleChannelShutdown(object channel, ShutdownEventArgs reason);
     }
 }

projects/RabbitMQ.Client/client/api/IChannel.cs

@@ -128,7 +128,7 @@ public interface IChannel : IDisposable
         ///
         /// Examples of cases where this event will be signalled
         /// include exceptions thrown in <see cref="IBasicConsumer"/> methods, or
-        /// exceptions thrown in <see cref="ModelShutdown"/> delegates etc.
+        /// exceptions thrown in <see cref="ChannelShutdown"/> delegates etc.
         /// </summary>
         event EventHandler<CallbackExceptionEventArgs> CallbackException;
 
@@ -141,7 +141,7 @@ public interface IChannel : IDisposable
         /// If the channel is already destroyed at the time an event
         /// handler is added to this event, the event handler will be fired immediately.
         /// </remarks>
-        event EventHandler<ShutdownEventArgs> ModelShutdown;
+        event EventHandler<ShutdownEventArgs> ChannelShutdown;
 
         /// <summary>
         /// Acknowledge one or more delivered message(s).