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.

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

introduce new GetJsonAsync method with default value parameter #3109

Merged
merged 1 commit into from
Aug 5, 2023
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
2 changes: 1 addition & 1 deletion Oqtane.Client/Services/AliasService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public AliasService(HttpClient http, SiteState siteState) : base(http, siteState
/// <inheritdoc />
public async Task<List<Alias>> GetAliasesAsync()
{
List<Alias> aliases = await GetJsonAsync<List<Alias>>(ApiUrl);
List<Alias> aliases = await GetJsonAsync<List<Alias>>(ApiUrl, Enumerable.Empty<Alias>().ToList());
return aliases.OrderBy(item => item.Name).ToList();
}

Expand Down
11 changes: 10 additions & 1 deletion Oqtane.Client/Services/ServiceBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,19 @@ protected async Task<T> GetJsonAsync<T>(string uri)
{
return await response.Content.ReadFromJsonAsync<T>();
}

return default;
}

protected async Task<T> GetJsonAsync<T>(string uri, T defaultvalue)
{
var response = await GetHttpClient().GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, CancellationToken.None);
if (await CheckResponse(response, uri) && ValidateJsonContent(response.Content))
{
return await response.Content.ReadFromJsonAsync<T>();
}
return defaultvalue;
}

protected async Task PutAsync(string uri)
{
var response = await GetHttpClient().PutAsync(uri, null);
Expand Down