Revert "Created ConsumerCancelled event on ConsumerCancellation class to be fired when a consumer has been canced by the broker" (#912)

This reverts commit d30c051

Author: Pliner

Source/EasyNetQ/Consumer/ConsumerCancellation.cs

@@ -1,16 +1,9 @@
-
-using System;
+using System;
 
 namespace EasyNetQ.Consumer
 {
     public class ConsumerCancellation : IDisposable
     {
-       
-        public delegate void ConsumerCancel(object queue);
-        // This event will fire whenever this class is disposed. It is necessary in order to catch
-        // when the consumer is canceled by the broker as well as the user. 
-        public event ConsumerCancel ConsumerCancelled;
-
         private readonly Action onCancellation;
 
         public ConsumerCancellation(Action onCancellation)
@@ -24,10 +17,5 @@ public void Dispose()
         {
             onCancellation();
         }
-
-        public void OnCancel(object queue)
-        {
-            ConsumerCancelled?.Invoke(queue);
-        }
     }
 }

Source/EasyNetQ/Consumer/ExclusiveConsumer.cs

@@ -27,8 +27,6 @@ public class ExclusiveConsumer : IConsumer
 
         private readonly IList<IDisposable> disposables = new List<IDisposable>();
 
-        private ConsumerCancellation consumerCancellation;
-
         public ExclusiveConsumer(
             IQueue queue,
             Func<byte[], MessageProperties, MessageReceivedInfo, Task> onMessage,
@@ -60,9 +58,8 @@ public IDisposable StartConsuming()
             disposables.Add(Timers.Start(s => StartConsumingInternal(), RestartConsumingPeriod, RestartConsumingPeriod));
 
             StartConsumingInternal();
-
-            consumerCancellation = new ConsumerCancellation(Dispose);
-            return consumerCancellation;
+            
+            return new ConsumerCancellation(Dispose);   
         }
 
         private void StartConsumingInternal()
@@ -118,9 +115,7 @@ public void Dispose()
                 return;
 
             disposed = true;
-
-            consumerCancellation.OnCancel(queue);
-
+            
             eventBus.Publish(new StoppedConsumingEvent(this));
 
             foreach (var disposal in disposables)

Source/EasyNetQ/Consumer/PersistentConsumer.cs

@@ -22,8 +22,6 @@ public class PersistentConsumer : IConsumer
 
         private readonly IList<IDisposable> subscriptions = new List<IDisposable>();
 
-        private ConsumerCancellation consumerCancellation;
-
         public PersistentConsumer(
             IQueue queue, 
             Func<byte[], MessageProperties, MessageReceivedInfo, Task> onMessage, 
@@ -54,8 +52,7 @@ public IDisposable StartConsuming()
 
             StartConsumingInternal();
 
-            consumerCancellation = new ConsumerCancellation(Dispose);
-            return consumerCancellation;
+            return new ConsumerCancellation(Dispose);
         }
 
         private void StartConsumingInternal()
@@ -104,8 +101,6 @@ public void Dispose()
 
             disposed = true;
 
-            consumerCancellation.OnCancel(queue);
-
             eventBus.Publish(new StoppedConsumingEvent(this));
 
             foreach (var subscription in subscriptions)

Source/EasyNetQ/Consumer/PersistentMultipleConsumer.cs

@@ -23,8 +23,6 @@ public class PersistentMultipleConsumer : IConsumer
 
         private readonly IList<IDisposable> subscriptions = new List<IDisposable>();
 
-        private ConsumerCancellation consumerCancellation;
-
         public PersistentMultipleConsumer(
             ICollection<Tuple<IQueue, Func<byte[], MessageProperties, MessageReceivedInfo, Task>>> queueConsumerPairs,
             IPersistentConnection connection,
@@ -52,8 +50,7 @@ public IDisposable StartConsuming()
 
             StartConsumingInternal();
 
-            consumerCancellation = new ConsumerCancellation(Dispose);
-            return consumerCancellation;
+            return new ConsumerCancellation(Dispose);
         }
 
         private void StartConsumingInternal()
@@ -95,9 +92,7 @@ public void Dispose()
             if (disposed) return;
 
             disposed = true;
-
-            consumerCancellation.OnCancel(queueConsumerPairs);
-
+            
             eventBus.Publish(new StoppedConsumingEvent(this));
 
             foreach (var subscription in subscriptions)

Source/EasyNetQ/Consumer/TransientConsumer.cs

@@ -16,8 +16,6 @@ public class TransientConsumer : IConsumer
 
         private IInternalConsumer internalConsumer;
 
-        private ConsumerCancellation consumerCancellation;
-
         public TransientConsumer(
             IQueue queue, 
             Func<byte[], MessageProperties, MessageReceivedInfo, Task> onMessage, 
@@ -60,8 +58,7 @@ public IDisposable StartConsuming()
             else
                 eventBus.Publish(new StartConsumingFailedEvent(this, queue));
 
-            consumerCancellation = new ConsumerCancellation(Dispose);
-            return consumerCancellation;
+            return new ConsumerCancellation(Dispose);
         }
 
         private bool disposed;
@@ -71,8 +68,6 @@ public void Dispose()
             if (disposed) return;
             disposed = true;
 
-            consumerCancellation.OnCancel(queue);
-
             eventBus.Publish(new StoppedConsumingEvent(this));
 
             internalConsumer?.Dispose();