Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public async Task Turnierplan_Client_Works_As_Expected_With_Test_Server()

var client = new TurnierplanClient(server.CreateClient(), options);

var tournaments = await client.GetTournaments(seedingResult.FolderId, TestContext.Current.CancellationToken);
var tournaments = await client.GetTournamentsAsync(seedingResult.FolderId, TestContext.Current.CancellationToken);

tournaments.Should().BeEquivalentTo([
new TournamentHeader
Expand All @@ -61,8 +61,8 @@ public async Task Turnierplan_Client_Works_As_Expected_With_Test_Server()
}
]);

var tournament1 = await client.GetTournament(seedingResult.Tournament1Id, TestContext.Current.CancellationToken);
var tournament2 = await client.GetTournament(seedingResult.Tournament2Id, TestContext.Current.CancellationToken);
var tournament1 = await client.GetTournamentAsync(seedingResult.Tournament1Id, TestContext.Current.CancellationToken);
var tournament2 = await client.GetTournamentAsync(seedingResult.Tournament2Id, TestContext.Current.CancellationToken);

tournament1.Should().BeEquivalentTo(new Tournament
{
Expand Down Expand Up @@ -345,7 +345,7 @@ public async Task Turnierplan_Client_Throws_Exception_When_Version_Does_Not_Matc

var action = async () =>
{
_ = await client.GetTournament("x");
_ = await client.GetTournamentAsync("x");
};

var actualVersion = System.Text.RegularExpressions.Regex.Replace(typeof(TurnierplanClient).Assembly.GetName().Version!.ToString(), @"\.0$", string.Empty);
Expand Down
10 changes: 5 additions & 5 deletions src/Turnierplan.Adapter/TurnierplanClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ public TurnierplanClient(TurnierplanClientOptions options)
/// <item>Thrown if the version of the server does not match the version of the <c>Turnierplan.Adapter</c> library.</item>
/// </list>
/// </exception>
public async Task<Tournament> GetTournament(string tournamentId, CancellationToken cancellationToken = default)
public async Task<Tournament> GetTournamentAsync(string tournamentId, CancellationToken cancellationToken = default)
{
var request = new HttpRequestMessage(HttpMethod.Get, $"/api/tournaments/{tournamentId}");
var response = await _httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);

EnsureSuccessResponse(response);
VerifyServerVersion(response);

return await Deserialize<Tournament>(response).ConfigureAwait(false);
return await DeserializeAsync<Tournament>(response).ConfigureAwait(false);
}

/// <summary>
Expand All @@ -96,7 +96,7 @@ public async Task<Tournament> GetTournament(string tournamentId, CancellationTok
/// <item>Thrown if the version of the server does not match the version of the <c>Turnierplan.Adapter</c> library.</item>
/// </list>
/// </exception>
public async Task<List<TournamentHeader>> GetTournaments(string folderId, CancellationToken cancellationToken = default)
public async Task<List<TournamentHeader>> GetTournamentsAsync(string folderId, CancellationToken cancellationToken = default)
{
var query = new QueryBuilder { { "folderId", folderId } };
var request = new HttpRequestMessage(HttpMethod.Get, $"/api/tournaments{query}");
Expand All @@ -105,7 +105,7 @@ public async Task<List<TournamentHeader>> GetTournaments(string folderId, Cancel
EnsureSuccessResponse(response);
VerifyServerVersion(response);

return await Deserialize<List<TournamentHeader>>(response).ConfigureAwait(false);
return await DeserializeAsync<List<TournamentHeader>>(response).ConfigureAwait(false);
}

/// <summary>
Expand Down Expand Up @@ -165,7 +165,7 @@ private static void EnsureSuccessResponse(HttpResponseMessage response)
}
}

private static async Task<T> Deserialize<T>(HttpResponseMessage response)
private static async Task<T> DeserializeAsync<T>(HttpResponseMessage response)
{
var data = await response.Content.ReadFromJsonAsync<T>(__serializerOptions).ConfigureAwait(false);

Expand Down