diff --git a/src/MtgApiManager.Lib/Core/MtgApiServiceAdapter.cs b/src/MtgApiManager.Lib/Core/MtgApiServiceAdapter.cs index 34c3c0b..44398bf 100644 --- a/src/MtgApiManager.Lib/Core/MtgApiServiceAdapter.cs +++ b/src/MtgApiManager.Lib/Core/MtgApiServiceAdapter.cs @@ -15,31 +15,35 @@ internal class MtgApiServiceAdapter : IMtgApiServiceAdapter { public static async Task WebGetAsyncInternal(Uri requestUri) where T : IMtgResponse { - using var client = new HttpClient(); - using var response = await client.GetAsync(requestUri).ConfigureAwait(false); - if (response.IsSuccessStatusCode) + using (var client = new HttpClient()) { - MtgApiController.ParseHeaders(response.Headers); - var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false); - return await JsonSerializer.DeserializeAsync(stream).ConfigureAwait(false); - } - else - { - switch ((int)response.StatusCode) + using (var response = await client.GetAsync(requestUri).ConfigureAwait(false)) { - case (int)MtgApiError.BadRequest: - throw new MtgApiException(MtgApiError.BadRequest.GetDescription()); - case (int)MtgApiError.Forbidden: - throw new MtgApiException(MtgApiError.Forbidden.GetDescription()); - case (int)MtgApiError.InternalServerError: - throw new MtgApiException(MtgApiError.InternalServerError.GetDescription()); - case (int)MtgApiError.NotFound: - throw new MtgApiException(MtgApiError.NotFound.GetDescription()); - case (int)MtgApiError.ServiceUnavailable: - throw new MtgApiException(MtgApiError.ServiceUnavailable.GetDescription()); - default: - response.EnsureSuccessStatusCode(); - return default; + if (response.IsSuccessStatusCode) + { + MtgApiController.ParseHeaders(response.Headers); + var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false); + return await JsonSerializer.DeserializeAsync(stream).ConfigureAwait(false); + } + else + { + switch ((int)response.StatusCode) + { + case (int)MtgApiError.BadRequest: + throw new MtgApiException(MtgApiError.BadRequest.GetDescription()); + case (int)MtgApiError.Forbidden: + throw new MtgApiException(MtgApiError.Forbidden.GetDescription()); + case (int)MtgApiError.InternalServerError: + throw new MtgApiException(MtgApiError.InternalServerError.GetDescription()); + case (int)MtgApiError.NotFound: + throw new MtgApiException(MtgApiError.NotFound.GetDescription()); + case (int)MtgApiError.ServiceUnavailable: + throw new MtgApiException(MtgApiError.ServiceUnavailable.GetDescription()); + default: + response.EnsureSuccessStatusCode(); + return default; + } + } } } } diff --git a/src/MtgApiManager.Lib/Model/Card/ICard.cs b/src/MtgApiManager.Lib/Model/Card/ICard.cs index 7a11e17..66e4df1 100644 --- a/src/MtgApiManager.Lib/Model/Card/ICard.cs +++ b/src/MtgApiManager.Lib/Model/Card/ICard.cs @@ -61,7 +61,7 @@ public interface ICard /// /// Gets a value indicating whether the card has more than a single color. /// - bool IsMultiColor => Colors?.Length > 1; + bool IsMultiColor { get; } /// /// Gets the card layout. Possible values: normal, split, flip, double-faced, token, plane, scheme, phenomenon, leveler, vanguard diff --git a/src/MtgApiManager.Lib/Model/Card/IRuling.cs b/src/MtgApiManager.Lib/Model/Card/IRuling.cs index 79864d4..984d420 100644 --- a/src/MtgApiManager.Lib/Model/Card/IRuling.cs +++ b/src/MtgApiManager.Lib/Model/Card/IRuling.cs @@ -8,11 +8,11 @@ public interface IRuling /// /// Gets or sets the date of the ruling. /// - public string Date { get; } + string Date { get; } /// /// Gets or sets the text of the ruling. /// - public string Text { get; } + string Text { get; } } } \ No newline at end of file diff --git a/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj b/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj index 9e048f4..ef73daa 100644 --- a/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj +++ b/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net5.0 + netstandard2.0;netstandard2.1;net5.0 MtgApiManager.Lib Jason Regnier Jason Regnier diff --git a/src/MtgApiManager.Lib/MtgApiManager.Lib.xml b/src/MtgApiManager.Lib/MtgApiManager.Lib.xml index c696caa..231bd62 100644 --- a/src/MtgApiManager.Lib/MtgApiManager.Lib.xml +++ b/src/MtgApiManager.Lib/MtgApiManager.Lib.xml @@ -883,7 +883,9 @@ - + + + diff --git a/src/MtgApiManager.Lib/Service/ServiceProvider.cs b/src/MtgApiManager.Lib/Service/ServiceProvider.cs index 7fb9b5a..eb344d9 100644 --- a/src/MtgApiManager.Lib/Service/ServiceProvider.cs +++ b/src/MtgApiManager.Lib/Service/ServiceProvider.cs @@ -7,9 +7,9 @@ namespace MtgApiManager.Lib.Service public class MtgServiceProvider : IMtgServiceProvider { private readonly ApiVersion _apiVersion; - private readonly IMtgApiServiceAdapter _serviceAdapter; private readonly IModelMapper _modelMapper; private readonly bool _rateLimitOn; + private readonly IMtgApiServiceAdapter _serviceAdapter; private ICardService _cardService; private ISetService _setService; @@ -35,14 +35,13 @@ internal MtgServiceProvider( /// public ICardService GetCardService() { - return _cardService ??= new CardService(_serviceAdapter, _modelMapper, _apiVersion, _rateLimitOn); + return _cardService ?? (_cardService = new CardService(_serviceAdapter, _modelMapper, _apiVersion, _rateLimitOn)); } /// public ISetService GetSetService() { - return _setService ??= new SetService(_serviceAdapter, _modelMapper, _apiVersion, _rateLimitOn); + return _setService ?? (_setService = new SetService(_serviceAdapter, _modelMapper, _apiVersion, _rateLimitOn)); } } - } \ No newline at end of file