From a593eda30f82af474887d91458b0e9158f66fefc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:24:59 -0400
Subject: use target-typed new

---
 src/SMAPI.Web/Framework/Compression/GzipHelper.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
index 676d660d..93cde9d3 100644
--- a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
@@ -29,9 +29,9 @@ namespace StardewModdingAPI.Web.Framework.Compression
 
             // compressed
             byte[] compressedData;
-            using (MemoryStream stream = new MemoryStream())
+            using (MemoryStream stream = new())
             {
-                using (GZipStream zipStream = new GZipStream(stream, CompressionLevel.Optimal, leaveOpen: true))
+                using (GZipStream zipStream = new(stream, CompressionLevel.Optimal, leaveOpen: true))
                     zipStream.Write(buffer, 0, buffer.Length);
 
                 stream.Position = 0;
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Web.Framework.Compression
                 return rawText;
 
             // decompress
-            using MemoryStream memoryStream = new MemoryStream();
+            using MemoryStream memoryStream = new();
             {
                 // read length prefix
                 int dataLength = BitConverter.ToInt32(zipBuffer, 0);
@@ -78,7 +78,7 @@ namespace StardewModdingAPI.Web.Framework.Compression
                 // read data
                 byte[] buffer = new byte[dataLength];
                 memoryStream.Position = 0;
-                using (GZipStream gZipStream = new GZipStream(memoryStream, CompressionMode.Decompress))
+                using (GZipStream gZipStream = new(memoryStream, CompressionMode.Decompress))
                     gZipStream.Read(buffer, 0, buffer.Length);
 
                 // return original string
-- 
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/Compression/GzipHelper.cs  | 2 ++
 src/SMAPI.Web/Framework/Compression/IGzipHelper.cs | 2 ++
 2 files changed, 4 insertions(+)

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

diff --git a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
index 93cde9d3..843b7735 100644
--- a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.IO;
 using System.IO.Compression;
diff --git a/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs b/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
index a000865e..e1ec9b67 100644
--- a/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Compression
 {
     /// <summary>Handles GZip compression logic.</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/Compression/GzipHelper.cs  | 9 ++++++---
 src/SMAPI.Web/Framework/Compression/IGzipHelper.cs | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

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

diff --git a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
index 843b7735..e7a2df13 100644
--- a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.IO.Compression;
 using System.Text;
@@ -53,8 +52,12 @@ namespace StardewModdingAPI.Web.Framework.Compression
         /// <summary>Decompress a string.</summary>
         /// <param name="rawText">The compressed text.</param>
         /// <remarks>Derived from <a href="https://stackoverflow.com/a/17993002/262123"/>.</remarks>
-        public string DecompressString(string rawText)
+        [return: NotNullIfNotNull("rawText")]
+        public string? DecompressString(string? rawText)
         {
+            if (rawText is null)
+                return rawText;
+
             // get raw bytes
             byte[] zipBuffer;
             try
diff --git a/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs b/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
index e1ec9b67..ef2d5696 100644
--- a/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Web.Framework.Compression
 {
@@ -14,6 +14,7 @@ namespace StardewModdingAPI.Web.Framework.Compression
 
         /// <summary>Decompress a string.</summary>
         /// <param name="rawText">The compressed text.</param>
-        string DecompressString(string rawText);
+        [return: NotNullIfNotNull("rawText")]
+        string? DecompressString(string? rawText);
     }
 }
-- 
cgit