* Get lazy function of AmqpString working and start to test it.

Author: lukebakken

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

@@ -35,21 +35,25 @@
 
 namespace RabbitMQ.Client
 {
-    // TODO lazy string value
     public abstract class AmqpString : IEquatable<AmqpString>, IComparable<AmqpString>
     {
-        private readonly string _value;
+        private string _value;
+        private readonly Encoding _encoding;
         private readonly ReadOnlyMemory<byte> _stringBytes;
         private readonly int _byteCount;
 
         protected AmqpString()
         {
             _value = string.Empty;
+            _encoding = Encoding.UTF8;
             _stringBytes = ReadOnlyMemory<byte>.Empty;
+            _byteCount = 0;
         }
 
         public AmqpString(ReadOnlyMemory<byte> stringBytes)
         {
+            _value = null;
+            _encoding = Encoding.UTF8;
             _stringBytes = stringBytes;
             _byteCount = _stringBytes.Length;
         }
@@ -63,6 +67,8 @@ public AmqpString(string value, ushort maxLen, Encoding encoding,
         public AmqpString(string value, ushort maxLen, Encoding encoding, string validatorRegex,
             bool strictValidation = false)
         {
+            _encoding = encoding;
+
             /*
              * Note:
              * RabbitMQ does hardly any validation for names, only stripping off CR/LF
@@ -100,6 +106,8 @@ public AmqpString(string value, ushort maxLen, Encoding encoding, string validat
 
         public int ByteCount => _byteCount;
 
+        internal bool HasString => _value != null;
+
         public bool IsEmpty
         {
             get
@@ -117,25 +125,17 @@ public bool IsEmpty
 
         public bool Contains(string value)
         {
-            if (_value is null)
-            {
-                // TODO
-                return false;
-            }
-            else
-            {
-                return _value.Contains(value);
-            }
+            return Value.Contains(value);
         }
 
         public override string ToString()
         {
-            return _value;
+            return Value;
         }
 
         public static implicit operator string(AmqpString amqpString)
         {
-            return amqpString._value;
+            return amqpString.ToString();
         }
 
         public static implicit operator ReadOnlyMemory<byte>(AmqpString amqpString)
@@ -171,26 +171,33 @@ public override bool Equals(object obj)
 
         public bool Equals(AmqpString other)
         {
-            return _value == other._value;
+            if (_value == null)
+            {
+                throw new InvalidOperationException("TODO");
+            }
+            else
+            {
+                return _value == other._value;
+            }
         }
 
         public override int GetHashCode()
         {
-            return _value.GetHashCode();
-        }
-
-        public int CompareTo(AmqpString other)
-        {
-            if (_value is null)
+            if (_value == null)
             {
-                throw new InvalidOperationException("[CRITICAL] should not see this");
+                throw new InvalidOperationException("TODO");
             }
             else
             {
-                return _value.CompareTo(other._value);
+                return _value.GetHashCode();
             }
         }
 
+        public int CompareTo(AmqpString other)
+        {
+            return Value.CompareTo(other.Value);
+        }
+
         public static bool operator ==(AmqpString amqpString1, AmqpString amqpString2)
         {
             if (amqpString1 is null || amqpString2 is null)
@@ -216,10 +223,23 @@ protected virtual string FixUp(string value)
             return value;
         }
 
+        // TODO remove
         private static bool isAscii(string value)
         {
             return Encoding.UTF8.GetByteCount(value) == value.Length;
         }
+
+        private string Value
+        {
+            get
+            {
+                if (_value == null)
+                {
+                    _value = _encoding.GetString(_stringBytes.ToArray());
+                }
+                return _value;
+            }
+        }
     }
 
     /*

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

@@ -155,7 +155,7 @@ internal static Activity Deliver(BasicDeliverEventArgs deliverEventArgs)
             if (activity != null && activity.IsAllDataRequested)
             {
                 PopulateMessagingTags("deliver",
-                    routingKey,
+                    deliverEventArgs.RoutingKey,
                     deliverEventArgs.Exchange,
                     deliverEventArgs.DeliveryTag,
                     deliverEventArgs.BasicProperties,

projects/Test/SequentialIntegration/TestActivitySource.cs

@@ -163,13 +163,13 @@ public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOpera
             using (ActivityListener activityListener = StartActivityListener(activities))
             {
                 await Task.Delay(500);
-                string queue = $"queue-{Guid.NewGuid()}";
+                QueueName queue = new QueueName($"queue-{Guid.NewGuid()}");
                 const string msg = "for basic.get";
 
                 try
                 {
                     await _channel.QueueDeclareAsync(queue, false, false, false, null);
-                    await _channel.BasicPublishAsync(ExchangeName.Empty, queue, Encoding.UTF8.GetBytes(msg), mandatory: true);
+                    await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)queue, Encoding.UTF8.GetBytes(msg), mandatory: true);
                     await _channel.WaitForConfirmsOrDieAsync();
                     QueueDeclareOk ok = await _channel.QueueDeclarePassiveAsync(queue);
                     Assert.Equal(1u, ok.MessageCount);
@@ -201,7 +201,7 @@ private static ActivityListener StartActivityListener(List<Activity> activities)
             return activityListener;
         }
 
-        private void AssertActivityData(bool useRoutingKeyAsOperationName, string queueName,
+        private void AssertActivityData(bool useRoutingKeyAsOperationName, QueueName queueName,
             List<Activity> activityList, bool isDeliver = false)
         {
             string childName = isDeliver ? "deliver" : "receive";

projects/Test/Unit/TestAmqpString.cs

@@ -30,6 +30,7 @@
 //---------------------------------------------------------------------------
 
 using System;
+using System.Text;
 using RabbitMQ.Client;
 using Xunit;
 
@@ -108,5 +109,20 @@ public void TestInvalidConsumerTagThrows(string arg)
         {
             Assert.Throws<ArgumentOutOfRangeException>(() => new ConsumerTag(arg, strictValidation: true));
         }
+
+        [Theory]
+        [InlineData("exchange-ABC:123.abc_456")]
+        [InlineData("6PiY80XbjBKnY39R947i2s03cAg261412IS1FzS4uEoJJ6cWZ50P0SJ3S4yqvzx0n4TN4NsROlWyEwaUG4I5Glrj1mI2N28QGbkf5t8Kyo7EavaqME5TrvhPxtJGY1p")]
+        [InlineData("foo_bar_baz")]
+        [InlineData("exchangename-Евгений")]
+        public void TestExchangeName_InitializeFromMemoryIsLazy(string arg)
+        {
+            byte[] mem = Encoding.UTF8.GetBytes(arg);
+            var e = new ExchangeName(mem);
+            Assert.False(e.HasString);
+            string estr = (string)e;
+            Assert.True(e.HasString);
+            Assert.Equal(arg, estr);
+        }
     }
 }