use ref Properties in interface

Author: bollhals

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

@@ -188,7 +188,7 @@ string BasicConsume(
         ///     Routing key must be shorter than 255 bytes.
         ///   </para>
         /// </remarks>
-        void BasicPublish<TProperties>(string exchange, string routingKey, in TProperties basicProperties, ReadOnlyMemory<byte> body = default, bool mandatory = false)
+        void BasicPublish<TProperties>(string exchange, string routingKey, ref TProperties basicProperties, ReadOnlyMemory<byte> body = default, bool mandatory = false)
             where TProperties : IReadOnlyBasicProperties, IAmqpHeader;
         /// <summary>
         /// Publishes a message.
@@ -198,7 +198,7 @@ void BasicPublish<TProperties>(string exchange, string routingKey, in TPropertie
         ///     Routing key must be shorter than 255 bytes.
         ///   </para>
         /// </remarks>
-        void BasicPublish<TProperties>(CachedString exchange, CachedString routingKey, in TProperties basicProperties, ReadOnlyMemory<byte> body = default, bool mandatory = false)
+        void BasicPublish<TProperties>(CachedString exchange, CachedString routingKey, ref TProperties basicProperties, ReadOnlyMemory<byte> body = default, bool mandatory = false)
             where TProperties : IReadOnlyBasicProperties, IAmqpHeader;
 #nullable disable
 

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

@@ -82,17 +82,17 @@ public static string BasicConsume(this IModel model, string queue,
         /// <remarks>
         /// The publication occurs with mandatory=false and immediate=false.
         /// </remarks>
-        public static void BasicPublish<T>(this IModel model, PublicationAddress addr, in T basicProperties, ReadOnlyMemory<byte> body)
+        public static void BasicPublish<T>(this IModel model, PublicationAddress addr, ref T basicProperties, ReadOnlyMemory<byte> body)
             where T : IReadOnlyBasicProperties, IAmqpHeader
         {
-            model.BasicPublish(addr.ExchangeName, addr.RoutingKey, basicProperties, body);
+            model.BasicPublish(addr.ExchangeName, addr.RoutingKey, ref basicProperties, body);
         }
 
         public static void BasicPublish(this IModel model, string exchange, string routingKey, ReadOnlyMemory<byte> body = default, bool mandatory = false)
-            => model.BasicPublish(exchange, routingKey, default(EmptyBasicProperty), body, mandatory);
+            => model.BasicPublish(exchange, routingKey, ref EmptyBasicProperty.Empty, body, mandatory);
 
         public static void BasicPublish(this IModel model, CachedString exchange, CachedString routingKey, ReadOnlyMemory<byte> body = default, bool mandatory = false)
-            => model.BasicPublish(exchange, routingKey, default(EmptyBasicProperty), body, mandatory);
+            => model.BasicPublish(exchange, routingKey, ref EmptyBasicProperty.Empty, body, mandatory);
 #nullable disable
 
         /// <summary>

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

@@ -242,13 +242,13 @@ public BasicGetResult BasicGet(string queue, bool autoAck)
         public void BasicNack(ulong deliveryTag, bool multiple, bool requeue)
             => InnerChannel.BasicNack(deliveryTag, multiple, requeue);
 
-        public void BasicPublish<TProperties>(string exchange, string routingKey, in TProperties basicProperties, ReadOnlyMemory<byte> body, bool mandatory)
+        public void BasicPublish<TProperties>(string exchange, string routingKey, ref TProperties basicProperties, ReadOnlyMemory<byte> body, bool mandatory)
             where TProperties : IReadOnlyBasicProperties, IAmqpHeader
-            => InnerChannel.BasicPublish(exchange, routingKey, basicProperties, body, mandatory);
+            => InnerChannel.BasicPublish(exchange, routingKey, ref basicProperties, body, mandatory);
 
-        public void BasicPublish<TProperties>(CachedString exchange, CachedString routingKey, in TProperties basicProperties, ReadOnlyMemory<byte> body, bool mandatory)
+        public void BasicPublish<TProperties>(CachedString exchange, CachedString routingKey, ref TProperties basicProperties, ReadOnlyMemory<byte> body, bool mandatory)
             where TProperties : IReadOnlyBasicProperties, IAmqpHeader
-            => InnerChannel.BasicPublish(exchange, routingKey, basicProperties, body, mandatory);
+            => InnerChannel.BasicPublish(exchange, routingKey, ref basicProperties, body, mandatory);
 
         public void BasicQos(uint prefetchSize, ushort prefetchCount, bool global)
         {

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

@@ -8,6 +8,8 @@ namespace RabbitMQ.Client.client.impl
 #nullable enable
     internal readonly struct EmptyBasicProperty : IReadOnlyBasicProperties, IAmqpHeader
     {
+        internal static EmptyBasicProperty Empty;
+
         ushort IAmqpHeader.ProtocolClassId => ClassConstants.Basic;
 
         int IAmqpWriteable.WriteTo(Span<byte> span)

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

@@ -897,7 +897,7 @@ public BasicGetResult BasicGet(string queue, bool autoAck)
 
         public abstract void BasicNack(ulong deliveryTag, bool multiple, bool requeue);
 
-        public void BasicPublish<TProperties>(string exchange, string routingKey, in TProperties basicProperties, ReadOnlyMemory<byte> body, bool mandatory)
+        public void BasicPublish<TProperties>(string exchange, string routingKey, ref TProperties basicProperties, ReadOnlyMemory<byte> body, bool mandatory)
             where TProperties : IReadOnlyBasicProperties, IAmqpHeader
         {
             if (NextPublishSeqNo > 0)
@@ -909,11 +909,10 @@ public void BasicPublish<TProperties>(string exchange, string routingKey, in TPr
             }
 
             var cmd = new BasicPublish(exchange, routingKey, mandatory, default);
-            var props = basicProperties;
-            ModelSend(ref cmd, ref props, body);
+            ModelSend(ref cmd, ref basicProperties, body);
         }
 
-        public void BasicPublish<TProperties>(CachedString exchange, CachedString routingKey, in TProperties basicProperties, ReadOnlyMemory<byte> body, bool mandatory)
+        public void BasicPublish<TProperties>(CachedString exchange, CachedString routingKey, ref TProperties basicProperties, ReadOnlyMemory<byte> body, bool mandatory)
             where TProperties : IReadOnlyBasicProperties, IAmqpHeader
         {
             if (NextPublishSeqNo > 0)
@@ -925,8 +924,7 @@ public void BasicPublish<TProperties>(CachedString exchange, CachedString routin
             }
 
             var cmd = new BasicPublishMemory(exchange.Bytes, routingKey.Bytes, mandatory, default);
-            var props = basicProperties;
-            ModelSend(ref cmd, ref props, body);
+            ModelSend(ref cmd, ref basicProperties, body);
         }
 
         public void UpdateSecret(string newSecret, string reason)

projects/TestApplications/MassPublish/Program.cs

@@ -48,7 +48,7 @@ public static void Main()
                         {
                             AppId = "testapp",
                         };
-                        publisher.BasicPublish("test", "myawesome.routing.key", properties, payload);
+                        publisher.BasicPublish("test", "myawesome.routing.key", ref properties, payload);
                     }
                     messagesSent += ItemsPerBatch;
                     await publisher.WaitForConfirmsOrDieAsync().ConfigureAwait(false);

projects/Unit/TestBasicPublish.cs

@@ -32,7 +32,7 @@ public void TestBasicRoundtripArray()
                 };
                 string tag = m.BasicConsume(q.QueueName, true, consumer);
 
-                m.BasicPublish("", q.QueueName, bp, sendBody);
+                m.BasicPublish("", q.QueueName, ref bp, sendBody);
                 bool waitResFalse = are.WaitOne(2000);
                 m.BasicCancel(tag);
 

projects/Unit/TestConnectionRecovery.cs

@@ -817,7 +817,7 @@ public void TestPublishRpcRightAfterReconnect()
             {
                 try
                 {
-                    _model.BasicPublish(string.Empty, testQueueName, properties, ReadOnlyMemory<byte>.Empty);
+                    _model.BasicPublish(string.Empty, testQueueName, ref properties, ReadOnlyMemory<byte>.Empty);
                 }
                 catch (Exception e)
                 {