* Add a ConsumerTag type.

Author: lukebakken

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -258,6 +258,7 @@ RabbitMQ.Client.ConnectionFactoryBase
 RabbitMQ.Client.ConnectionFactoryBase.ConnectionFactoryBase() -> void
 RabbitMQ.Client.ConnectionFactoryBase.SocketFactory -> System.Func<System.Net.Sockets.AddressFamily, RabbitMQ.Client.ITcpClient>
 RabbitMQ.Client.Constants
+RabbitMQ.Client.ConsumerTag
 RabbitMQ.Client.DefaultBasicConsumer
 RabbitMQ.Client.DefaultBasicConsumer.Channel.get -> RabbitMQ.Client.IChannel
 RabbitMQ.Client.DefaultBasicConsumer.Channel.set -> void
@@ -391,7 +392,6 @@ RabbitMQ.Client.Exceptions.WireFormattingException.Offender.get -> object
 RabbitMQ.Client.Exceptions.WireFormattingException.WireFormattingException(string message) -> void
 RabbitMQ.Client.Exceptions.WireFormattingException.WireFormattingException(string message, object offender) -> void
 RabbitMQ.Client.ExchangeName
-RabbitMQ.Client.ExchangeName.ExchangeName() -> void
 RabbitMQ.Client.ExchangeType
 RabbitMQ.Client.ExternalMechanism
 RabbitMQ.Client.ExternalMechanism.ExternalMechanism() -> void
@@ -653,7 +653,6 @@ RabbitMQ.Client.PublicationAddress.PublicationAddress(string exchangeType, strin
 RabbitMQ.Client.QueueDeclareOk
 RabbitMQ.Client.QueueDeclareOk.QueueDeclareOk(string queueName, uint messageCount, uint consumerCount) -> void
 RabbitMQ.Client.QueueName
-RabbitMQ.Client.QueueName.QueueName() -> void
 RabbitMQ.Client.RabbitMQActivitySource
 RabbitMQ.Client.ReadOnlyBasicProperties
 RabbitMQ.Client.ReadOnlyBasicProperties.AppId.get -> string
@@ -689,7 +688,6 @@ RabbitMQ.Client.ReadOnlyBasicProperties.Timestamp.get -> RabbitMQ.Client.AmqpTim
 RabbitMQ.Client.ReadOnlyBasicProperties.Type.get -> string
 RabbitMQ.Client.ReadOnlyBasicProperties.UserId.get -> string
 RabbitMQ.Client.RoutingKey
-RabbitMQ.Client.RoutingKey.RoutingKey() -> void
 RabbitMQ.Client.ShutdownEventArgs
 RabbitMQ.Client.ShutdownEventArgs.Cause.get -> object
 RabbitMQ.Client.ShutdownEventArgs.ClassId.get -> ushort
@@ -892,6 +890,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.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.ExchangeName.ExchangeName(string exchangeName) -> void
 ~RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, System.ReadOnlyMemory<byte> exchange, System.ReadOnlyMemory<byte> routingKey, in RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
@@ -945,6 +944,7 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
 ~RabbitMQ.Client.TopologyRecoveryExceptionHandler.QueueRecoveryExceptionHandlerAsync.set -> void
 ~static RabbitMQ.Client.AmqpString.implicit operator string(RabbitMQ.Client.AmqpString amqpString) -> string
 ~static RabbitMQ.Client.AmqpString.implicit operator System.ReadOnlyMemory<byte>(RabbitMQ.Client.AmqpString amqpString) -> System.ReadOnlyMemory<byte>
+~static RabbitMQ.Client.ConsumerTag.explicit operator RabbitMQ.Client.ConsumerTag(string value) -> RabbitMQ.Client.ConsumerTag
 ~static RabbitMQ.Client.ExchangeName.explicit operator RabbitMQ.Client.ExchangeName(string value) -> RabbitMQ.Client.ExchangeName
 ~static RabbitMQ.Client.IChannelExtensions.AbortAsync(this RabbitMQ.Client.IChannel channel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task
 ~static RabbitMQ.Client.IChannelExtensions.BasicConsumeAsync(this RabbitMQ.Client.IChannel channel, RabbitMQ.Client.IBasicConsumer consumer, string queue, bool autoAck = false, string consumerTag = "", bool noLocal = false, bool exclusive = false, System.Collections.Generic.IDictionary<string, object> arguments = null) -> System.Threading.Tasks.Task<string>
@@ -967,6 +967,7 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
 ~static RabbitMQ.Client.IConnectionExtensions.CloseAsync(this RabbitMQ.Client.IConnection connection, ushort reasonCode, string reasonText, System.TimeSpan timeout) -> System.Threading.Tasks.Task
 ~static RabbitMQ.Client.QueueName.explicit operator RabbitMQ.Client.QueueName(string value) -> RabbitMQ.Client.QueueName
 ~static RabbitMQ.Client.RoutingKey.explicit operator RabbitMQ.Client.RoutingKey(string value) -> RabbitMQ.Client.RoutingKey
+~static readonly RabbitMQ.Client.ConsumerTag.Empty -> RabbitMQ.Client.ConsumerTag
 ~static readonly RabbitMQ.Client.ExchangeName.Empty -> RabbitMQ.Client.ExchangeName
 ~static readonly RabbitMQ.Client.QueueName.Empty -> RabbitMQ.Client.QueueName
 ~static readonly RabbitMQ.Client.RoutingKey.Empty -> RabbitMQ.Client.RoutingKey

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

@@ -40,7 +40,7 @@ public abstract class AmqpString
         private readonly string _value;
         private readonly ReadOnlyMemory<byte> _stringBytes;
 
-        public AmqpString()
+        protected AmqpString()
         {
             _value = string.Empty;
             _stringBytes = ReadOnlyMemory<byte>.Empty;
@@ -112,7 +112,7 @@ public class ExchangeName : AmqpString
     {
         public static readonly ExchangeName Empty = new ExchangeName();
 
-        public ExchangeName() : base()
+        private ExchangeName() : base()
         {
         }
 
@@ -139,7 +139,7 @@ public class QueueName : AmqpString
     {
         public static readonly QueueName Empty = new QueueName();
 
-        public QueueName() : base()
+        private QueueName() : base()
         {
         }
 
@@ -165,7 +165,7 @@ public class RoutingKey : AmqpString
     {
         public static readonly RoutingKey Empty = new RoutingKey();
 
-        public RoutingKey() : base()
+        private RoutingKey() : base()
         {
         }
 
@@ -179,4 +179,29 @@ public static explicit operator RoutingKey(string value)
             return new RoutingKey(value);
         }
     }
+
+    /*
+     * From the spec:
+     *  <domain name="consumer-tag" type="shortstr" label="consumer tag">
+     *    <doc> Identifier for the consumer, valid within the current channel. </doc>
+     *  </domain>
+     */
+    public class ConsumerTag : AmqpString
+    {
+        public static readonly ConsumerTag Empty = new ConsumerTag();
+
+        private ConsumerTag() : base()
+        {
+        }
+
+        public ConsumerTag(string exchangeName)
+            : base(exchangeName, 256, Encoding.ASCII)
+        {
+        }
+
+        public static explicit operator ConsumerTag(string value)
+        {
+            return new ConsumerTag(value);
+        }
+    }
 }

projects/Test/Unit/TestAmqpString.cs

@@ -91,5 +91,22 @@ public void TestInvalidRoutingKeyThrows(string arg)
         {
             Assert.Throws<ArgumentOutOfRangeException>(() => new RoutingKey(arg));
         }
+
+        [Theory]
+        [InlineData("$key-ABC:123.abc_456*blargh///~~~?")]
+        [InlineData("")]
+        public void TestValidConsumerTags(string arg)
+        {
+            var e = new ConsumerTag(arg);
+            Assert.Equal(e, arg);
+        }
+
+        [Theory]
+        [InlineData("key-Евгений")]
+        [InlineData("O0s5Vu04DVyVSMp8twUjsxa0gjcQ9ixV43U10VDVS6wPTQr14mC2x8cK6fl1G0INoJlCs4v7291iOMlBLj171F09a3VBx4sFc7SKaF683YeG9nn5IQAhQZxDE6grPr20EmHPZpMy3TO3R5aW976WTNVPDzZC5vprruJgaBOh8P9ZKRwc77v2nXUnDcz1t2rX84V8l5deX6V3l0Fv4S0bQzSbGdpD5jiPSZ44yBsZVXtv61saCgu0FNGoFSuV9207s6PiY80XbjBK9nY39R947i2s03cAg261412IS1FzS4uEoJJ6cWZ50P0SJ3S4yqvzx0n4TN4NsROlWyEwaUG4I5Glrj1mI2N28QGbkf5t8Kyo7EavaqME5TrvhPxtJGY1p")]
+        public void TestInvalidConsumerTagThrows(string arg)
+        {
+            Assert.Throws<ArgumentOutOfRangeException>(() => new ConsumerTag(arg));
+        }
     }
 }