Receive link cleanup (#251)

* ReceiveLink static lambdas * Rename to DrainAsync * Approve API
Azure · Jan 16, 2024 · 8d21715 · 8d21715
1 parent d32534d
commit 8d21715
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/api/PublicAPI.Unshipped.txt b/api/PublicAPI.Unshipped.txt
@@ -992,7 +992,7 @@ Microsoft.Azure.Amqp.ReceivingAmqpLink.DisposeMessageAsync(System.ArraySegment<b
 Microsoft.Azure.Amqp.ReceivingAmqpLink.DisposeMessageAsync(System.ArraySegment<byte> deliveryTag, Microsoft.Azure.Amqp.Framing.Outcome outcome, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.Azure.Amqp.Framing.Outcome>
 Microsoft.Azure.Amqp.ReceivingAmqpLink.DisposeMessageAsync(System.ArraySegment<byte> deliveryTag, System.ArraySegment<byte> txnId, Microsoft.Azure.Amqp.Framing.Outcome outcome, bool batchable, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.Azure.Amqp.Framing.Outcome>
 Microsoft.Azure.Amqp.ReceivingAmqpLink.DisposeMessageAsync(System.ArraySegment<byte> deliveryTag, System.ArraySegment<byte> txnId, Microsoft.Azure.Amqp.Framing.Outcome outcome, bool batchable, System.TimeSpan timeout) -> System.Threading.Tasks.Task<Microsoft.Azure.Amqp.Framing.Outcome>
-Microsoft.Azure.Amqp.ReceivingAmqpLink.DrainAsyc(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task
+Microsoft.Azure.Amqp.ReceivingAmqpLink.DrainAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task
 Microsoft.Azure.Amqp.ReceivingAmqpLink.EndDisposeMessage(System.IAsyncResult result) -> Microsoft.Azure.Amqp.Framing.Outcome
 Microsoft.Azure.Amqp.ReceivingAmqpLink.EndReceiveMessage(System.IAsyncResult result, out Microsoft.Azure.Amqp.AmqpMessage message) -> bool
 Microsoft.Azure.Amqp.ReceivingAmqpLink.EndReceiveMessages(System.IAsyncResult result, out System.Collections.Generic.IEnumerable<Microsoft.Azure.Amqp.AmqpMessage> messages) -> bool

diff --git a/src/ReceivingAmqpLink.cs b/src/ReceivingAmqpLink.cs
@@ -228,11 +228,11 @@ public bool EndReceiveMessages(IAsyncResult result, out IEnumerable<AmqpMessage>
         /// Drains the credits on the link.
         /// </summary>
         /// <param name="cancellationToken">A cancellation token that can be used to signal the asynchronous operation should be canceled.</param>
-        public Task DrainAsyc(CancellationToken cancellationToken)
+        public Task DrainAsync(CancellationToken cancellationToken)
         {
             return Task.Factory.FromAsync(
-                (thisPtr, k, c, s) => new DrainAsyncResult(thisPtr, thisPtr.OperationTimeout, k, c, s),
-                r => DrainAsyncResult.End(r),
+                static (thisPtr, k, c, s) => new DrainAsyncResult(thisPtr, thisPtr.OperationTimeout, k, c, s),
+                static r => DrainAsyncResult.End(r),
                 this,
                 cancellationToken,
                 this);
@@ -992,7 +992,7 @@ public void Initialize(LinkedListNode<ReceiveAsyncResult> node, CancellationToke
 
                 if (cancellationToken.CanBeCanceled)
                 {
-                    this.cancellationTokenRegistration = cancellationToken.Register(o =>
+                    this.cancellationTokenRegistration = cancellationToken.Register(static o =>
                     {
                         ReceiveAsyncResult result = (ReceiveAsyncResult)o;
                         result.Cancel();
@@ -1356,4 +1356,4 @@ protected override void CompleteOnTimer()
             }
         }
     }
-}
+}
diff --git a/test/TestCases/AmqpLinkTests.cs b/test/TestCases/AmqpLinkTests.cs
@@ -704,7 +704,7 @@ public void AmqpLinkDrainTest()
                 rLink.AcceptMessage(message);
             }
 
-            rLink.DrainAsyc(CancellationToken.None).GetAwaiter().GetResult();
+            rLink.DrainAsync(CancellationToken.None).GetAwaiter().GetResult();
             Assert.Equal(0u, rLink.LinkCredit);
             Assert.False(rLink.Drain);
 

diff --git a/test/TestCases/CancellationTokenTests.cs b/test/TestCases/CancellationTokenTests.cs
@@ -623,7 +623,7 @@ async Task RunLinkDrainTest(bool cancelBefore, int timeoutMilliseconds = 0)
                         link.Settings.OperationTimeout = TimeSpan.FromMilliseconds(timeoutMilliseconds);
                     }
 
-                    var task = link.DrainAsyc(cts.Token);
+                    var task = link.DrainAsync(cts.Token);
                     if (!cancelBefore && timeoutMilliseconds == 0)
                     {
                         await Task.Yield();