Code refactor

Author: lukebakken

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

@@ -36,6 +36,8 @@ namespace RabbitMQ.Client.Impl
 {
     internal class RecordedConsumer : IRecordedConsumer
     {
+        private readonly AutorecoveringModel _model;
+
         public RecordedConsumer(AutorecoveringModel model, string queue, string consumerTag)
         {
             if (model is null)
@@ -44,7 +46,7 @@ public RecordedConsumer(AutorecoveringModel model, string queue, string consumer
             }
             else
             {
-                Model = model;
+                _model = model;
             }
 
             if (queue is null)
@@ -55,7 +57,7 @@ public RecordedConsumer(AutorecoveringModel model, string queue, string consumer
             {
                 if (queue == string.Empty)
                 {
-                    Queue = model.CurrentQueue;
+                    Queue = _model.CurrentQueue;
                 }
                 else
                 {
@@ -73,27 +75,23 @@ public RecordedConsumer(AutorecoveringModel model, string queue, string consumer
             }
         }
 
-        public AutorecoveringModel Model { get; }
+        public AutorecoveringModel Model
+        {
+            get { return _model; }
+        }
+
+        public string Queue { get; set; }
+        public string ConsumerTag { get; set; }
         public IDictionary<string, object> Arguments { get; set; }
         public bool AutoAck { get; set; }
-        public IBasicConsumer Consumer { get; set; }
-        public string ConsumerTag { get; set; }
         public bool Exclusive { get; set; }
-        public string Queue { get; set; }
+        public IBasicConsumer Consumer { get; set; }
 
         public string Recover(IModel channelToUse)
         {
-            string queueName = Queue;
-            if (string.IsNullOrEmpty(queueName))
-            {
-                // https://www.rabbitmq.com/amqp-0-9-1-reference.html#domain.queue-name
-                queueName = channelToUse.CurrentQueue;
-            }
-
-            ConsumerTag = channelToUse.BasicConsume(queueName, AutoAck,
+            ConsumerTag = channelToUse.BasicConsume(Queue, AutoAck,
                 ConsumerTag, false, Exclusive,
                 Arguments, Consumer);
-
             return ConsumerTag;
         }
 
@@ -115,29 +113,10 @@ public RecordedConsumer WithConsumer(IBasicConsumer value)
             return this;
         }
 
-        public RecordedConsumer WithConsumerTag(string value)
-        {
-            if (string.IsNullOrEmpty(value))
-            {
-                throw new System.ArgumentNullException(nameof(value));
-            }
-            else
-            {
-                ConsumerTag = value;
-            }
-            return this;
-        }
-
         public RecordedConsumer WithExclusive(bool value)
         {
             Exclusive = value;
             return this;
         }
-
-        public RecordedConsumer WithQueue(string value)
-        {
-            Queue = value ?? throw new System.ArgumentNullException(nameof(value));
-            return this;
-        }
     }
 }