Backed out changeset b586ce65fd24

Model should be accessible via event sender. This lets us
avoid adding Model to every event type we have.

Author: michaelklishin

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

@@ -58,7 +58,7 @@ namespace RabbitMQ.Client
     ///</remarks>
     public class DefaultBasicConsumer : IBasicConsumer
     {
-        protected IModel m_model = null;
+        private IModel m_model = null;
         private string m_consumerTag = null;
         private bool m_running = false;
         private ShutdownEventArgs m_shutdownReason = null;
@@ -126,7 +126,7 @@ public virtual void OnCancel()
             {
                 foreach (ConsumerCancelledEventHandler h in handler.GetInvocationList())
                 {
-                    h(this, new ConsumerEventArgs(m_model, m_consumerTag));
+                    h(this, new ConsumerEventArgs(m_consumerTag));
                 }
             }
         }

projects/client/RabbitMQ.Client/src/client/events/BasicDeliverEventArgs.cs

@@ -46,7 +46,6 @@ namespace RabbitMQ.Client.Events
     ///from an AMQP broker within the Basic content-class.</summary>
     public class BasicDeliverEventArgs : EventArgs
     {
-        private IModel m_model;
         private string m_consumerTag;
         private ulong m_deliveryTag;
         private bool m_redelivered;
@@ -60,16 +59,14 @@ public BasicDeliverEventArgs() { }
 
         ///<summary>Constructor that fills the event's properties from
         ///its arguments.</summary>
-        public BasicDeliverEventArgs(IModel model,
-                                     string consumerTag,
+        public BasicDeliverEventArgs(string consumerTag,
                                      ulong deliveryTag,
                                      bool redelivered,
                                      string exchange,
                                      string routingKey,
                                      IBasicProperties properties,
                                      byte[] body)
         {
-            m_model       = model;
             m_consumerTag = consumerTag;
             m_deliveryTag = deliveryTag;
             m_redelivered = redelivered;
@@ -79,14 +76,6 @@ public BasicDeliverEventArgs(IModel model,
             m_body = body;
         }
 
-        ///<summary>The model of the consumer that the message
-        ///was delivered to.</summary>
-        public IModel Model
-        {
-            get { return m_model; }
-            set { m_model = value; }
-        }
-
         ///<summary>The consumer tag of the consumer that the message
         ///was delivered to.</summary>
         public string ConsumerTag

projects/client/RabbitMQ.Client/src/client/events/ConsumerEventArgs.cs

@@ -47,20 +47,14 @@ namespace RabbitMQ.Client.Events
     public class ConsumerEventArgs: EventArgs
     {
         private readonly string m_consumerTag;
-        private readonly IModel m_model;
 
         ///<summary>Construct an event containing the consumer-tag of
         ///the consumer the event relates to.</summary>
-        public ConsumerEventArgs(IModel model, string consumerTag)
+        public ConsumerEventArgs(string consumerTag)
         {
-            m_model = model;
             m_consumerTag = consumerTag;
         }
 
-        ///<summary>Access the model of the consumer the event
-        ///relates to.</summary>
-        public IModel Model { get { return m_model; } }
-
         ///<summary>Access the consumer-tag of the consumer the event
         ///relates to.</summary>
         public string ConsumerTag { get { return m_consumerTag; } }

projects/client/RabbitMQ.Client/src/client/events/EventingBasicConsumer.cs

@@ -62,7 +62,7 @@ public override void HandleBasicCancelOk(string consumerTag)
             base.HandleBasicCancelOk(consumerTag);
 
             if (Unregistered != null) {
-                Unregistered(this, new ConsumerEventArgs(m_model, consumerTag));
+                Unregistered(this, new ConsumerEventArgs(consumerTag));
             }
         }
 
@@ -72,7 +72,7 @@ public override void HandleBasicConsumeOk(string consumerTag)
             base.HandleBasicConsumeOk(consumerTag);
 
             if (Registered != null) {
-                Registered(this, new ConsumerEventArgs(m_model, consumerTag));
+                Registered(this, new ConsumerEventArgs(consumerTag));
             }
         }
 
@@ -93,8 +93,7 @@ public override void HandleBasicDeliver(string consumerTag,
                                     properties,
                                     body);
             if (Received != null) {
-                Received(this, new BasicDeliverEventArgs(m_model,
-                                                         consumerTag,
+                Received(this, new BasicDeliverEventArgs(consumerTag,
                                                          deliveryTag,
                                                          redelivered,
                                                          exchange,

projects/client/Unit/src/unit/TestEventingConsumer.cs

@@ -60,38 +60,32 @@ public void TestEventingConsumerRegistrationEvents()
 
             bool registeredInvoked = false;
             object registeredSender = null;
-            ConsumerEventArgs registeredArgs = null;
             bool unregisteredInvoked = false;
             object unregisteredSender = null;
-            ConsumerEventArgs unregisteredArgs = null;
 
             EventingBasicConsumer ec = new EventingBasicConsumer(Model);
             ec.Registered += (s, args) =>
             {
                 registeredInvoked = true;
                 registeredSender = s;
-                registeredArgs = args;
             };
 
             ec.Unregistered += (s, args) =>
             {
                 unregisteredInvoked = true;
                 unregisteredSender = s;
-                unregisteredArgs = args;
             };
 
             string tag = Model.BasicConsume(q, false, ec);
 
             Assert.IsTrue(registeredInvoked);
             Assert.IsNotNull(registeredSender);
             Assert.AreEqual(ec, registeredSender);
-            Assert.AreEqual(Model, registeredArgs.Model);
 
             Model.BasicCancel(tag);
             Assert.IsTrue(unregisteredInvoked);
             Assert.IsNotNull(unregisteredSender);
             Assert.AreEqual(ec, unregisteredSender);
-            Assert.AreEqual(Model, unregisteredArgs.Model);
         }
 
         [Test]
@@ -102,14 +96,12 @@ public void TestEventingConsumerDeliveryEvents()
 
             bool receivedInvoked = false;
             object receivedSender = null;
-            BasicDeliverEventArgs receivedArgs = null;
 
             EventingBasicConsumer ec = new EventingBasicConsumer(Model);
             ec.Received += (s, args) =>
             {
                 receivedInvoked = true;
                 receivedSender = s;
-                receivedArgs = args;
 
                 Monitor.PulseAll(o);
             };
@@ -121,7 +113,6 @@ public void TestEventingConsumerDeliveryEvents()
             Assert.IsTrue(receivedInvoked);
             Assert.IsNotNull(receivedSender);
             Assert.AreEqual(ec, receivedSender);
-            Assert.AreEqual(Model, receivedArgs.Model);
 
             bool shutdownInvoked = false;
             object shutdownSender = null;