* Flesh out AmqpString and ExchangeName

* Ensure tests pass

Author: lukebakken

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -75,7 +75,6 @@ override RabbitMQ.Client.PublicationAddress.ToString() -> string
 override RabbitMQ.Client.ShutdownEventArgs.ToString() -> string
 override RabbitMQ.Client.ShutdownReportEntry.ToString() -> string
 RabbitMQ.Client.AmqpString
-RabbitMQ.Client.AmqpString.AmqpString() -> void
 RabbitMQ.Client.AmqpTcpEndpoint
 RabbitMQ.Client.AmqpTcpEndpoint.AddressFamily.get -> System.Net.Sockets.AddressFamily
 RabbitMQ.Client.AmqpTcpEndpoint.AddressFamily.set -> void
@@ -881,8 +880,10 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.get -> System.TimeSpan
 virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
 ~const RabbitMQ.Client.RabbitMQActivitySource.PublisherSourceName = "RabbitMQ.Client.Publisher" -> string
 ~const RabbitMQ.Client.RabbitMQActivitySource.SubscriberSourceName = "RabbitMQ.Client.Subscriber" -> string
+~override RabbitMQ.Client.AmqpString.ToString() -> string
 ~override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.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
 ~override RabbitMQ.Client.Events.EventingBasicConsumer.HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered, System.ReadOnlyMemory<byte> exchange, System.ReadOnlyMemory<byte> routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
+~RabbitMQ.Client.AmqpString.AmqpString(string value, ushort maxLen, System.Text.Encoding validEncoding, string validatorRegex) -> void
 ~RabbitMQ.Client.AmqpTcpEndpoint.AmqpTcpEndpoint(string hostName, int portOrMinusOne, RabbitMQ.Client.SslOption ssl, uint maxInboundMessageBodySize) -> void
 ~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(RabbitMQ.Client.IEndpointResolver endpointResolver, string clientProvidedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
 ~RabbitMQ.Client.ConnectionFactory.CreateConnectionAsync(string clientProvidedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IConnection>
@@ -940,6 +941,9 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
 ~RabbitMQ.Client.TopologyRecoveryExceptionHandler.ExchangeRecoveryExceptionHandlerAsync.set -> void
 ~RabbitMQ.Client.TopologyRecoveryExceptionHandler.QueueRecoveryExceptionHandlerAsync.get -> System.Func<RabbitMQ.Client.IRecordedQueue, System.Exception, RabbitMQ.Client.IConnection, System.Threading.Tasks.Task>
 ~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.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>
 ~static RabbitMQ.Client.IChannelExtensions.BasicConsumeAsync(this RabbitMQ.Client.IChannel channel, string queue, bool autoAck, RabbitMQ.Client.IBasicConsumer consumer) -> System.Threading.Tasks.Task<string>

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

@@ -29,19 +29,68 @@
 //  Copyright (c) 2011-2020 VMware, Inc. or its affiliates.  All rights reserved.
 //---------------------------------------------------------------------------
 
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+
 namespace RabbitMQ.Client
 {
     public abstract class AmqpString
     {
-        public AmqpString()
+        private readonly string _value;
+        private readonly ReadOnlyMemory<byte> _stringBytes;
+
+        public AmqpString(string value, ushort maxLen, Encoding validEncoding, string validatorRegex)
+        {
+            if (value.Length > maxLen)
+            {
+                throw new ArgumentOutOfRangeException(nameof(value));
+            }
+
+            var re = new Regex(validatorRegex);
+            if (false == re.IsMatch(value))
+            {
+                throw new ArgumentOutOfRangeException(nameof(value));
+            }
+
+            _value = value;
+            _stringBytes = new ReadOnlyMemory<byte>(validEncoding.GetBytes(value));
+        }
+
+        public override string ToString()
+        {
+            return _value;
+        }
+
+        public static implicit operator string(AmqpString amqpString)
+        {
+            return amqpString._value;
+        }
+
+        public static implicit operator ReadOnlyMemory<byte>(AmqpString amqpString)
         {
+            return amqpString._stringBytes;
         }
     }
 
+    /*
+     * From the spec:
+     *  <domain name="exchange-name" type="shortstr" label="exchange name">
+     *    <doc> The exchange name is a client-selected string that identifies the exchange for publish methods. </doc>
+     *    <assert check="length" value="127"/>
+     *    <assert check="regexp" value="^[a-zA-Z0-9-_.:]*$"/>
+     *  </domain>
+     */
     public class ExchangeName : AmqpString
     {
-        public ExchangeName(string exchangeName) : base()
+        public ExchangeName(string exchangeName)
+            : base(exchangeName, 127, Encoding.ASCII, "^[a-zA-Z0-9-_.:]*$")
+        {
+        }
+
+        public static explicit operator ExchangeName(string value)
         {
+            return new ExchangeName(value);
         }
     }
 }

projects/Test/Unit/TestAmqpString.cs

@@ -37,11 +37,23 @@ namespace Test.Unit
 {
     public class TestAmqpString
     {
-        [Fact]
-        public void TestInvalidExchangeNameThrows()
+        [Theory]
+        [InlineData("exchange-ABC:123.abc_456")]
+        [InlineData("6PiY80XbjBKnY39R947i2s03cAg261412IS1FzS4uEoJJ6cWZ50P0SJ3S4yqvzx0n4TN4NsROlWyEwaUG4I5Glrj1mI2N28QGbkf5t8Kyo7EavaqME5TrvhPxtJGY1p")]
+        [InlineData("foo_bar_baz")]
+        public void TestValidExchangeNames(string arg)
         {
-            string e = "exchange-Евгений";
-            Assert.Throws<ArgumentOutOfRangeException>(() => new ExchangeName(e));
+            var e = new ExchangeName(arg);
+            Assert.Equal(e, arg);
+        }
+
+        [Theory]
+        [InlineData("exchange-Евгений")]
+        [InlineData("6PiY80XbjBK9nY39R947i2s03cAg261412IS1FzS4uEoJJ6cWZ50P0SJ3S4yqvzx0n4TN4NsROlWyEwaUG4I5Glrj1mI2N28QGbkf5t8Kyo7EavaqME5TrvhPxtJGY1p")]
+        [InlineData("foo/bar%baz")]
+        public void TestInvalidExchangeNameThrows(string arg)
+        {
+            Assert.Throws<ArgumentOutOfRangeException>(() => new ExchangeName(arg));
         }
     }
 }