Rename all IModel to IChannel

Author: lukebakken

projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs

@@ -46,7 +46,7 @@ void IBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bo
 
         public Task HandleModelShutdown(object model, ShutdownEventArgs reason) => Task.CompletedTask;
 
-        public IModel Model { get; }
+        public IChannel Model { get; }
 
         event EventHandler<ConsumerEventArgs> IBasicConsumer.ConsumerCancelled
         {

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

@@ -22,14 +22,14 @@ public AsyncDefaultBasicConsumer()
         /// Constructor which sets the Model property to the given value.
         /// </summary>
         /// <param name="model">Common AMQP model.</param>
-        public AsyncDefaultBasicConsumer(IModel model)
+        public AsyncDefaultBasicConsumer(IChannel model)
         {
             Model = model;
         }
 
         /// <summary>
         /// Retrieve the consumer tags this consumer is registered as; to be used when discussing this consumer
-        /// with the server, for instance with <see cref="IModel.BasicCancel"/>.
+        /// with the server, for instance with <see cref="IChannel.BasicCancel"/>.
         /// </summary>
         public string[] ConsumerTags
         {
@@ -45,7 +45,7 @@ public string[] ConsumerTags
         public bool IsRunning { get; protected set; }
 
         /// <summary>
-        /// If our <see cref="IModel"/> shuts down, this property will contain a description of the reason for the
+        /// If our <see cref="IChannel"/> shuts down, this property will contain a description of the reason for the
         /// shutdown. Otherwise it will contain null. See <see cref="ShutdownEventArgs"/>.
         /// </summary>
         public ShutdownEventArgs ShutdownReason { get; protected set; }
@@ -61,10 +61,10 @@ public event AsyncEventHandler<ConsumerEventArgs> ConsumerCancelled
         private AsyncEventingWrapper<ConsumerEventArgs> _consumerCancelledWrapper;
 
         /// <summary>
-        /// Retrieve the <see cref="IModel"/> this consumer is associated with,
+        /// Retrieve the <see cref="IChannel"/> this consumer is associated with,
         ///  for use in acknowledging received messages, for instance.
         /// </summary>
-        public IModel Model { get; set; }
+        public IChannel Model { get; set; }
 
         /// <summary>
         ///  Called when the consumer is cancelled for reasons other than by a basicCancel:
@@ -101,7 +101,7 @@ public virtual Task HandleBasicConsumeOk(string consumerTag)
         /// Called each time a message is delivered for this consumer.
         /// </summary>
         /// <remarks>
-        /// This is a no-op implementation. It will not acknowledge deliveries via <see cref="IModel.BasicAck"/>
+        /// This is a no-op implementation. It will not acknowledge deliveries via <see cref="IChannel.BasicAck"/>
         /// if consuming in automatic acknowledgement mode.
         /// Subclasses must copy or fully use delivery body before returning.
         /// Accessing the body at a later point is unsafe as its memory can

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

@@ -99,7 +99,7 @@ public BasicGetResult(ulong deliveryTag, bool redelivered, string exchange, stri
         public ReadOnlyMemory<byte> Body { get; }
 
         /// <summary>
-        /// Retrieve the delivery tag for this message. See also <see cref="IModel.BasicAck"/>.
+        /// Retrieve the delivery tag for this message. See also <see cref="IChannel.BasicAck"/>.
         /// </summary>
         public ulong DeliveryTag { get; }
 

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

@@ -61,14 +61,14 @@ public DefaultBasicConsumer()
         /// Constructor which sets the Model property to the given value.
         /// </summary>
         /// <param name="model">Common AMQP model.</param>
-        public DefaultBasicConsumer(IModel model)
+        public DefaultBasicConsumer(IChannel model)
         {
             Model = model;
         }
 
         /// <summary>
         /// Retrieve the consumer tags this consumer is registered as; to be used to identify
-        /// this consumer, for example, when cancelling it with <see cref="IModel.BasicCancel"/>.
+        /// this consumer, for example, when cancelling it with <see cref="IChannel.BasicCancel"/>.
         /// This value is an array because a single consumer instance can be reused to consume on
         /// multiple channels.
         /// </summary>
@@ -86,7 +86,7 @@ public string[] ConsumerTags
         public bool IsRunning { get; protected set; }
 
         /// <summary>
-        /// If our <see cref="IModel"/> shuts down, this property will contain a description of the reason for the
+        /// If our <see cref="IChannel"/> shuts down, this property will contain a description of the reason for the
         /// shutdown. Otherwise it will contain null. See <see cref="ShutdownEventArgs"/>.
         /// </summary>
         public ShutdownEventArgs ShutdownReason { get; protected set; }
@@ -102,10 +102,10 @@ public event EventHandler<ConsumerEventArgs> ConsumerCancelled
         private EventingWrapper<ConsumerEventArgs> _consumerCancelledWrapper;
 
         /// <summary>
-        /// Retrieve the <see cref="IModel"/> this consumer is associated with,
+        /// Retrieve the <see cref="IChannel"/> this consumer is associated with,
         ///  for use in acknowledging received messages, for instance.
         /// </summary>
-        public IModel Model { get; set; }
+        public IChannel Model { get; set; }
 
         /// <summary>
         ///  Called when the consumer is cancelled for reasons other than by a basicCancel:
@@ -141,7 +141,7 @@ public virtual void HandleBasicConsumeOk(string consumerTag)
         /// Called each time a message is delivered for this consumer.
         /// </summary>
         /// <remarks>
-        /// This is a no-op implementation. It will not acknowledge deliveries via <see cref="IModel.BasicAck"/>
+        /// This is a no-op implementation. It will not acknowledge deliveries via <see cref="IChannel.BasicAck"/>
         /// if consuming in automatic acknowledgement mode.
         /// Subclasses must copy or fully use delivery body before returning.
         /// Accessing the body at a later point is unsafe as its memory can

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

@@ -8,10 +8,10 @@ namespace RabbitMQ.Client
     public interface IAsyncBasicConsumer
     {
         /// <summary>
-        /// Retrieve the <see cref="IModel"/> this consumer is associated with,
+        /// Retrieve the <see cref="IChannel"/> this consumer is associated with,
         ///  for use in acknowledging received messages, for instance.
         /// </summary>
-        IModel Model { get; }
+        IChannel Model { get; }
 
         /// <summary>
         /// Signalled when the consumer gets cancelled.
@@ -43,7 +43,7 @@ public interface IAsyncBasicConsumer
         /// </summary>
         /// <remarks>
         /// Does nothing with the passed in information.
-        /// Note that in particular, some delivered messages may require acknowledgement via <see cref="IModel.BasicAck"/>.
+        /// Note that in particular, some delivered messages may require acknowledgement via <see cref="IChannel.BasicAck"/>.
         /// The implementation of this method in this class does NOT acknowledge such messages.
         /// </remarks>
         Task HandleBasicDeliver(string consumerTag,

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

@@ -51,10 +51,10 @@ namespace RabbitMQ.Client
     public interface IBasicConsumer
     {
         /// <summary>
-        /// Retrieve the <see cref="IModel"/> this consumer is associated with,
+        /// Retrieve the <see cref="IChannel"/> this consumer is associated with,
         ///  for use in acknowledging received messages, for instance.
         /// </summary>
-        IModel Model { get; }
+        IChannel Model { get; }
 
         /// <summary>
         /// Signalled when the consumer gets cancelled.
@@ -86,7 +86,7 @@ public interface IBasicConsumer
         /// </summary>
         /// <remarks>
         /// Does nothing with the passed in information.
-        /// Note that in particular, some delivered messages may require acknowledgement via <see cref="IModel.BasicAck"/>.
+        /// Note that in particular, some delivered messages may require acknowledgement via <see cref="IChannel.BasicAck"/>.
         /// The implementation of this method in this class does NOT acknowledge such messages.
         /// </remarks>
         void HandleBasicDeliver(string consumerTag,

…cts/RabbitMQ.Client/client/api/IModel.cs …s/RabbitMQ.Client/client/api/IChannel.csprojects/RabbitMQ.Client/client/api/IModel.cs renamed to projects/RabbitMQ.Client/client/api/IChannel.cs projects/RabbitMQ.Client/client/api/IModel.cs renamed to projects/RabbitMQ.Client/client/api/IChannel.cs

@@ -45,7 +45,7 @@ namespace RabbitMQ.Client
     /// Extends the <see cref="IDisposable"/> interface, so that the "using"
     /// statement can be used to scope the lifetime of a channel when appropriate.
     /// </remarks>
-    public interface IModel : IDisposable
+    public interface IChannel : IDisposable
     {
         /// <summary>
         /// Channel number, unique per connections.
@@ -172,7 +172,7 @@ string BasicConsume(
         /// <summary>
         /// Retrieve an individual message, if
         /// one is available; returns null if the server answers that
-        /// no messages are currently available. See also <see cref="IModel.BasicAck"/>.
+        /// no messages are currently available. See also <see cref="IChannel.BasicAck"/>.
         /// </summary>
         BasicGetResult BasicGet(string queue, bool autoAck);
 

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

@@ -228,6 +228,6 @@ public interface IConnection : INetworkConnection, IDisposable
         /// <summary>
         /// Create and return a fresh channel, session, and model.
         /// </summary>
-        IModel CreateModel();
+        IChannel CreateModel();
     }
 }