From b2c918ee0c414b0825929cf2d26de2fedaec4666 Mon Sep 17 00:00:00 2001
From: Jon Skeet <jonskeet@google.com>
Date: Fri, 5 Jun 2020 11:00:20 +0100
Subject: [PATCH] Fix warnings around async methods/lambda expressions

Signed-off-by: Jon Skeet <jonskeet@google.com>
---
 .../AvroEventFormatter.cs                     |  4 ++--
 .../HttpTest.cs                               | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/CloudNative.CloudEvents.Avro/AvroEventFormatter.cs b/src/CloudNative.CloudEvents.Avro/AvroEventFormatter.cs
index c1da437..f4c759c 100644
--- a/src/CloudNative.CloudEvents.Avro/AvroEventFormatter.cs
+++ b/src/CloudNative.CloudEvents.Avro/AvroEventFormatter.cs
@@ -40,9 +40,9 @@ namespace CloudNative.CloudEvents
             return DecodeStructuredEvent(data, (IEnumerable<ICloudEventExtension>)extensions);
         }
 
-        public async Task<CloudEvent> DecodeStructuredEventAsync(Stream data, IEnumerable<ICloudEventExtension> extensions)
+        public Task<CloudEvent> DecodeStructuredEventAsync(Stream data, IEnumerable<ICloudEventExtension> extensions)
         {
-            return DecodeStructuredEvent(data, extensions);
+            return Task.FromResult(DecodeStructuredEvent(data, extensions));
         }
 
         public CloudEvent DecodeStructuredEvent(Stream data, IEnumerable<ICloudEventExtension> extensions = null)
diff --git a/test/CloudNative.CloudEvents.UnitTests/HttpTest.cs b/test/CloudNative.CloudEvents.UnitTests/HttpTest.cs
index 8288a90..e600d5a 100644
--- a/test/CloudNative.CloudEvents.UnitTests/HttpTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/HttpTest.cs
@@ -33,11 +33,11 @@ namespace CloudNative.CloudEvents.UnitTests
                 Prefixes = { listenerAddress }
             };
             listener.Start();
-            listener.GetContextAsync().ContinueWith(t =>
+            listener.GetContextAsync().ContinueWith(async t =>
             {
                 if (t.IsCompleted)
                 {
-                    HandleContext(t.Result);
+                    await HandleContext(t.Result);
                 }
             });
         }
@@ -61,15 +61,13 @@ namespace CloudNative.CloudEvents.UnitTests
             {
                 await pending(requestContext);
             }
-#pragma warning disable 4014
-            listener.GetContextAsync().ContinueWith(t =>
+            await listener.GetContextAsync().ContinueWith(async t =>
             {
                 if (t.IsCompleted)
                 {
-                    HandleContext(t.Result);
+                    await HandleContext(t.Result);
                 }
             });
-#pragma warning restore 4014
         }
 
         [Fact]
@@ -161,7 +159,7 @@ namespace CloudNative.CloudEvents.UnitTests
             var content = new CloudEventContent(cloudEvent, ContentMode.Binary, new JsonEventFormatter());
             content.Headers.Add(testContextHeader, ctx);
 
-            pendingRequests.TryAdd(ctx, async context =>
+            pendingRequests.TryAdd(ctx, context =>
             {
                 try
                 {
@@ -196,6 +194,7 @@ namespace CloudNative.CloudEvents.UnitTests
                 }
 
                 context.Response.Close();
+                return Task.CompletedTask;
             });
 
             var httpClient = new HttpClient();
@@ -282,7 +281,7 @@ namespace CloudNative.CloudEvents.UnitTests
             var content = new CloudEventContent(cloudEvent, ContentMode.Structured, new JsonEventFormatter());
             content.Headers.Add(testContextHeader, ctx);
 
-            pendingRequests.TryAdd(ctx, async context =>
+            pendingRequests.TryAdd(ctx, context =>
             {
                 try
                 {
@@ -313,6 +312,7 @@ namespace CloudNative.CloudEvents.UnitTests
                 }
 
                 context.Response.Close();
+                return Task.CompletedTask;
             });
 
             var httpClient = new HttpClient();
@@ -344,7 +344,7 @@ namespace CloudNative.CloudEvents.UnitTests
             await httpWebRequest.CopyFromAsync(cloudEvent, ContentMode.Structured, new JsonEventFormatter());
             httpWebRequest.Headers.Add(testContextHeader, ctx);
 
-            pendingRequests.TryAdd(ctx, async context =>
+            pendingRequests.TryAdd(ctx, context =>
             {
                 try
                 {
@@ -373,6 +373,7 @@ namespace CloudNative.CloudEvents.UnitTests
                 }
 
                 context.Response.Close();
+                return Task.CompletedTask;
             });
 
             var result = (HttpWebResponse)await httpWebRequest.GetResponseAsync();