Handle EmptyContent

UKHO · Oct 25, 2024 · 6bbd7fc · 6bbd7fc
1 parent d131701
commit 6bbd7fc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/FileShareClient/Internal/Extensions.cs b/FileShareClient/Internal/Extensions.cs
@@ -17,13 +17,13 @@ internal static class Extensions
         /// <returns></returns>
         public static async Task<T> ReadAsTypeAsync<T>(this HttpResponseMessage httpResponseMessage)
         {
-            var bodyJson = await httpResponseMessage.Content.ReadAsStringAsync(); 
+            var bodyJson = await httpResponseMessage.Content.ReadAsStringAsync();
             return JsonConvert.DeserializeObject<T>(bodyJson);
         }
 
         public static async Task<Stream> ReadAsStreamAsync(this HttpResponseMessage httpResponseMessage)
         {
-          return await httpResponseMessage.Content.ReadAsStreamAsync();
+            return await httpResponseMessage.Content.ReadAsStreamAsync();
         }
 
         /// <summary>
@@ -54,4 +54,4 @@ public static byte[] CalculateMD5(this Stream stream)
             }
         }
     }
-}
+}
diff --git a/FileShareClient/Models/Result.cs b/FileShareClient/Models/Result.cs
@@ -19,11 +19,19 @@ public class Result<T> : IResult<T>
 
     internal static class Result
     {
+        /// <summary>
+        /// Until .NET 5 (and including Framework 4.8), HttpResponseMessage.Content could return null.
+        /// After .NET 5, HttpResponseMessage.Content will never be null. If set to null then it will return System.Net.Http.EmptyContent, an internal class.
+        /// </summary>
+        /// <param name="response"></param>
+        /// <returns></returns>
+        private static bool HasContent(this HttpResponseMessage response) => response.Content != null && response.Content.GetType().Name != "EmptyContent";
+
         internal static async Task<IResult<Stream>> WithStreamData(HttpResponseMessage response)
         {
             Stream data = default;
 
-            if (response.IsSuccessStatusCode && response.Content != null)
+            if (response.IsSuccessStatusCode && response.HasContent())
             {
                 data = await response.ReadAsStreamAsync();
             }
@@ -35,7 +43,7 @@ internal static async Task<IResult<U>> WithObjectData<U>(HttpResponseMessage res
         {
             U data = default;
 
-            if (response.IsSuccessStatusCode && response.Content != null)
+            if (response.IsSuccessStatusCode && response.HasContent())
             {
                 data = await response.ReadAsTypeAsync<U>();
             }
@@ -59,7 +67,7 @@ private static async Task<IResult<U>> CreateResultAsync<U>(HttpResponseMessage r
                 Errors = new List<Error>()
             };
 
-            if (response.Content != null && !response.IsSuccessStatusCode)
+            if (!response.IsSuccessStatusCode && response.HasContent())
             {
                 try
                 {