do not pass the model in Work.Execute

Author: bollhals

projects/RabbitMQ.Client/client/impl/AsyncConsumerDispatcher.cs

@@ -66,7 +66,7 @@ public void HandleBasicCancel(IBasicConsumer consumer, string consumerTag)
         public void HandleModelShutdown(IBasicConsumer consumer, ShutdownEventArgs reason)
         {
             // the only case where we ignore the shutdown flag.
-            Schedule(new ModelShutdown(consumer, reason));
+            Schedule(new ModelShutdown(consumer, reason, _model));
         }
 
         private void ScheduleUnlessShuttingDown<TWork>(TWork work)

projects/RabbitMQ.Client/client/impl/AsyncConsumerWorkService.cs

@@ -89,7 +89,7 @@ private async Task Loop()
                     {
                         try
                         {
-                            Task task = work.Execute(_model);
+                            Task task = work.Execute();
                             if (!task.IsCompleted)
                             {
                                 await task.ConfigureAwait(false);
@@ -145,7 +145,7 @@ private static async Task HandleConcurrent(Work work, IModel model, SemaphoreSli
             {
                 try
                 {
-                    Task task = work.Execute(model);
+                    Task task = work.Execute();
                     if (!task.IsCompleted)
                     {
                         await task.ConfigureAwait(false);

projects/RabbitMQ.Client/client/impl/BasicCancel.cs

@@ -13,7 +13,7 @@ public BasicCancel(IBasicConsumer consumer, string consumerTag) : base(consumer)
             _consumerTag = consumerTag;
         }
 
-        protected override Task Execute(IModel model, IAsyncBasicConsumer consumer)
+        protected override Task Execute(IAsyncBasicConsumer consumer)
         {
             return consumer.HandleBasicCancel(_consumerTag);
         }

projects/RabbitMQ.Client/client/impl/BasicCancelOk.cs

@@ -13,7 +13,7 @@ public BasicCancelOk(IBasicConsumer consumer, string consumerTag) : base(consume
             _consumerTag = consumerTag;
         }
 
-        protected override Task Execute(IModel model, IAsyncBasicConsumer consumer)
+        protected override Task Execute(IAsyncBasicConsumer consumer)
         {
             return consumer.HandleBasicCancelOk(_consumerTag);
         }

projects/RabbitMQ.Client/client/impl/BasicConsumeOk.cs

@@ -13,7 +13,7 @@ public BasicConsumeOk(IBasicConsumer consumer, string consumerTag) : base(consum
             _consumerTag = consumerTag;
         }
 
-        protected override Task Execute(IModel model, IAsyncBasicConsumer consumer)
+        protected override Task Execute(IAsyncBasicConsumer consumer)
         {
             return consumer.HandleBasicConsumeOk(_consumerTag);
         }

projects/RabbitMQ.Client/client/impl/BasicDeliver.cs

@@ -35,7 +35,7 @@ public BasicDeliver(IBasicConsumer consumer,
             _body = body;
         }
 
-        protected override Task Execute(IModel model, IAsyncBasicConsumer consumer)
+        protected override Task Execute(IAsyncBasicConsumer consumer)
         {
              return consumer.HandleBasicDeliver(_consumerTag,
                      _deliveryTag,

projects/RabbitMQ.Client/client/impl/ModelShutdown.cs

@@ -5,17 +5,19 @@ namespace RabbitMQ.Client.Impl
     internal sealed class ModelShutdown : Work
     {
         private readonly ShutdownEventArgs _reason;
+        private readonly IModel _model;
 
         public override string Context => "HandleModelShutdown";
 
-        public ModelShutdown(IBasicConsumer consumer, ShutdownEventArgs reason) : base(consumer)
+        public ModelShutdown(IBasicConsumer consumer, ShutdownEventArgs reason, IModel model) : base(consumer)
         {
             _reason = reason;
+            _model = model;
         }
 
-        protected override Task Execute(IModel model, IAsyncBasicConsumer consumer)
+        protected override Task Execute(IAsyncBasicConsumer consumer)
         {
-            return consumer.HandleModelShutdown(model, _reason);
+            return consumer.HandleModelShutdown(_model, _reason);
         }
     }
 }

projects/RabbitMQ.Client/client/impl/Work.cs

@@ -13,12 +13,12 @@ protected Work(IBasicConsumer consumer)
             Consumer = (IAsyncBasicConsumer)consumer;
         }
 
-        public Task Execute(IModel model)
+        public Task Execute()
         {
-            return Execute(model, Consumer);
+            return Execute(Consumer);
         }
 
-        protected abstract Task Execute(IModel model, IAsyncBasicConsumer consumer);
+        protected abstract Task Execute(IAsyncBasicConsumer consumer);
 
         public virtual void PostExecute()
         {