UnexpectedHttpStatusCodeException: more verbose message (#333)

* UnexpectedHttpStatusCodeException: more verbose message * Fix * FromHttpResponseMessageAsync * Fix --------- Co-authored-by: Ilya Nikulshin <[email protected]>
EasyNetQ · May 28, 2024 · 5c4d635 · 5c4d635
1 parent 109778f
commit 5c4d635
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 26 deletions.
diff --git a/Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt b/Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt
@@ -425,13 +425,13 @@ namespace EasyNetQ.Management.Client
     public class UnexpectedHttpStatusCodeException : System.Exception
     {
         public UnexpectedHttpStatusCodeException() { }
-        public UnexpectedHttpStatusCodeException(System.Net.Http.HttpResponseMessage response) { }
-        public UnexpectedHttpStatusCodeException(System.Net.HttpStatusCode statusCode) { }
         public UnexpectedHttpStatusCodeException(string message) { }
         protected UnexpectedHttpStatusCodeException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
         public UnexpectedHttpStatusCodeException(string message, System.Exception inner) { }
+        protected UnexpectedHttpStatusCodeException(string message, System.Net.HttpStatusCode statusCode) { }
         public System.Net.HttpStatusCode StatusCode { get; }
         public int StatusCodeNumber { get; }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.UnexpectedHttpStatusCodeException> FromHttpResponseMessageAsync(System.Net.Http.HttpResponseMessage response, System.Threading.CancellationToken cancellationToken = default) { }
     }
 }
 namespace EasyNetQ.Management.Client.Model

diff --git a/Source/EasyNetQ.Management.Client/Internals/HttpResponseMessageExtensions.cs b/Source/EasyNetQ.Management.Client/Internals/HttpResponseMessageExtensions.cs
@@ -1,12 +1,13 @@
 using System.Net;
+using System.Threading;
 
 namespace EasyNetQ.Management.Client.Internals;
 
 internal static class HttpResponseMessageExtensions
 {
-    public static void EnsureExpectedStatusCode(this HttpResponseMessage response, Func<HttpStatusCode, bool> isExpected)
+    public static async Task EnsureExpectedStatusCodeAsync(this HttpResponseMessage response, Func<HttpStatusCode, bool> isExpected, CancellationToken cancellationToken = default)
     {
         if (!isExpected(response.StatusCode))
-            throw new UnexpectedHttpStatusCodeException(response);
+            throw await UnexpectedHttpStatusCodeException.FromHttpResponseMessageAsync(response, cancellationToken).ConfigureAwait(false);
     }
 }
diff --git a/Source/EasyNetQ.Management.Client/ManagementClient.cs b/Source/EasyNetQ.Management.Client/ManagementClient.cs
@@ -182,7 +182,7 @@ public async Task<bool> CheckAsync(
         if (response.StatusCode == HttpStatusCode.ServiceUnavailable)
             return false;
 
-        throw new UnexpectedHttpStatusCodeException(response);
+        throw await UnexpectedHttpStatusCodeException.FromHttpResponseMessageAsync(response, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task<TResult> GetAsync<TResult>(
@@ -194,7 +194,7 @@ public async Task<TResult> GetAsync<TResult>(
         using var request = CreateRequest(HttpMethod.Get, path, queryParameters);
         using var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
 
-        response.EnsureExpectedStatusCode(statusCode => statusCode == HttpStatusCode.OK);
+        await response.EnsureExpectedStatusCodeAsync(statusCode => statusCode == HttpStatusCode.OK, cancellationToken).ConfigureAwait(false);
 
         try
         {
@@ -217,7 +217,7 @@ public async Task<TResult> PostAsync<TItem, TResult>(
         using var request = CreateRequest(HttpMethod.Post, path, null, requestContent);
         using var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
 
-        response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent);
+        await response.EnsureExpectedStatusCodeAsync(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent, cancellationToken).ConfigureAwait(false);
 
         try
         {
@@ -240,7 +240,7 @@ public async Task PostAsync<TItem>(
         using var request = CreateRequest(HttpMethod.Post, path, null, requestContent);
         using var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
 
-        response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent);
+        await response.EnsureExpectedStatusCodeAsync(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task PostAsync(
@@ -251,15 +251,15 @@ public async Task PostAsync(
         using var request = CreateRequest(HttpMethod.Post, path);
         using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 
-        response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent);
+        await response.EnsureExpectedStatusCodeAsync(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task DeleteAsync(RelativePath path, CancellationToken cancellationToken = default)
     {
         using var request = CreateRequest(HttpMethod.Delete, path);
         using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 
-        response.EnsureExpectedStatusCode(statusCode => statusCode == HttpStatusCode.NoContent);
+        await response.EnsureExpectedStatusCodeAsync(statusCode => statusCode == HttpStatusCode.NoContent, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task PutAsync<TBody>(
@@ -272,15 +272,15 @@ public async Task PutAsync<TBody>(
         using var request = CreateRequest(HttpMethod.Put, path, null, requestContent);
         using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 
-        response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent);
+        await response.EnsureExpectedStatusCodeAsync(statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task PutAsync(RelativePath path, CancellationToken cancellationToken = default)
     {
         using var request = CreateRequest(HttpMethod.Put, path);
         using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 
-        response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent);
+        await response.EnsureExpectedStatusCodeAsync(statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent, cancellationToken).ConfigureAwait(false);
     }
 
     private HttpRequestMessage CreateRequest(

diff --git a/Source/EasyNetQ.Management.Client/UnexpectedHttpStatusCodeException.cs b/Source/EasyNetQ.Management.Client/UnexpectedHttpStatusCodeException.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using System.Runtime.Serialization;
+using System.Text;
 
 namespace EasyNetQ.Management.Client;
 
@@ -13,27 +14,13 @@ public class UnexpectedHttpStatusCodeException : Exception
     //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
     //
 
-    private const string NoRequest = "<null>";
-
     public HttpStatusCode StatusCode { get; private init; }
     public int StatusCodeNumber => (int)StatusCode;
 
     public UnexpectedHttpStatusCodeException()
     {
     }
 
-    public UnexpectedHttpStatusCodeException(HttpStatusCode statusCode) :
-        base($"Unexpected Status Code: {(int)statusCode} {statusCode}")
-    {
-        StatusCode = statusCode;
-    }
-
-    public UnexpectedHttpStatusCodeException(HttpResponseMessage response) :
-        base($"Unexpected Status Code: {(int)response.StatusCode} {response.StatusCode} from request: {response.RequestMessage?.ToString() ?? NoRequest}")
-    {
-        StatusCode = response.StatusCode;
-    }
-
     public UnexpectedHttpStatusCodeException(string message) : base(message)
     {
     }
@@ -48,4 +35,51 @@ StreamingContext context
     ) : base(info, context)
     {
     }
+
+    protected UnexpectedHttpStatusCodeException(string message, HttpStatusCode statusCode) : base(message)
+    {
+        StatusCode = statusCode;
+    }
+
+    public static async Task<UnexpectedHttpStatusCodeException> FromHttpResponseMessageAsync(HttpResponseMessage response, CancellationToken cancellationToken = default)
+    {
+        var sb = new StringBuilder("Unexpected response: StatusCode: ");
+        sb.Append((int)response.StatusCode);
+        sb.Append(" ");
+        sb.Append(response.StatusCode);
+        sb.Append(", Content: ");
+        if (response.Content != null)
+        {
+            try
+            {
+#if NET5_0_OR_GREATER
+                var content = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+#else
+                var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+#endif
+                sb.Append('\'');
+                sb.Append(content);
+                sb.Append('\'');
+            }
+            catch
+            {
+                sb.Append("<not a string>");
+            }
+        }
+        else
+        {
+            sb.Append("<null>");
+        }
+        sb.Append(" from request: ");
+        if (response.RequestMessage != null)
+        {
+            sb.Append(response.RequestMessage);
+        }
+        else
+        {
+            sb.Append("<null>");
+        }
+
+        return new UnexpectedHttpStatusCodeException(sb.ToString(), response.StatusCode);
+    }
 }