Clean up errors and warnings.

Author: Gonkers

samples/ScryfallApi.WebSample/Pages/Cards.cshtml.cs

@@ -9,8 +9,8 @@ namespace ScryfallApi.WebSample.Pages
     public class CardsModel : PageModel
     {
         private readonly ScryfallApiClient _scryfallApi;
-        public List<SelectListItem> SetList { get; set; }
-        public IReadOnlyCollection<Card> CardList { get; set; }
+        public List<SelectListItem> SetList { get; set; } = [];
+        public IReadOnlyCollection<Card> CardList { get; set; } = [];
 
         public CardsModel(ScryfallApiClient scryfallApi)
         {
@@ -20,13 +20,13 @@ public CardsModel(ScryfallApiClient scryfallApi)
         public async Task<IActionResult> OnGet([FromQuery] string set)
         {
             var sets = await _scryfallApi.Sets.Get();
-            SetList = sets.Data.OrderBy(s => s.Name).Select(s => new SelectListItem(s.Name, s.Code)).ToList();
+            SetList = sets?.Data.OrderBy(s => s.Name).Select(s => new SelectListItem(s.Name, s.Code)).ToList() ?? [];
 
             var selectedItem = SetList.FirstOrDefault(li => li.Value.Equals(set));
             if (selectedItem is not null)
             {
                 selectedItem.Selected = true;
-                CardList = (await _scryfallApi.Cards.Search($"e:{selectedItem.Value}", 1, SearchOptions.CardSort.Name)).Data;
+                CardList = (await _scryfallApi.Cards.Search($"e:{selectedItem.Value}", 1, SearchOptions.CardSort.Name))?.Data ?? [];
             }
             else
                 CardList = [];

samples/ScryfallApi.WebSample/Pages/Error.cshtml.cs

@@ -1,19 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ScryfallApi.WebSample.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     [IgnoreAntiforgeryToken]
     public class ErrorModel : PageModel
     {
-        public string RequestId { get; set; }
+        public string RequestId { get; set; } = string.Empty;
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 

samples/ScryfallApi.WebSample/Pages/Index.cshtml.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using ScryfallApi.Client;
 using ScryfallApi.Client.Models;
 
@@ -17,9 +15,9 @@ public IndexModel(ScryfallApiClient scryfallApi)
 
         public async Task OnGet()
         {
-            RandomCard = await _scryfallApi.Cards.GetRandom();
+            RandomCard = await _scryfallApi.Cards.GetRandom() ?? new Card();
         }
 
-        public Card RandomCard { get; set; }
+        public Card RandomCard { get; set; } = new Card();
     }
 }

samples/ScryfallApi.WebSample/Pages/Search.cshtml

@@ -20,15 +20,15 @@
 </div>
 @if (@Model?.Results?.Data != null && Model.Results.Data.Count > 0)
 {
-  @foreach (var card in @Model.Results?.Data)
+  @foreach (var card in @Model.Results?.Data ?? [])
   {
     <h3>Result: <a href="@card.ScryfallUri">@card.Name</a></h3>
     <div class="row">
       <div class="col-md-12">
         <a href="@card.ScryfallUri">
           @if (card.Layout.Equals("transform", StringComparison.OrdinalIgnoreCase))
           {
-            foreach (var face in card.CardFaces)
+            foreach (var face in card.CardFaces.Where(f => f is not null))
             {
               <img src="@face.ImageUris["normal"]" style="max-width: 320px;" />
             }

samples/ScryfallApi.WebSample/Pages/Search.cshtml.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using ScryfallApi.Client;
@@ -12,10 +10,10 @@ public class SearchModel : PageModel
         ScryfallApiClient _scryfallApi { get; }
 
         [BindProperty]
-        public ResultList<Card> Results { get; set; }
+        public ResultList<Card>? Results { get; set; }
 
         [BindProperty]
-        public string Query { get; set; }
+        public string Query { get; set; } = string.Empty;
 
         public SearchModel(ScryfallApiClient scryfallApi)
         {

samples/ScryfallApi.WebSample/Pages/Sets.cshtml

@@ -7,9 +7,9 @@
         {
             <li>@block.Key
                 <ul>
-                    @foreach (var set in block.OrderByDescending(s => s.ReleaseDate))
+                    @foreach (var set in block.Where(s => s is not null).OrderByDescending(s => s.ReleaseDate))
                     {
-                        <li>@set.Name (@set.Code) - @set.ReleaseDate.Value.ToShortDateString()</li>
+                        <li>@set.Name (@set.Code) - @set.ReleaseDate.ToString()</li>
                     }
                 </ul>
             </li>

samples/ScryfallApi.WebSample/Pages/Sets.cshtml.cs

@@ -1,17 +1,13 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using ScryfallApi.Client;
 using ScryfallApi.Client.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ScryfallApi.WebSample.Pages
 {
     public class SetsModel : PageModel
     {
         private readonly ScryfallApiClient _scryfallApi;
-        public List<Set> MtgExpansions { get; set; }
+        public List<Set> MtgExpansions { get; set; } = [];
 
         public SetsModel(ScryfallApiClient scryfallApi)
         {
@@ -21,8 +17,7 @@ public SetsModel(ScryfallApiClient scryfallApi)
         public async Task OnGet()
         {
             var setsResult = await _scryfallApi.Sets.Get();
-            MtgExpansions = new List<Set>(setsResult.Data.
-                Where(s => s.SetType.Equals("expansion") &&  !s.IsDigital));
+            MtgExpansions = [.. setsResult?.Data.Where(s => s.SetType.Equals("expansion") && !s.IsDigital) ?? []];
         }
     }
 }

samples/ScryfallApi.WebSample/Program.cs

@@ -17,10 +17,10 @@
 */
 
 // Example of customizing settings with code
-builder.Services.AddScryfallApiClient(config =>
+builder.Services.AddScryfallApiClient(new ScryfallApiClientConfig
 {
-    config.CacheDuration = TimeSpan.FromMinutes(30);
-    config.UseSlidingCacheExpiration = true;
+    CacheDuration = TimeSpan.FromMinutes(30),
+    UseSlidingCacheExpiration = true
 });
 
 var app = builder.Build();

src/ScryfallApi.Client/Apis/BaseRestService.cs

@@ -14,45 +14,44 @@ internal sealed class BaseRestService
     public BaseRestService(HttpClient httpClient, ScryfallApiClientConfig clientConfig, IMemoryCache cache)
     {
         _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
-        if (_httpClient.BaseAddress is null)
-            _httpClient.BaseAddress = clientConfig.ScryfallApiBaseAddress;
+        _httpClient.BaseAddress ??= clientConfig.ScryfallApiBaseAddress;
         _clientConfig = clientConfig;
         _cache = cache;
-
-        if (clientConfig.EnableCaching)
+        _cacheOptions = new MemoryCacheEntryOptions
         {
-            _cacheOptions = new MemoryCacheEntryOptions
-            {
-                AbsoluteExpirationRelativeToNow = _clientConfig.UseSlidingCacheExpiration ? null : _clientConfig.CacheDuration,
-                SlidingExpiration = _clientConfig.UseSlidingCacheExpiration ? _clientConfig.CacheDuration : null,
-            };
-        }
+            AbsoluteExpirationRelativeToNow = _clientConfig.UseSlidingCacheExpiration ? null : _clientConfig.CacheDuration,
+            SlidingExpiration = _clientConfig.UseSlidingCacheExpiration ? _clientConfig.CacheDuration : null,
+        };
     }
 
-    public async Task<T> GetAsync<T>(string resourceUrl, bool useCache = true) where T : BaseItem
+    public async Task<T?> GetAsync<T>(string resourceUrl, bool useCache = true) where T : BaseItem
     {
         if (string.IsNullOrWhiteSpace(resourceUrl))
             throw new ArgumentNullException(nameof(resourceUrl));
 
-        var cacheKey = _httpClient.BaseAddress.AbsoluteUri + resourceUrl;
+        var baseAddress = _httpClient.BaseAddress?.AbsoluteUri ?? ScryfallApiClientConfig.ScryfallApiAddress;
+        var cacheKey = baseAddress + resourceUrl;
 
-        if (useCache && _cache != null && _cache.TryGetValue(cacheKey, out T cached))
+        if (useCache && _cache.TryGetValue(cacheKey, out T? cached) && cached is not null)
             return cached;
 
-        var response = await _httpClient.GetAsync(resourceUrl).ConfigureAwait(false);
+        var request = new HttpRequestMessage(HttpMethod.Get, resourceUrl);
+        var response = await _httpClient.SendAsync(request).ConfigureAwait(false);
+        response.EnsureSuccessStatusCode();
+
         var jsonStream = await response.Content.ReadAsStreamAsync();
         var obj = await JsonSerializer.DeserializeAsync<T>(jsonStream);
 
-        if (obj.ObjectType.Equals("error", StringComparison.OrdinalIgnoreCase))
+        if (obj?.ObjectType.Equals("error", StringComparison.OrdinalIgnoreCase) ?? false)
         {
             jsonStream.Position = 0;
             var error = await JsonSerializer.DeserializeAsync<Error>(jsonStream);
-            throw new ScryfallApiException(error.Details)
+            throw new ScryfallApiException(error?.Details ?? "An unknown response was returned from the API.")
             {
                 ResponseStatusCode = response.StatusCode,
-                RequestUri = response.RequestMessage.RequestUri,
-                RequestMethod = response.RequestMessage.Method,
-                ScryfallError = error
+                RequestUri = request.RequestUri ?? new(ScryfallApiClientConfig.ScryfallApiAddress),
+                RequestMethod = request.Method,
+                ScryfallError = error ?? new()
             };
         }
 

src/ScryfallApi.Client/Apis/BulkData.cs

@@ -12,42 +12,50 @@ internal BulkData(BaseRestService restService)
         _restService = restService;
     }
 
-    public Task<ResultList<BulkDataItem>> Get() => _restService.GetAsync<ResultList<BulkDataItem>>("/bulk-data", false);
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+    public Task<ResultList<BulkDataItem>?> Get() => _restService.GetAsync<ResultList<BulkDataItem>>("/bulk-data", false);
 
     public async Task<ICollection<BulkDataItem>> Get(DateTimeOffset updatedSince)
     {
         var bulkData = await Get();
-        return bulkData.Data.Where(d => d.LastUpdated >= updatedSince).ToList();
+        return bulkData?.Data.Where(d => d.LastUpdated >= updatedSince).ToList() ?? [];
     }
 
-    public async Task<BulkDataItem> Get(DateTimeOffset updatedSince, string bulkDataType) => 
-        (await Get(updatedSince)).FirstOrDefault(d => d.Type.Equals(bulkDataType, StringComparison.OrdinalIgnoreCase));
+    public async Task<BulkDataItem?> Get(DateTimeOffset updatedSince, string bulkDataType) =>
+        (await Get(updatedSince))
+            .FirstOrDefault(d => d.Type.Equals(bulkDataType, StringComparison.OrdinalIgnoreCase)
+        );
 
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+
+    /// <summary>
+    /// Lookup 'codes' of bulk data types
+    /// </summary>
     public static class Types
     {
         /// <summary>
-        /// A JSON file containing one Scryfall card object for each Oracle ID on Scryfall. The 
-        /// chosen sets for the cards are an attempt to return the most up-to-date recognizable 
+        /// A JSON file containing one Scryfall card object for each Oracle ID on Scryfall. The
+        /// chosen sets for the cards are an attempt to return the most up-to-date recognizable
         /// version of the card.
         /// </summary>
-        public static string OracleCards  => "oracle_cards";
+        public static string OracleCards => "oracle_cards";
 
         /// <summary>
-        /// A JSON file of Scryfall card objects that together contain all unique artworks. The 
+        /// A JSON file of Scryfall card objects that together contain all unique artworks. The
         /// chosen cards promote the best image scans.
         /// </summary>
-        public static string UniqueArtwork  => "unique_artwork";
+        public static string UniqueArtwork => "unique_artwork";
 
         /// <summary>
-        /// A JSON file containing every card object on Scryfall in English or the printed 
+        /// A JSON file containing every card object on Scryfall in English or the printed
         /// language if the card is only available in one language.
         /// </summary>
         public static string DefaultCards => "default_cards";
 
         /// <summary>
         /// A JSON file containing every card object on Scryfall in every language.
         /// </summary>
-        public static string AllCards  => "all_cards";
+        public static string AllCards => "all_cards";
 
         /// <summary>
         /// A JSON file containing all Rulings on Scryfall. Each ruling refers to cards via an `oracle_id`.