Remove In from async paths

Tornhoof · Tornhoof · commit 29ab5ce9c900 · 2024-06-14T20:23:34.000+02:00
Add await in test for one case
diff --git a/projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs b/projects/Benchmarks/ConsumerDispatching/AsyncBasicConsumerFake.cs
@@ -19,7 +19,7 @@ public AsyncBasicConsumerFake(ManualResetEventSlim autoResetEvent)
         }
 
         public Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,
-            in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
+            ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
         {
             if (Interlocked.Increment(ref _current) == Count)
             {
diff --git a/projects/RabbitMQ.Client/PublicAPI.Shipped.txt b/projects/RabbitMQ.Client/PublicAPI.Shipped.txt
@@ -62,7 +62,7 @@ override RabbitMQ.Client.AmqpTimestamp.GetHashCode() -> int
 override RabbitMQ.Client.AmqpTimestamp.ToString() -> string
 override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleBasicCancelOk(string consumerTag) -> System.Threading.Tasks.Task
 override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleBasicConsumeOk(string consumerTag) -> System.Threading.Tasks.Task
-override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, in RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
+override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
 override RabbitMQ.Client.Events.AsyncEventingBasicConsumer.HandleChannelShutdown(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task
 override RabbitMQ.Client.Events.EventingBasicConsumer.HandleBasicCancelOk(string consumerTag) -> void
 override RabbitMQ.Client.Events.EventingBasicConsumer.HandleBasicConsumeOk(string consumerTag) -> void
@@ -413,7 +413,7 @@ RabbitMQ.Client.IAsyncBasicConsumer.ConsumerCancelled -> RabbitMQ.Client.Events.
 RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicCancel(string consumerTag) -> System.Threading.Tasks.Task
 RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicCancelOk(string consumerTag) -> System.Threading.Tasks.Task
 RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicConsumeOk(string consumerTag) -> System.Threading.Tasks.Task
-RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, in RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
+RabbitMQ.Client.IAsyncBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
 RabbitMQ.Client.IAsyncBasicConsumer.HandleChannelShutdown(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task
 RabbitMQ.Client.IAuthMechanism
 RabbitMQ.Client.IAuthMechanism.handleChallenge(byte[] challenge, RabbitMQ.Client.ConnectionConfig config) -> byte[]
@@ -845,7 +845,7 @@ static RabbitMQ.Client.Events.CallbackExceptionEventArgs.Build(System.Exception
 static RabbitMQ.Client.ExchangeType.All() -> System.Collections.Generic.ICollection<string>
 static RabbitMQ.Client.IChannelExtensions.BasicPublishAsync(this RabbitMQ.Client.IChannel channel, RabbitMQ.Client.CachedString exchange, RabbitMQ.Client.CachedString routingKey, System.ReadOnlyMemory<byte> body = default(System.ReadOnlyMemory<byte>), bool mandatory = false) -> System.Threading.Tasks.ValueTask
 static RabbitMQ.Client.IChannelExtensions.BasicPublishAsync(this RabbitMQ.Client.IChannel channel, string exchange, string routingKey, System.ReadOnlyMemory<byte> body = default(System.ReadOnlyMemory<byte>), bool mandatory = false) -> System.Threading.Tasks.ValueTask
-static RabbitMQ.Client.IChannelExtensions.BasicPublishAsync<T>(this RabbitMQ.Client.IChannel channel, RabbitMQ.Client.PublicationAddress addr, in T basicProperties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.ValueTask
+static RabbitMQ.Client.IChannelExtensions.BasicPublishAsync<T>(this RabbitMQ.Client.IChannel channel, RabbitMQ.Client.PublicationAddress addr, T basicProperties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.ValueTask
 static RabbitMQ.Client.PublicationAddress.Parse(string uriLikeString) -> RabbitMQ.Client.PublicationAddress
 static RabbitMQ.Client.PublicationAddress.TryParse(string uriLikeString, out RabbitMQ.Client.PublicationAddress result) -> bool
 static RabbitMQ.Client.QueueDeclareOk.implicit operator string(RabbitMQ.Client.QueueDeclareOk declareOk) -> string
@@ -864,7 +864,7 @@ static readonly RabbitMQ.Client.PublicationAddress.PSEUDO_URI_PARSER -> System.T
 virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicCancel(string consumerTag) -> System.Threading.Tasks.Task
 virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicCancelOk(string consumerTag) -> System.Threading.Tasks.Task
 virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicConsumeOk(string consumerTag) -> System.Threading.Tasks.Task
-virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, in RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
+virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey, RabbitMQ.Client.ReadOnlyBasicProperties properties, System.ReadOnlyMemory<byte> body) -> System.Threading.Tasks.Task
 virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.HandleChannelShutdown(object channel, RabbitMQ.Client.ShutdownEventArgs reason) -> System.Threading.Tasks.Task
 virtual RabbitMQ.Client.AsyncDefaultBasicConsumer.OnCancel(params string[] consumerTags) -> System.Threading.Tasks.Task
 virtual RabbitMQ.Client.DefaultBasicConsumer.HandleBasicCancel(string consumerTag) -> void
diff --git a/projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs b/projects/RabbitMQ.Client/client/api/AsyncDefaultBasicConsumer.cs
@@ -112,7 +112,7 @@ public virtual Task HandleBasicDeliver(string consumerTag,
             bool redelivered,
             string exchange,
             string routingKey,
-            in ReadOnlyBasicProperties properties,
+            ReadOnlyBasicProperties properties,
             ReadOnlyMemory<byte> body)
         {
             // Nothing to do here.
diff --git a/projects/RabbitMQ.Client/client/api/IAsyncBasicConsumer.cs b/projects/RabbitMQ.Client/client/api/IAsyncBasicConsumer.cs
@@ -51,7 +51,7 @@ Task HandleBasicDeliver(string consumerTag,
             bool redelivered,
             string exchange,
             string routingKey,
-            in ReadOnlyBasicProperties properties,
+            ReadOnlyBasicProperties properties,
             ReadOnlyMemory<byte> body);
 
         /// <summary>
diff --git a/projects/RabbitMQ.Client/client/api/IChannelExtensions.cs b/projects/RabbitMQ.Client/client/api/IChannelExtensions.cs
@@ -88,7 +88,7 @@ public static Task<string> BasicConsumeAsync(this IChannel channel, string queue
         /// <remarks>
         /// The publication occurs with mandatory=false and immediate=false.
         /// </remarks>
-        public static ValueTask BasicPublishAsync<T>(this IChannel channel, PublicationAddress addr, in T basicProperties,
+        public static ValueTask BasicPublishAsync<T>(this IChannel channel, PublicationAddress addr, T basicProperties,
             ReadOnlyMemory<byte> body)
             where T : IReadOnlyBasicProperties, IAmqpHeader
         {
diff --git a/projects/RabbitMQ.Client/client/events/AsyncEventingBasicConsumer.cs b/projects/RabbitMQ.Client/client/events/AsyncEventingBasicConsumer.cs
@@ -77,7 +77,7 @@ await base.HandleBasicConsumeOk(consumerTag)
 
         ///<summary>Fires the Received event.</summary>
         public override Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,
-            in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
+            ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
         {
             var deliverEventArgs = new BasicDeliverEventArgs(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);
             // No need to call base, it's empty.
diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs b/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs
@@ -74,7 +74,7 @@ public ValueTask HandleBasicConsumeOkAsync(IBasicConsumer consumer, string consu
         }
 
         public ValueTask HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered,
-            string exchange, string routingKey, in ReadOnlyBasicProperties basicProperties, RentedMemory body,
+            string exchange, string routingKey, ReadOnlyBasicProperties basicProperties, RentedMemory body,
             CancellationToken cancellationToken)
         {
             if (false == _disposed && false == _quiesce)
@@ -281,7 +281,7 @@ private WorkStruct(IBasicConsumer consumer, ShutdownEventArgs reason)
             }
 
             private WorkStruct(IBasicConsumer consumer, string consumerTag, ulong deliveryTag, bool redelivered,
-                string exchange, string routingKey, in ReadOnlyBasicProperties basicProperties, RentedMemory body)
+                string exchange, string routingKey, ReadOnlyBasicProperties basicProperties, RentedMemory body)
             {
                 WorkType = WorkType.Deliver;
                 Consumer = consumer;
@@ -316,7 +316,7 @@ public static WorkStruct CreateShutdown(IBasicConsumer consumer, ShutdownEventAr
             }
 
             public static WorkStruct CreateDeliver(IBasicConsumer consumer, string consumerTag, ulong deliveryTag, bool redelivered,
-                string exchange, string routingKey, in ReadOnlyBasicProperties basicProperties, RentedMemory body)
+                string exchange, string routingKey, ReadOnlyBasicProperties basicProperties, RentedMemory body)
             {
                 return new WorkStruct(consumer, consumerTag, deliveryTag, redelivered,
                     exchange, routingKey, basicProperties, body);
diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/FallbackConsumer.cs b/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/FallbackConsumer.cs
@@ -68,7 +68,7 @@ Task IAsyncBasicConsumer.HandleBasicConsumeOk(string consumerTag)
         }
 
         Task IAsyncBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,
-            in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
+            ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
         {
             return ((IBasicConsumer)this).HandleBasicDeliverAsync(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);
         }
diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/IConsumerDispatcher.cs b/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/IConsumerDispatcher.cs
@@ -51,7 +51,7 @@ ValueTask HandleBasicDeliverAsync(string consumerTag,
                             bool redelivered,
                             string exchange,
                             string routingKey,
-                            in ReadOnlyBasicProperties basicProperties,
+                            ReadOnlyBasicProperties basicProperties,
                             RentedMemory body,
                             CancellationToken cancellationToken);
 
diff --git a/projects/Test/Integration/TestAsyncConsumer.cs b/projects/Test/Integration/TestAsyncConsumer.cs
@@ -761,11 +761,11 @@ public override Task HandleBasicConsumeOk(string consumerTag)
                 return base.HandleBasicConsumeOk(consumerTag);
             }
 
-            public override Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered,
-                string exchange, string routingKey, in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
+            public override async Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered,
+                string exchange, string routingKey, ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)
             {
                 _output.WriteLine("[ERROR] {0} HandleBasicDeliver {1}", _logPrefix, consumerTag);
-                return base.HandleBasicDeliver(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);
+                await base.HandleBasicDeliver(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);
             }
 
             public override Task HandleChannelShutdown(object channel, ShutdownEventArgs reason)
diff --git a/projects/Test/Integration/TestAsyncConsumerExceptions.cs b/projects/Test/Integration/TestAsyncConsumerExceptions.cs
@@ -134,7 +134,7 @@ public override Task HandleBasicDeliver(string consumerTag,
                 bool redelivered,
                 string exchange,
                 string routingKey,
-                in ReadOnlyBasicProperties properties,
+                ReadOnlyBasicProperties properties,
                 ReadOnlyMemory<byte> body)
             {
                 return Task.FromException(TestException);

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public AsyncBasicConsumerFake(ManualResetEventSlim autoResetEvent)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,`
`22`		`- in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)`
	`22`	`+ ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)`
`23`	`23`	`{`
`24`	`24`	`if (Interlocked.Increment(ref _current) == Count)`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public virtual Task HandleBasicDeliver(string consumerTag,`
`112`	`112`	`bool redelivered,`
`113`	`113`	`string exchange,`
`114`	`114`	`string routingKey,`
`115`		`- in ReadOnlyBasicProperties properties,`
	`115`	`+ ReadOnlyBasicProperties properties,`
`116`	`116`	`ReadOnlyMemory<byte> body)`
`117`	`117`	`{`
`118`	`118`	`// Nothing to do here.`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public static Task<string> BasicConsumeAsync(this IChannel channel, string queue`
`88`	`88`	`/// <remarks>`
`89`	`89`	`/// The publication occurs with mandatory=false and immediate=false.`
`90`	`90`	`/// </remarks>`
`91`		`- public static ValueTask BasicPublishAsync<T>(this IChannel channel, PublicationAddress addr, in T basicProperties,`
	`91`	`+ public static ValueTask BasicPublishAsync<T>(this IChannel channel, PublicationAddress addr, T basicProperties,`
`92`	`92`	`ReadOnlyMemory<byte> body)`
`93`	`93`	`where T : IReadOnlyBasicProperties, IAmqpHeader`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ await base.HandleBasicConsumeOk(consumerTag)`
`77`	`77`
`78`	`78`	`///<summary>Fires the Received event.</summary>`
`79`	`79`	`public override Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,`
`80`		`- in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)`
	`80`	`+ ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)`
`81`	`81`	`{`
`82`	`82`	`var deliverEventArgs = new BasicDeliverEventArgs(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);`
`83`	`83`	`// No need to call base, it's empty.`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public ValueTask HandleBasicConsumeOkAsync(IBasicConsumer consumer, string consu`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public ValueTask HandleBasicDeliverAsync(string consumerTag, ulong deliveryTag, bool redelivered,`
`77`		`- string exchange, string routingKey, in ReadOnlyBasicProperties basicProperties, RentedMemory body,`
	`77`	`+ string exchange, string routingKey, ReadOnlyBasicProperties basicProperties, RentedMemory body,`
`78`	`78`	`CancellationToken cancellationToken)`
`79`	`79`	`{`
`80`	`80`	`if (false == _disposed && false == _quiesce)`
`@@ -281,7 +281,7 @@ private WorkStruct(IBasicConsumer consumer, ShutdownEventArgs reason)`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`private WorkStruct(IBasicConsumer consumer, string consumerTag, ulong deliveryTag, bool redelivered,`
`284`		`- string exchange, string routingKey, in ReadOnlyBasicProperties basicProperties, RentedMemory body)`
	`284`	`+ string exchange, string routingKey, ReadOnlyBasicProperties basicProperties, RentedMemory body)`
`285`	`285`	`{`
`286`	`286`	`WorkType = WorkType.Deliver;`
`287`	`287`	`Consumer = consumer;`
`@@ -316,7 +316,7 @@ public static WorkStruct CreateShutdown(IBasicConsumer consumer, ShutdownEventAr`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`public static WorkStruct CreateDeliver(IBasicConsumer consumer, string consumerTag, ulong deliveryTag, bool redelivered,`
`319`		`- string exchange, string routingKey, in ReadOnlyBasicProperties basicProperties, RentedMemory body)`
	`319`	`+ string exchange, string routingKey, ReadOnlyBasicProperties basicProperties, RentedMemory body)`
`320`	`320`	`{`
`321`	`321`	`return new WorkStruct(consumer, consumerTag, deliveryTag, redelivered,`
`322`	`322`	`exchange, routingKey, basicProperties, body);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ Task IAsyncBasicConsumer.HandleBasicConsumeOk(string consumerTag)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`Task IAsyncBasicConsumer.HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered, string exchange, string routingKey,`
`71`		`- in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)`
	`71`	`+ ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)`
`72`	`72`	`{`
`73`	`73`	`return ((IBasicConsumer)this).HandleBasicDeliverAsync(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -761,11 +761,11 @@ public override Task HandleBasicConsumeOk(string consumerTag)`
`761`	`761`	`return base.HandleBasicConsumeOk(consumerTag);`
`762`	`762`	`}`
`763`	`763`
`764`		`- public override Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered,`
`765`		`- string exchange, string routingKey, in ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)`
	`764`	`+ public override async Task HandleBasicDeliver(string consumerTag, ulong deliveryTag, bool redelivered,`
	`765`	`+ string exchange, string routingKey, ReadOnlyBasicProperties properties, ReadOnlyMemory<byte> body)`
`766`	`766`	`{`
`767`	`767`	`_output.WriteLine("[ERROR] {0} HandleBasicDeliver {1}", _logPrefix, consumerTag);`
`768`		`- return base.HandleBasicDeliver(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);`
	`768`	`+ await base.HandleBasicDeliver(consumerTag, deliveryTag, redelivered, exchange, routingKey, properties, body);`
`769`	`769`	`}`
`770`	`770`
`771`	`771`	`public override Task HandleChannelShutdown(object channel, ShutdownEventArgs reason)`