* Replace more use of string with correct types

Author: lukebakken

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -886,7 +886,7 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
 ~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(System.Collections.Generic.IEnumerable<string> hostnames, string clientProvidedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
 ~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(System.Collections.Generic.IEnumerable<string> hostnames, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
 ~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
-~RabbitMQ.Client.ConsumerTag.ConsumerTag(string exchangeName) -> void
+~RabbitMQ.Client.ConsumerTag.ConsumerTag(string consumerTag) -> void
 ~RabbitMQ.Client.Events.BasicDeliverEventArgs.BasicDeliverEventArgs(string consumerTag, ulong deliveryTag, bool redelivered, System.ReadOnlyMemory<byte> exchange, System.ReadOnlyMemory<byte> routingKey, in RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> void
 ~RabbitMQ.Client.Events.QueueNameChangedAfterRecoveryEventArgs.QueueNameChangedAfterRecoveryEventArgs(RabbitMQ.Client.QueueName nameBefore, RabbitMQ.Client.QueueName nameAfter) -> void
 ~RabbitMQ.Client.ExchangeName.ExchangeName(string exchangeName) -> void
@@ -932,7 +932,7 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
 ~RabbitMQ.Client.ICredentialsRefresher.Register(RabbitMQ.Client.ICredentialsProvider provider, RabbitMQ.Client.ICredentialsRefresher.NotifyCredentialRefreshedAsync callback) -> RabbitMQ.Client.ICredentialsProvider
 ~RabbitMQ.Client.PublicationAddress.PublicationAddress(RabbitMQ.Client.ExchangeType exchangeType, RabbitMQ.Client.ExchangeName exchangeName, RabbitMQ.Client.RoutingKey routingKey) -> void
 ~RabbitMQ.Client.QueueName.QueueName(string queueName) -> void
-~RabbitMQ.Client.RoutingKey.RoutingKey(string exchangeName) -> void
+~RabbitMQ.Client.RoutingKey.RoutingKey(string routingKey) -> void
 ~RabbitMQ.Client.TimerBasedCredentialRefresher.Register(RabbitMQ.Client.ICredentialsProvider provider, RabbitMQ.Client.ICredentialsRefresher.NotifyCredentialRefreshedAsync callback) -> RabbitMQ.Client.ICredentialsProvider
 ~RabbitMQ.Client.TopologyRecoveryExceptionHandler.BindingRecoveryExceptionHandlerAsync.get -> System.Func<RabbitMQ.Client.IRecordedBinding, System.Exception, RabbitMQ.Client.IConnection, System.Threading.Tasks.Task>
 ~RabbitMQ.Client.TopologyRecoveryExceptionHandler.BindingRecoveryExceptionHandlerAsync.set -> void

projects/RabbitMQ.Client/client/api/AmqpString.cs

@@ -262,8 +262,8 @@ private RoutingKey() : base()
         {
         }
 
-        public RoutingKey(string exchangeName)
-            : base(exchangeName, 256, Encoding.ASCII)
+        public RoutingKey(string routingKey)
+            : base(routingKey, 256, Encoding.ASCII)
         {
         }
 
@@ -288,8 +288,8 @@ private ConsumerTag() : base()
         {
         }
 
-        public ConsumerTag(string exchangeName)
-            : base(exchangeName, 256, Encoding.ASCII)
+        public ConsumerTag(string consumerTag)
+            : base(consumerTag, 256, Encoding.ASCII)
         {
         }
 

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

@@ -498,12 +498,12 @@ internal async ValueTask RecoverConsumersAsync(AutorecoveringChannel channelToRe
                     _recordedEntitiesSemaphore.Wait();
                 }
 
-                string oldTag = consumer.ConsumerTag;
+                ConsumerTag oldTag = consumer.ConsumerTag;
                 try
                 {
-                    string newTag = await consumer.RecoverAsync(channelToUse)
+                    ConsumerTag newTag = await consumer.RecoverAsync(channelToUse)
                         .ConfigureAwait(false);
-                    RecordedConsumer consumerWithNewConsumerTag = RecordedConsumer.WithNewConsumerTag((ConsumerTag)newTag, consumer);
+                    RecordedConsumer consumerWithNewConsumerTag = RecordedConsumer.WithNewConsumerTag(newTag, consumer);
                     UpdateConsumer(oldTag, newTag, consumerWithNewConsumerTag);
 
                     if (!_consumerTagChangeAfterRecoveryWrapper.IsEmpty)
@@ -544,7 +544,7 @@ await _recordedEntitiesSemaphore.WaitAsync()
                 }
             }
 
-            void UpdateConsumer(string oldTag, string newTag, in RecordedConsumer consumer)
+            void UpdateConsumer(ConsumerTag oldTag, ConsumerTag newTag, in RecordedConsumer consumer)
             {
                 // make sure server-generated tags are re-added
                 _recordedConsumers.Remove(oldTag);

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

@@ -106,9 +106,11 @@ public static RecordedConsumer WithNewQueueName(QueueName newQueueName, in Recor
             return new RecordedConsumer(old.Channel, old.Consumer, old.ConsumerTag, newQueueName, old.AutoAck, old.Exclusive, old.Arguments);
         }
 
-        public Task<string> RecoverAsync(IChannel channel)
+        public async Task<ConsumerTag> RecoverAsync(IChannel channel)
         {
-            return channel.BasicConsumeAsync(Queue, AutoAck, ConsumerTag, false, Exclusive, Arguments, Consumer);
+            string ct = await channel.BasicConsumeAsync(Queue, AutoAck, ConsumerTag, false, Exclusive, Arguments, Consumer)
+                .ConfigureAwait(false);
+            return new ConsumerTag(ct);
         }
     }
 }