Ensure RecordedConsumer has a ConsumerTag

Author: lukebakken

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

@@ -661,22 +661,11 @@ public override string ToString()
 
         public void UnregisterModel(AutorecoveringModel model)
         {
-            lock (_models)
-            {
-                _models.Remove(model);
-            }
-        }
-
-        public void UnregisterModel(AutorecoveringModel model, bool shouldDeleteRecordedConsumers)
-        {
-            if (shouldDeleteRecordedConsumers)
+            lock (_recordedEntitiesLock)
             {
-                lock (_recordedEntitiesLock)
+                foreach (string ct in model.ConsumerTags)
                 {
-                    foreach (string ct in model.ConsumerTags)
-                    {
-                        DeleteRecordedConsumer(ct);
-                    }
+                    DeleteRecordedConsumer(ct);
                 }
             }
 

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

@@ -466,7 +466,7 @@ public void Close(ushort replyCode, string replyText, bool abort)
             }
             finally
             {
-                _connection.UnregisterModel(this, true);
+                _connection.UnregisterModel(this);
             }
         }
 
@@ -483,7 +483,7 @@ public void Close(ShutdownEventArgs reason, bool abort)
             }
             finally
             {
-                _connection.UnregisterModel(this, true);
+                _connection.UnregisterModel(this);
             }
         }
 
@@ -1191,7 +1191,7 @@ public string BasicConsume(
 
             string resultConsumerTag = _delegate.BasicConsume(queue, autoAck, consumerTag, noLocal,
                 exclusive, arguments, consumer);
-            RecordedConsumer rc = new RecordedConsumer(this, queue).
+            RecordedConsumer rc = new RecordedConsumer(this, queue, resultConsumerTag).
                 WithConsumer(consumer).
                 WithExclusive(exclusive).
                 WithAutoAck(autoAck).

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

@@ -29,16 +29,42 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 
 namespace RabbitMQ.Client.Impl
 {
     internal class RecordedConsumer
     {
-        public RecordedConsumer(AutorecoveringModel model, string queue)
+        public RecordedConsumer(AutorecoveringModel model, string queue, string consumerTag)
         {
-            Model = model;
-            Queue = queue;
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            else
+            {
+                Model = model ?? throw new ArgumentNullException(nameof(model));
+            }
+
+            if (string.IsNullOrEmpty(queue))
+            {
+                throw new ArgumentNullException(nameof(consumerTag));
+            }
+            else
+            {
+                Queue = queue;
+            }
+
+            if (string.IsNullOrEmpty(consumerTag))
+            {
+                throw new ArgumentNullException(nameof(consumerTag));
+            }
+            else
+            {
+                ConsumerTag = consumerTag;
+            }
+
         }
 
         public AutorecoveringModel Model { get; }
@@ -60,7 +86,6 @@ public string Recover(IModel channelToUse)
 
         public RecordedConsumer WithArguments(IDictionary<string, object> value)
         {
-            Arguments = value;
             return this;
         }
 
@@ -72,13 +97,20 @@ public RecordedConsumer WithAutoAck(bool value)
 
         public RecordedConsumer WithConsumer(IBasicConsumer value)
         {
-            Consumer = value;
+            Consumer = value ?? throw new System.ArgumentNullException(nameof(value));
             return this;
         }
 
         public RecordedConsumer WithConsumerTag(string value)
         {
-            ConsumerTag = value;
+            if (string.IsNullOrEmpty(value))
+            {
+                throw new System.ArgumentNullException(nameof(value));
+            }
+            else
+            {
+                ConsumerTag = value;
+            }
             return this;
         }
 
@@ -90,7 +122,7 @@ public RecordedConsumer WithExclusive(bool value)
 
         public RecordedConsumer WithQueue(string value)
         {
-            Queue = value;
+            Queue = value ?? throw new System.ArgumentNullException(nameof(value));
             return this;
         }
     }