Cleanup unnecessary dispatcher channel methods

Author: danielmarbach

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherBase.cs

@@ -31,12 +31,6 @@ public IAsyncBasicConsumer GetAndRemoveConsumer(string tag)
             return _consumers.Remove(tag, out IAsyncBasicConsumer? consumer) ? consumer : GetDefaultOrFallbackConsumer();
         }
 
-        public void Shutdown(ShutdownEventArgs reason)
-        {
-            DoShutdownConsumers(reason);
-            InternalShutdown();
-        }
-
         public Task ShutdownAsync(ShutdownEventArgs reason)
         {
             DoShutdownConsumers(reason);
@@ -54,8 +48,6 @@ private void DoShutdownConsumers(ShutdownEventArgs reason)
 
         protected abstract void ShutdownConsumer(IAsyncBasicConsumer consumer, ShutdownEventArgs reason);
 
-        protected abstract void InternalShutdown();
-
         protected abstract Task InternalShutdownAsync();
 
         // Do not inline as it's not the default case on a hot path

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs

@@ -114,53 +114,6 @@ public void Quiesce()
             _quiesce = true;
         }
 
-        public void WaitForShutdown()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (_quiesce)
-            {
-                try
-                {
-                    if (false == _reader.Completion.Wait(TimeSpan.FromSeconds(2)))
-                    {
-                        ESLog.Warn("consumer dispatcher did not shut down in a timely fashion (sync)");
-                    }
-                    if (false == _worker.Wait(TimeSpan.FromSeconds(2)))
-                    {
-                        ESLog.Warn("consumer dispatcher did not shut down in a timely fashion (sync)");
-                    }
-                }
-                catch (AggregateException aex)
-                {
-                    AggregateException aexf = aex.Flatten();
-                    bool foundUnexpectedException = false;
-                    foreach (Exception innerAexf in aexf.InnerExceptions)
-                    {
-                        if (false == (innerAexf is OperationCanceledException))
-                        {
-                            foundUnexpectedException = true;
-                            break;
-                        }
-                    }
-                    if (foundUnexpectedException)
-                    {
-                        ESLog.Warn("consumer dispatcher task had unexpected exceptions");
-                    }
-                }
-                catch (OperationCanceledException)
-                {
-                }
-            }
-            else
-            {
-                throw new InvalidOperationException("WaitForShutdown called but _quiesce is false");
-            }
-        }
-
         public async Task WaitForShutdownAsync()
         {
             if (_disposed)
@@ -209,11 +162,6 @@ protected sealed override void ShutdownConsumer(IAsyncBasicConsumer consumer, Sh
             _writer.TryWrite(WorkStruct.CreateShutdown(consumer, reason));
         }
 
-        protected override void InternalShutdown()
-        {
-            _writer.Complete();
-        }
-
         protected override Task InternalShutdownAsync()
         {
             _writer.Complete();

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/IConsumerDispatcher.cs

@@ -62,9 +62,6 @@ ValueTask HandleBasicDeliverAsync(string consumerTag,
 
         void Quiesce();
 
-        void Shutdown(ShutdownEventArgs reason);
-        void WaitForShutdown();
-
         Task ShutdownAsync(ShutdownEventArgs reason);
         Task WaitForShutdownAsync();
     }