Rename model -> channel, _model -> _channel, etc

Author: lukebakken

projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs

@@ -44,7 +44,7 @@ void IBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bo
 
         public Task HandleBasicConsumeOk(string consumerTag) => Task.CompletedTask;
 
-        public Task HandleModelShutdown(object model, ShutdownEventArgs reason) => Task.CompletedTask;
+        public Task HandleModelShutdown(object channel, ShutdownEventArgs reason) => Task.CompletedTask;
 
         public IChannel Model { get; }
 
@@ -68,7 +68,7 @@ void IBasicConsumer.HandleBasicConsumeOk(string consumerTag)
         {
         }
 
-        void IBasicConsumer.HandleModelShutdown(object model, ShutdownEventArgs reason)
+        void IBasicConsumer.HandleModelShutdown(object channel, ShutdownEventArgs reason)
         {
         }
 

projects/Benchmarks/Networking/Networking_BasicDeliver_Commons.cs

@@ -12,23 +12,23 @@ 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 model = connection.CreateModel())
+            using (var channel = connection.CreateModel())
             {
-                var queue = model.QueueDeclare();
+                var queue = channel.QueueDeclare();
                 var consumed = 0;
-                var consumer = new EventingBasicConsumer(model);
+                var consumer = new EventingBasicConsumer(channel);
                 consumer.Received += (s, args) =>
                 {
                     if (Interlocked.Increment(ref consumed) == messageCount)
                     {
                         tcs.SetResult(true);
                     }
                 };
-                model.BasicConsume(queue.QueueName, true, consumer);
+                channel.BasicConsume(queue.QueueName, true, consumer);
 
                 for (int i = 0; i < messageCount; i++)
                 {
-                    model.BasicPublish("", queue.QueueName, body);
+                    channel.BasicPublish("", queue.QueueName, body);
                 }
 
                 await tcs.Task;

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

@@ -21,10 +21,10 @@ public AsyncDefaultBasicConsumer()
         /// <summary>
         /// Constructor which sets the Model property to the given value.
         /// </summary>
-        /// <param name="model">Common AMQP model.</param>
-        public AsyncDefaultBasicConsumer(IChannel model)
+        /// <param name="channel">Common AMQP channel.</param>
+        public AsyncDefaultBasicConsumer(IChannel channel)
         {
-            Model = model;
+            Model = channel;
         }
 
         /// <summary>
@@ -120,11 +120,11 @@ public virtual Task HandleBasicDeliver(string consumerTag,
         }
 
         /// <summary>
-        /// Called when the model (channel) this consumer was registered on terminates.
+        /// Called when the channel (channel) this consumer was registered on terminates.
         /// </summary>
-        /// <param name="model">A channel this consumer was registered on.</param>
+        /// <param name="channel">A channel this consumer was registered on.</param>
         /// <param name="reason">Shutdown context.</param>
-        public virtual Task HandleModelShutdown(object model, ShutdownEventArgs reason)
+        public virtual Task HandleModelShutdown(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 model, ShutdownEventArgs reason)
+        void IBasicConsumer.HandleModelShutdown(object channel, ShutdownEventArgs reason)
         {
             throw new InvalidOperationException("Should never be called. Enable 'DispatchConsumersAsync'.");
         }

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

@@ -60,10 +60,10 @@ public DefaultBasicConsumer()
         /// <summary>
         /// Constructor which sets the Model property to the given value.
         /// </summary>
-        /// <param name="model">Common AMQP model.</param>
-        public DefaultBasicConsumer(IChannel model)
+        /// <param name="channel">Common AMQP channel.</param>
+        public DefaultBasicConsumer(IChannel channel)
         {
-            Model = model;
+            Model = channel;
         }
 
         /// <summary>
@@ -159,11 +159,11 @@ public virtual void HandleBasicDeliver(string consumerTag,
         }
 
         /// <summary>
-        /// Called when the model (channel) this consumer was registered on terminates.
+        /// Called when the channel (channel) this consumer was registered on terminates.
         /// </summary>
-        /// <param name="model">A channel this consumer was registered on.</param>
+        /// <param name="channel">A channel this consumer was registered on.</param>
         /// <param name="reason">Shutdown context.</param>
-        public virtual void HandleModelShutdown(object model, ShutdownEventArgs reason)
+        public virtual void HandleModelShutdown(object channel, ShutdownEventArgs reason)
         {
             ShutdownReason = reason;
             OnCancel(_consumerTags.ToArray());

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

@@ -55,10 +55,10 @@ Task HandleBasicDeliver(string consumerTag,
             ReadOnlyMemory<byte> body);
 
         /// <summary>
-        ///  Called when the model shuts down.
+        ///  Called when the channel shuts down.
         ///  </summary>
-        ///  <param name="model"> Common AMQP model.</param>
-        /// <param name="reason"> Information about the reason why a particular model, session, or connection was destroyed.</param>
-        Task HandleModelShutdown(object model, ShutdownEventArgs reason);
+        ///  <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);
     }
 }

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

@@ -98,10 +98,10 @@ void HandleBasicDeliver(string consumerTag,
             ReadOnlyMemory<byte> body);
 
         /// <summary>
-        ///  Called when the model shuts down.
+        ///  Called when the channel shuts down.
         ///  </summary>
-        ///  <param name="model"> Common AMQP model.</param>
-        /// <param name="reason"> Information about the reason why a particular model, session, or connection was destroyed.</param>
-        void HandleModelShutdown(object model, ShutdownEventArgs reason);
+        ///  <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);
     }
 }

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

@@ -83,12 +83,12 @@ public interface IChannel : IDisposable
         IBasicConsumer DefaultConsumer { get; set; }
 
         /// <summary>
-        /// Returns true if the model is no longer in a state where it can be used.
+        /// Returns true if the channel is no longer in a state where it can be used.
         /// </summary>
         bool IsClosed { get; }
 
         /// <summary>
-        /// Returns true if the model is still in a state where it can be used.
+        /// Returns true if the channel is still in a state where it can be used.
         /// Identical to checking if <see cref="CloseReason"/> equals null.</summary>
         bool IsOpen { get; }
 
@@ -124,7 +124,7 @@ public interface IChannel : IDisposable
         event EventHandler<BasicReturnEventArgs> BasicReturn;
 
         /// <summary>
-        /// Signalled when an exception occurs in a callback invoked by the model.
+        /// Signalled when an exception occurs in a callback invoked by the channel.
         ///
         /// Examples of cases where this event will be signalled
         /// include exceptions thrown in <see cref="IBasicConsumer"/> methods, or
@@ -135,10 +135,10 @@ public interface IChannel : IDisposable
         event EventHandler<FlowControlEventArgs> FlowControl;
 
         /// <summary>
-        /// Notifies the destruction of the model.
+        /// Notifies the destruction of the channel.
         /// </summary>
         /// <remarks>
-        /// If the model is already destroyed at the time an event
+        /// 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;

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

@@ -226,7 +226,7 @@ public interface IConnection : INetworkConnection, IDisposable
         void Close(ushort reasonCode, string reasonText, TimeSpan timeout, bool abort);
 
         /// <summary>
-        /// Create and return a fresh channel, session, and model.
+        /// Create and return a fresh channel, session, and channel.
         /// </summary>
         IChannel CreateModel();
     }