Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor of response processing #208

Merged
merged 1 commit into from
Jan 3, 2023
Merged

Refactor of response processing #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Source/EasyNetQ.Management.Client/Internals/HttpResponseMessageExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System.Net;

namespace EasyNetQ.Management.Client.Internals;

internal static class HttpResponseMessageExtensions
{
public static void EnsureExpectedStatusCode(this HttpResponseMessage response, Func<HttpStatusCode, bool> isExpected)
{
if (!isExpected(response.StatusCode))
throw new UnexpectedHttpStatusCodeException(response.StatusCode);
}
}
61 changes: 14 additions & 47 deletions Source/EasyNetQ.Management.Client/ManagementClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,11 +684,9 @@ private async Task<T> GetAsync<T>(
using var request = CreateRequest(HttpMethod.Get, path, queryParameters);
using var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);

return await DeserializeResponseAsync<T>(
statusCode => statusCode == HttpStatusCode.OK,
response,
cancellationToken
).ConfigureAwait(false);
response.EnsureExpectedStatusCode(statusCode => statusCode == HttpStatusCode.OK);

return (await response.Content.ReadFromJsonAsync<T>(SerializerOptions, cancellationToken).ConfigureAwait(false))!;
}

private async Task<TResult> PostAsync<TItem, TResult>(
Expand All @@ -697,15 +695,13 @@ private async Task<TResult> PostAsync<TItem, TResult>(
CancellationToken cancellationToken = default
)
{
using var requestContent = CreateRequestContent(item);
using var requestContent = JsonContent.Create(item, JsonMediaTypeHeaderValue, SerializerOptions);
using var request = CreateRequest(HttpMethod.Post, path, null, requestContent);
using var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);

return await DeserializeResponseAsync<TResult>(
statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent,
response,
cancellationToken
).ConfigureAwait(false);
response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent);

return (await response.Content.ReadFromJsonAsync<TResult>(SerializerOptions, cancellationToken).ConfigureAwait(false))!;
}

private async Task PostAsync<TItem>(
Expand All @@ -714,14 +710,11 @@ private async Task PostAsync<TItem>(
CancellationToken cancellationToken = default
)
{
using var requestContent = CreateRequestContent(item);
using var requestContent = JsonContent.Create(item, JsonMediaTypeHeaderValue, SerializerOptions);
using var request = CreateRequest(HttpMethod.Post, path, null, requestContent);
using var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);

await DeserializeResponseAsync(
statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent,
response
).ConfigureAwait(false);
response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent);
}

private async Task PostAsync(
Expand All @@ -732,16 +725,15 @@ private async Task PostAsync(
using var request = CreateRequest(HttpMethod.Post, path);
using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);

await DeserializeResponseAsync(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent, response)
.ConfigureAwait(false);
response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent);
}

private 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);

await DeserializeResponseAsync(statusCode => statusCode == HttpStatusCode.NoContent, response).ConfigureAwait(false);
response.EnsureExpectedStatusCode(statusCode => statusCode == HttpStatusCode.NoContent);
}

private async Task PutAsync<T>(
Expand All @@ -750,23 +742,19 @@ private async Task PutAsync<T>(
CancellationToken cancellationToken = default
)
{
using var requestContent = CreateRequestContent(item);
using var requestContent = JsonContent.Create(item, JsonMediaTypeHeaderValue, SerializerOptions);
using var request = CreateRequest(HttpMethod.Put, path, null, requestContent);
using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);

await DeserializeResponseAsync(
statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent, response
).ConfigureAwait(false);
response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent);
}

private 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);

await DeserializeResponseAsync(
statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent, response
).ConfigureAwait(false);
response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent);
}

private HttpRequestMessage CreateRequest(
Expand All @@ -783,27 +771,6 @@ private HttpRequestMessage CreateRequest(
return request;
}

private static HttpContent CreateRequestContent<T>(T item) => JsonContent.Create(item, JsonMediaTypeHeaderValue, SerializerOptions);

private static Task DeserializeResponseAsync(Func<HttpStatusCode, bool> success, HttpResponseMessage response)
{
return success(response.StatusCode)
? Task.CompletedTask
: Task.FromException(new UnexpectedHttpStatusCodeException(response.StatusCode));
}

private static async Task<T> DeserializeResponseAsync<T>(
Func<HttpStatusCode, bool> success,
HttpResponseMessage response,
CancellationToken cancellationToken
)
{
if (!success(response.StatusCode))
throw new UnexpectedHttpStatusCodeException(response.StatusCode);

return (await response.Content.ReadFromJsonAsync<T>(SerializerOptions, cancellationToken))!;
}

private static IReadOnlyDictionary<string, string>? MergeQueryParameters(params IReadOnlyDictionary<string, string>?[]? multipleQueryParameters)
{
if (multipleQueryParameters == null || multipleQueryParameters.Length == 0)
Expand Down