From 4da9e954df3846d01aa0536f4e8143466a1d62f3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 11 Feb 2022 00:49:49 -0500
Subject: use Array.Empty to avoid unneeded array allocations

---
 src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.Web/Framework/Caching')

diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
index 064a7c3c..d037a123 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
@@ -15,7 +15,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Wiki
         private Cached<WikiMetadata> Metadata;
 
         /// <summary>The cached wiki data.</summary>
-        private Cached<WikiModEntry>[] Mods = new Cached<WikiModEntry>[0];
+        private Cached<WikiModEntry>[] Mods = Array.Empty<Cached<WikiModEntry>>();
 
 
         /*********
-- 
cgit 


From 077d8e4f401ad1806c6af0540f432366314a2300 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:25:00 -0400
Subject: remove some unused/redundant code

---
 src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs      | 1 -
 src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/SMAPI.Web/Framework/Caching')

diff --git a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
index 0d912c7b..a16e6b73 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
@@ -1,6 +1,5 @@
 using System;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
-using StardewModdingAPI.Web.Framework.Clients;
 
 namespace StardewModdingAPI.Web.Framework.Caching.Mods
 {
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
index 9769793c..f871a9da 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
-using StardewModdingAPI.Web.Framework.Clients;
 
 namespace StardewModdingAPI.Web.Framework.Caching.Mods
 {
-- 
cgit 


From 2e7c233f6c9bf6430672b39f970a3324deba79dd Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 21:48:55 -0400
Subject: enable nullable annotations by default (#837)

This adds `#nullable disable` to all existing code (except where null is impossible like enum files), so it can be migrated incrementally.
---
 src/SMAPI.Web/Framework/Caching/Cached.cs                         | 2 ++
 src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs       | 2 ++
 src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs  | 2 ++
 src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs      | 2 ++
 src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs | 2 ++
 src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs              | 2 ++
 6 files changed, 12 insertions(+)

(limited to 'src/SMAPI.Web/Framework/Caching')

diff --git a/src/SMAPI.Web/Framework/Caching/Cached.cs b/src/SMAPI.Web/Framework/Caching/Cached.cs
index 52041a16..aabbf146 100644
--- a/src/SMAPI.Web/Framework/Caching/Cached.cs
+++ b/src/SMAPI.Web/Framework/Caching/Cached.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Web.Framework.Caching
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
index a16e6b73..2020d747 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
 
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
index f871a9da..338562d8 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
index 2ab7ea5a..6edafddc 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using StardewModdingAPI.Toolkit.Framework.Clients.Wiki;
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
index d037a123..d1ccb9c7 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs b/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
index c04de4a5..6ae42488 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Caching.Wiki
 {
     /// <summary>The model for cached wiki metadata.</summary>
-- 
cgit 


From 0b48c1748b354458059c7607415288de072b01e9 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 12 Apr 2022 19:15:39 -0400
Subject: enable nullable annotations in the web project & related code (#837)

---
 src/SMAPI.Web/Framework/Caching/Cached.cs                     | 11 +++--------
 src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs   |  5 ++---
 .../Framework/Caching/Mods/ModCacheMemoryRepository.cs        |  5 ++---
 src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs  |  9 ++++-----
 .../Framework/Caching/Wiki/WikiCacheMemoryRepository.cs       | 11 +++++------
 src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs          | 11 +++--------
 6 files changed, 19 insertions(+), 33 deletions(-)

(limited to 'src/SMAPI.Web/Framework/Caching')

diff --git a/src/SMAPI.Web/Framework/Caching/Cached.cs b/src/SMAPI.Web/Framework/Caching/Cached.cs
index aabbf146..b393e1e1 100644
--- a/src/SMAPI.Web/Framework/Caching/Cached.cs
+++ b/src/SMAPI.Web/Framework/Caching/Cached.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Web.Framework.Caching
@@ -12,21 +10,18 @@ namespace StardewModdingAPI.Web.Framework.Caching
         ** Accessors
         *********/
         /// <summary>The cached data.</summary>
-        public T Data { get; set; }
+        public T Data { get; }
 
         /// <summary>When the data was last updated.</summary>
-        public DateTimeOffset LastUpdated { get; set; }
+        public DateTimeOffset LastUpdated { get; }
 
         /// <summary>When the data was last requested through the mod API.</summary>
-        public DateTimeOffset LastRequested { get; set; }
+        public DateTimeOffset LastRequested { get; internal set; }
 
 
         /*********
         ** Public methods
         *********/
-        /// <summary>Construct an empty instance.</summary>
-        public Cached() { }
-
         /// <summary>Construct an instance.</summary>
         /// <param name="data">The cached data.</param>
         public Cached(T data)
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
index 2020d747..fb74e9da 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System;
+using System.Diagnostics.CodeAnalysis;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
 
 namespace StardewModdingAPI.Web.Framework.Caching.Mods
@@ -16,7 +15,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         /// <param name="id">The mod's unique ID within the <paramref name="site"/>.</param>
         /// <param name="mod">The fetched mod.</param>
         /// <param name="markRequested">Whether to update the mod's 'last requested' date.</param>
-        bool TryGetMod(ModSiteKey site, string id, out Cached<IModPage> mod, bool markRequested = true);
+        bool TryGetMod(ModSiteKey site, string id, [NotNullWhen(true)] out Cached<IModPage>? mod, bool markRequested = true);
 
         /// <summary>Save data fetched for a mod.</summary>
         /// <param name="site">The mod site on which the mod is found.</param>
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
index 338562d8..4ba0bd20 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
 
@@ -25,7 +24,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         /// <param name="id">The mod's unique ID within the <paramref name="site"/>.</param>
         /// <param name="mod">The fetched mod.</param>
         /// <param name="markRequested">Whether to update the mod's 'last requested' date.</param>
-        public bool TryGetMod(ModSiteKey site, string id, out Cached<IModPage> mod, bool markRequested = true)
+        public bool TryGetMod(ModSiteKey site, string id, [NotNullWhen(true)] out Cached<IModPage>? mod, bool markRequested = true)
         {
             // get mod
             if (!this.Mods.TryGetValue(this.GetKey(site, id), out var cachedMod))
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
index 6edafddc..b8a0df34 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using StardewModdingAPI.Toolkit.Framework.Clients.Wiki;
 
 namespace StardewModdingAPI.Web.Framework.Caching.Wiki
@@ -14,16 +13,16 @@ namespace StardewModdingAPI.Web.Framework.Caching.Wiki
         *********/
         /// <summary>Get the cached wiki metadata.</summary>
         /// <param name="metadata">The fetched metadata.</param>
-        bool TryGetWikiMetadata(out Cached<WikiMetadata> metadata);
+        bool TryGetWikiMetadata([NotNullWhen(true)] out Cached<WikiMetadata>? metadata);
 
         /// <summary>Get the cached wiki mods.</summary>
         /// <param name="filter">A filter to apply, if any.</param>
-        IEnumerable<Cached<WikiModEntry>> GetWikiMods(Func<WikiModEntry, bool> filter = null);
+        IEnumerable<Cached<WikiModEntry>> GetWikiMods(Func<WikiModEntry, bool>? filter = null);
 
         /// <summary>Save data fetched from the wiki compatibility list.</summary>
         /// <param name="stableVersion">The current stable Stardew Valley version.</param>
         /// <param name="betaVersion">The current beta Stardew Valley version.</param>
         /// <param name="mods">The mod data.</param>
-        void SaveWikiData(string stableVersion, string betaVersion, IEnumerable<WikiModEntry> mods);
+        void SaveWikiData(string? stableVersion, string? betaVersion, IEnumerable<WikiModEntry> mods);
     }
 }
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
index d1ccb9c7..8b4338e2 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Toolkit.Framework.Clients.Wiki;
 
@@ -14,7 +13,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Wiki
         ** Fields
         *********/
         /// <summary>The saved wiki metadata.</summary>
-        private Cached<WikiMetadata> Metadata;
+        private Cached<WikiMetadata>? Metadata;
 
         /// <summary>The cached wiki data.</summary>
         private Cached<WikiModEntry>[] Mods = Array.Empty<Cached<WikiModEntry>>();
@@ -25,7 +24,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Wiki
         *********/
         /// <summary>Get the cached wiki metadata.</summary>
         /// <param name="metadata">The fetched metadata.</param>
-        public bool TryGetWikiMetadata(out Cached<WikiMetadata> metadata)
+        public bool TryGetWikiMetadata([NotNullWhen(true)] out Cached<WikiMetadata>? metadata)
         {
             metadata = this.Metadata;
             return metadata != null;
@@ -33,7 +32,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Wiki
 
         /// <summary>Get the cached wiki mods.</summary>
         /// <param name="filter">A filter to apply, if any.</param>
-        public IEnumerable<Cached<WikiModEntry>> GetWikiMods(Func<WikiModEntry, bool> filter = null)
+        public IEnumerable<Cached<WikiModEntry>> GetWikiMods(Func<WikiModEntry, bool>? filter = null)
         {
             foreach (var mod in this.Mods)
             {
@@ -46,7 +45,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Wiki
         /// <param name="stableVersion">The current stable Stardew Valley version.</param>
         /// <param name="betaVersion">The current beta Stardew Valley version.</param>
         /// <param name="mods">The mod data.</param>
-        public void SaveWikiData(string stableVersion, string betaVersion, IEnumerable<WikiModEntry> mods)
+        public void SaveWikiData(string? stableVersion, string? betaVersion, IEnumerable<WikiModEntry> mods)
         {
             this.Metadata = new Cached<WikiMetadata>(new WikiMetadata(stableVersion, betaVersion));
             this.Mods = mods.Select(mod => new Cached<WikiModEntry>(mod)).ToArray();
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs b/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
index 6ae42488..f53ea201 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Web.Framework.Caching.Wiki
 {
     /// <summary>The model for cached wiki metadata.</summary>
@@ -9,22 +7,19 @@ namespace StardewModdingAPI.Web.Framework.Caching.Wiki
         ** Accessors
         *********/
         /// <summary>The current stable Stardew Valley version.</summary>
-        public string StableVersion { get; set; }
+        public string? StableVersion { get; }
 
         /// <summary>The current beta Stardew Valley version.</summary>
-        public string BetaVersion { get; set; }
+        public string? BetaVersion { get; }
 
 
         /*********
         ** Public methods
         *********/
-        /// <summary>Construct an instance.</summary>
-        public WikiMetadata() { }
-
         /// <summary>Construct an instance.</summary>
         /// <param name="stableVersion">The current stable Stardew Valley version.</param>
         /// <param name="betaVersion">The current beta Stardew Valley version.</param>
-        public WikiMetadata(string stableVersion, string betaVersion)
+        public WikiMetadata(string? stableVersion, string? betaVersion)
         {
             this.StableVersion = stableVersion;
             this.BetaVersion = betaVersion;
-- 
cgit