Add ReadOnlyMemory overload to BasicPublish

projects/Apigen/apigen/Apigen.cs

@@ -1108,10 +1108,14 @@ public void MaybeEmitModelMethod(MethodInfo method)
 
         public string SanitisedFullName(Type t)
         {
-            if (t.FullName.StartsWith("System.Collections.Generic.IDictionary`2[[System.String"))
+            if (t.Equals(typeof(IDictionary<string, object>)))
             {
                 return "IDictionary<string, object>";
             }
+            if (t.Equals(typeof(ReadOnlyMemory<byte>)))
+            {
+                return "ReadOnlyMemory<byte>";
+            }
 
             switch (t.FullName)
             {

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

@@ -231,7 +231,7 @@ string BasicConsume(
         /// </remarks>
         [AmqpMethodDoNotImplement(null)]
         void BasicPublish(string exchange, string routingKey, bool mandatory,
-            IBasicProperties basicProperties, byte[] body);
+            IBasicProperties basicProperties, ReadOnlyMemory<byte> body);
 
         /// <summary>
         /// Configures QoS parameters of the Basic content-class.

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

@@ -38,6 +38,7 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 
 namespace RabbitMQ.Client
@@ -88,7 +89,7 @@ public static string BasicConsume(this IModel model, string queue,
         /// <remarks>
         /// The publication occurs with mandatory=false and immediate=false.
         /// </remarks>
-        public static void BasicPublish(this IModel model, PublicationAddress addr, IBasicProperties basicProperties, byte[] body)
+        public static void BasicPublish(this IModel model, PublicationAddress addr, IBasicProperties basicProperties, ReadOnlyMemory<byte> body)
         {
             model.BasicPublish(addr.ExchangeName, addr.RoutingKey, basicProperties: basicProperties, body: body);
         }
@@ -99,15 +100,15 @@ public static void BasicPublish(this IModel model, PublicationAddress addr, IBas
         /// <remarks>
         /// The publication occurs with mandatory=false
         /// </remarks>
-        public static void BasicPublish(this IModel model, string exchange, string routingKey, IBasicProperties basicProperties, byte[] body)
+        public static void BasicPublish(this IModel model, string exchange, string routingKey, IBasicProperties basicProperties, ReadOnlyMemory<byte> body)
         {
             model.BasicPublish(exchange, routingKey, false, basicProperties, body);
         }
 
         /// <summary>
         /// (Spec method) Convenience overload of BasicPublish.
         /// </summary>
-        public static void BasicPublish(this IModel model, string exchange, string routingKey, bool mandatory = false, IBasicProperties basicProperties = null, byte[] body = null)
+        public static void BasicPublish(this IModel model, string exchange, string routingKey, bool mandatory = false, IBasicProperties basicProperties = null, ReadOnlyMemory<byte> body = default)
         {
             model.BasicPublish(exchange, routingKey, mandatory, basicProperties, body);
         }

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

@@ -556,7 +556,7 @@ public void _Private_BasicPublish(string exchange,
             string routingKey,
             bool mandatory,
             IBasicProperties basicProperties,
-            byte[] body)
+            ReadOnlyMemory<byte> body)
         {
             if (routingKey == null)
             {
@@ -806,7 +806,7 @@ public void BasicPublish(string exchange,
             string routingKey,
             bool mandatory,
             IBasicProperties basicProperties,
-            byte[] body)
+            ReadOnlyMemory<byte> body)
         {
             if (routingKey == null)
             {

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

@@ -227,7 +227,7 @@ void _Private_BasicPublish(string exchange,
             string routingKey,
             bool mandatory,
             [AmqpContentHeaderMapping] IBasicProperties basicProperties,
-            [AmqpContentBodyMapping] byte[] body);
+            [AmqpContentBodyMapping] ReadOnlyMemory<byte> body);
 
         [AmqpForceOneWay]
         [AmqpMethodMapping(null, "basic", "recover")]

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

@@ -349,7 +349,7 @@ public MethodBase ModelRpc(MethodBase method, ContentHeaderBase header, byte[] b
             }
         }
 
-        public void ModelSend(MethodBase method, ContentHeaderBase header, byte[] body)
+        public void ModelSend(MethodBase method, ContentHeaderBase header, ReadOnlyMemory<byte> body)
         {
             if (method.HasContent)
             {
@@ -905,7 +905,7 @@ public abstract void _Private_BasicPublish(string exchange,
             string routingKey,
             bool mandatory,
             IBasicProperties basicProperties,
-            byte[] body);
+            ReadOnlyMemory<byte> body);
 
         public abstract void _Private_BasicRecover(bool requeue);
 
@@ -1100,7 +1100,7 @@ public void BasicPublish(string exchange,
             string routingKey,
             bool mandatory,
             IBasicProperties basicProperties,
-            byte[] body)
+            ReadOnlyMemory<byte> body)
         {
             if (routingKey == null)
             {

projects/Unit/APIApproval.Approve.approved.txt

@@ -353,7 +353,7 @@ namespace RabbitMQ.Client
         string BasicConsume(string queue, bool autoAck, string consumerTag, bool noLocal, bool exclusive, System.Collections.Generic.IDictionary<string, object> arguments, RabbitMQ.Client.IBasicConsumer consumer);
         RabbitMQ.Client.BasicGetResult BasicGet(string queue, bool autoAck);
         void BasicNack(ulong deliveryTag, bool multiple, bool requeue);
-        void BasicPublish(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties basicProperties, byte[] body);
+        void BasicPublish(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties basicProperties, System.ReadOnlyMemory<byte> body);
         void BasicQos(uint prefetchSize, ushort prefetchCount, bool global);
         void BasicRecover(bool requeue);
         void BasicRecoverAsync(bool requeue);
@@ -398,9 +398,9 @@ namespace RabbitMQ.Client
         public static string BasicConsume(this RabbitMQ.Client.IModel model, string queue, bool autoAck, string consumerTag, RabbitMQ.Client.IBasicConsumer consumer) { }
         public static string BasicConsume(this RabbitMQ.Client.IModel model, string queue, bool autoAck, string consumerTag, System.Collections.Generic.IDictionary<string, object> arguments, RabbitMQ.Client.IBasicConsumer consumer) { }
         public static string BasicConsume(this RabbitMQ.Client.IModel model, 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) { }
-        public static void BasicPublish(this RabbitMQ.Client.IModel model, RabbitMQ.Client.PublicationAddress addr, RabbitMQ.Client.IBasicProperties basicProperties, byte[] body) { }
-        public static void BasicPublish(this RabbitMQ.Client.IModel model, string exchange, string routingKey, RabbitMQ.Client.IBasicProperties basicProperties, byte[] body) { }
-        public static void BasicPublish(this RabbitMQ.Client.IModel model, string exchange, string routingKey, bool mandatory = false, RabbitMQ.Client.IBasicProperties basicProperties = null, byte[] body = null) { }
+        public static void BasicPublish(this RabbitMQ.Client.IModel model, RabbitMQ.Client.PublicationAddress addr, RabbitMQ.Client.IBasicProperties basicProperties, System.ReadOnlyMemory<byte> body) { }
+        public static void BasicPublish(this RabbitMQ.Client.IModel model, string exchange, string routingKey, RabbitMQ.Client.IBasicProperties basicProperties, System.ReadOnlyMemory<byte> body) { }
+        public static void BasicPublish(this RabbitMQ.Client.IModel model, string exchange, string routingKey, bool mandatory = false, RabbitMQ.Client.IBasicProperties basicProperties = null, System.ReadOnlyMemory<byte> body = default) { }
         public static void ExchangeBind(this RabbitMQ.Client.IModel model, string destination, string source, string routingKey, System.Collections.Generic.IDictionary<string, object> arguments = null) { }
         public static void ExchangeBindNoWait(this RabbitMQ.Client.IModel model, string destination, string source, string routingKey, System.Collections.Generic.IDictionary<string, object> arguments = null) { }
         public static void ExchangeDeclare(this RabbitMQ.Client.IModel model, string exchange, string type, bool durable = false, bool autoDelete = false, System.Collections.Generic.IDictionary<string, object> arguments = null) { }

projects/Unit/TestBasicPublish.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using RabbitMQ.Client.Events;
+
+namespace RabbitMQ.Client.Unit
+{
+    [TestFixture]
+    public class TestBasicPublish
+    {
+        [Test]
+        public void TestBasicRoundtripArray()
+        {
+            var cf = new ConnectionFactory();
+            using(IConnection c = cf.CreateConnection())
+            using(IModel m = c.CreateModel())
+            {
+                QueueDeclareOk q = m.QueueDeclare();
+                IBasicProperties bp = m.CreateBasicProperties();
+                byte[] sendBody = System.Text.Encoding.UTF8.GetBytes("hi");
+                byte[] consumeBody = null;
+                var consumer = new EventingBasicConsumer(m);
+                var are = new AutoResetEvent(false);
+                consumer.Received += async (o, a) =>
+                {
+                    consumeBody = a.Body.ToArray();
+                    are.Set();
+                    await Task.Yield();
+                };
+                string tag = m.BasicConsume(q.QueueName, true, consumer);
+
+
+                m.BasicPublish("", q.QueueName, bp, sendBody);
+                bool waitResFalse = are.WaitOne(2000);
+                m.BasicCancel(tag);
+
+
+                Assert.IsTrue(waitResFalse);
+                Assert.AreEqual(sendBody, consumeBody);
+            }
+        }
+
+        [Test]
+        public void TestBasicRoundtripReadOnlyMemory()
+        {
+            var cf = new ConnectionFactory();
+            using(IConnection c = cf.CreateConnection())
+            using(IModel m = c.CreateModel())
+            {
+                QueueDeclareOk q = m.QueueDeclare();
+                IBasicProperties bp = m.CreateBasicProperties();
+                byte[] sendBody = System.Text.Encoding.UTF8.GetBytes("hi");
+                byte[] consumeBody = null;
+                var consumer = new EventingBasicConsumer(m);
+                var are = new AutoResetEvent(false);
+                consumer.Received += async (o, a) =>
+                {
+                    consumeBody = a.Body.ToArray();
+                    are.Set();
+                    await Task.Yield();
+                };
+                string tag = m.BasicConsume(q.QueueName, true, consumer);
+
+
+                m.BasicPublish("", q.QueueName, bp, new ReadOnlyMemory<byte>(sendBody));
+                bool waitResFalse = are.WaitOne(2000);
+                m.BasicCancel(tag);
+
+
+                Assert.IsTrue(waitResFalse);
+                Assert.AreEqual(sendBody, consumeBody);
+            }
+        }
+    }
+}