Revert "Merge pull request #828 from ig-sinicyn/feature/message-properties-do-not-throw"

This reverts commit 7ed249c, reversing
changes made to c9e36dc.

(cherry picked from commit ed65854)

Author: michaelklishin

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

@@ -106,14 +106,6 @@ public PublicationAddress(string exchangeType, string exchangeName, string routi
         /// </summary>
         public static PublicationAddress Parse(string uriLikeString)
         {
-            // Callers such as IBasicProperties.ReplyToAddress
-            // expect null result for invalid input.
-            // The regex.Match() throws on null arguments so we perform explicit check here
-            if (uriLikeString == null)
-            {
-                return null;
-            }
-
             Match match = PSEUDO_URI_PARSER.Match(uriLikeString);
             if (match.Success)
             {

projects/Unit/TestBasicProperties.cs

@@ -120,36 +120,5 @@ public void TestNullableProperties_CanWrite(
             Assert.AreEqual(isCorrelationIdPresent, propertiesFromStream.IsCorrelationIdPresent());
             Assert.AreEqual(isMessageIdPresent, propertiesFromStream.IsMessageIdPresent());
         }
-
-        [Test]
-        public void TestProperties_ReplyTo(
-            [Values(null, "foo_1", "fanout://name/key")] string replyTo
-            )
-        {
-            // Arrange
-            var subject = new Framing.BasicProperties
-            {
-
-                // Act
-                ReplyTo = replyTo,
-            };
-
-            // Assert
-            bool isReplyToPresent = replyTo != null;
-            string replyToAddress = PublicationAddress.Parse(replyTo)?.ToString();
-            Assert.AreEqual(isReplyToPresent, subject.IsReplyToPresent());
-
-            var writer = new Impl.ContentHeaderPropertyWriter(new byte[1024]);
-            subject.WritePropertiesTo(ref writer);
-
-            // Read from Stream
-            var propertiesFromStream = new Framing.BasicProperties();
-            var reader = new Impl.ContentHeaderPropertyReader(writer.Memory.Slice(0, writer.Offset));
-            propertiesFromStream.ReadPropertiesFrom(ref reader);
-
-            Assert.AreEqual(replyTo, propertiesFromStream.ReplyTo);
-            Assert.AreEqual(isReplyToPresent, propertiesFromStream.IsReplyToPresent());
-            Assert.AreEqual(replyToAddress, propertiesFromStream.ReplyToAddress?.ToString());
-        }
     }
 }

projects/Unit/TestPropertiesClone.cs

@@ -68,10 +68,10 @@ private void TestBasicPropertiesClone(BasicProperties bp)
             bp.ContentType = "foo_1";
             bp.ContentEncoding = "foo_2";
             bp.Headers = new Dictionary<string, object>
-            {
-                { "foo_3", "foo_4" },
-                { "foo_5", "foo_6" }
-            };
+        {
+            { "foo_3", "foo_4" },
+            { "foo_5", "foo_6" }
+        };
             bp.DeliveryMode = 2;
             // Persistent also changes DeliveryMode's value to 2
             bp.Persistent = true;
@@ -123,7 +123,6 @@ private void TestBasicPropertiesClone(BasicProperties bp)
             Assert.AreEqual(12, bpClone.Priority);
             Assert.AreEqual("foo_7", bpClone.CorrelationId);
             Assert.AreEqual("foo_8", bpClone.ReplyTo);
-            Assert.AreEqual(null, bpClone.ReplyToAddress);
             Assert.AreEqual("foo_9", bpClone.Expiration);
             Assert.AreEqual("foo_10", bpClone.MessageId);
             Assert.AreEqual(new AmqpTimestamp(123), bpClone.Timestamp);
@@ -142,10 +141,10 @@ private void TestBasicPropertiesNoneClone(BasicProperties bp)
             bp.ContentType = "foo_1";
             bp.ContentEncoding = "foo_2";
             bp.Headers = new Dictionary<string, object>
-            {
-                { "foo_3", "foo_4" },
-                { "foo_5", "foo_6" }
-            };
+        {
+            { "foo_3", "foo_4" },
+            { "foo_5", "foo_6" }
+        };
             bp.DeliveryMode = 2;
             // Persistent also changes DeliveryMode's value to 2
             bp.Persistent = true;

projects/Unit/TestPublicationAddress.cs

@@ -59,7 +59,6 @@ public void TestParseOk()
         [Test]
         public void TestParseFail()
         {
-            Assert.IsNull(PublicationAddress.Parse(null));
             Assert.IsNull(PublicationAddress.Parse("not a valid uri"));
         }