Merge pull request #892 from rabbitmq/backport-pr-865

Backport #865 to 6.x

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

@@ -37,12 +37,14 @@
 //  The Initial Developer of the Original Code is Pivotal Software, Inc.
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
+
 using System;
 
 namespace RabbitMQ.Client
 {
     public interface IBasicPublishBatch
     {
+        [Obsolete("Use Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, ReadOnlyMemory<byte> body) instead. Will be replaced in version 7.0", false)]
         void Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, byte[] body);
         void Publish();
     }

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

@@ -39,7 +39,6 @@
 //---------------------------------------------------------------------------
 
 using System;
-using System.Buffers;
 using System.Collections.Generic;
 
 using RabbitMQ.Client.Framing.Impl;
@@ -56,6 +55,12 @@ internal BasicPublishBatch (ModelBase model)
         }
 
         public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, byte[] body)
+        {
+            ReadOnlyMemory<byte> bodyAsMemory = body;
+            Add(exchange, routingKey, mandatory, basicProperties, bodyAsMemory);
+        }
+
+        public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, ReadOnlyMemory<byte> body)
         {
             var method = new BasicPublish
             {

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

@@ -0,0 +1,61 @@
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 1.1.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (c) 2007-2020 VMware, Inc.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       https://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v1.1:
+//
+//---------------------------------------------------------------------------
+//  The contents of this file are subject to the Mozilla Public License
+//  Version 1.1 (the "License"); you may not use this file except in
+//  compliance with the License. You may obtain a copy of the License
+//  at https://www.mozilla.org/MPL/
+//
+//  Software distributed under the License is distributed on an "AS IS"
+//  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+//  the License for the specific language governing rights and
+//  limitations under the License.
+//
+//  The Original Code is RabbitMQ.
+//
+//  The Initial Developer of the Original Code is Pivotal Software, Inc.
+//  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
+//---------------------------------------------------------------------------
+
+using System;
+using RabbitMQ.Client.Impl;
+
+namespace RabbitMQ.Client
+{
+    public static class BasicPublishBatchExtensions
+    {
+        public static void Add(this IBasicPublishBatch batch, string exchange, string routingKey, bool mandatory, IBasicProperties properties, ReadOnlyMemory<byte> body)
+        {
+            if (batch is BasicPublishBatch batchInternal)
+            {
+                batchInternal.Add(exchange, routingKey, mandatory, properties, body);
+                return;
+            }
+
+#pragma warning disable 618
+            batch.Add(exchange, routingKey, mandatory, properties, body.ToArray());
+#pragma warning restore 618
+        }
+    }
+}

projects/Unit/APIApproval.Approve.verified.txt

@@ -56,6 +56,10 @@ namespace RabbitMQ.Client
         public bool Redelivered { get; }
         public string RoutingKey { get; }
     }
+    public static class BasicPublishBatchExtensions
+    {
+        public static void Add(this RabbitMQ.Client.IBasicPublishBatch batch, string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, System.ReadOnlyMemory<byte> body) { }
+    }
     public class BinaryTableValue
     {
         public BinaryTableValue() { }
@@ -292,6 +296,8 @@ namespace RabbitMQ.Client
     }
     public interface IBasicPublishBatch
     {
+        [System.Obsolete("Use Add(string exchange, string routingKey, bool mandatory, IBasicProperties prop" +
+            "erties, ReadOnlyMemory<byte> body) instead. Will be replaced in version 7.0", false)]
         void Add(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, byte[] body);
         void Publish();
     }

projects/Unit/TestBasicPublishBatch.cs

@@ -53,8 +53,8 @@ public void TestBasicPublishBatchSend()
             Model.QueueDeclare(queue: "test-message-batch-a", durable: false);
             Model.QueueDeclare(queue: "test-message-batch-b", durable: false);
             IBasicPublishBatch batch = Model.CreateBasicPublishBatch();
-            batch.Add("", "test-message-batch-a", false, null, new byte [] {});
-            batch.Add("", "test-message-batch-b", false, null, new byte [] {});
+            batch.Add("", "test-message-batch-a", false, null, new ReadOnlyMemory<byte>());
+            batch.Add("", "test-message-batch-b", false, null, new ReadOnlyMemory<byte>());
             batch.Publish();
             Model.WaitForConfirmsOrDie(TimeSpan.FromSeconds(15));
             BasicGetResult resultA = Model.BasicGet("test-message-batch-a", true);