Fix some NRT warnings.

Author: CXuesong

WikiClientLibrary/AbuseFilters/AbuseFilterList.cs

@@ -37,7 +37,7 @@ public AbuseFilterList(WikiSite site) : base(site)
     /// <inheritdoc />
     protected override AbuseFilter ItemFromJson(JsonNode json)
     {
-        return json.Deserialize<AbuseFilter>(MediaWikiHelper.WikiJsonSerializerOptions);
+        return json.Deserialize<AbuseFilter>(MediaWikiHelper.WikiJsonSerializerOptions)!;
     }
 
 }

WikiClientLibrary/Client/MediaWikiJsonResponseParser.cs

@@ -73,9 +73,9 @@ public override async Task<JsonNode> ParseResponseAsync(HttpResponseMessage resp
             var err = jobj["error"];
             if (err != null)
             {
-                var errcode = (string)err["code"];
+                var errcode = (string?)err["code"];
                 // err["*"]: API usage.
-                var errmessage = ((string)err["info"]).Trim();
+                var errmessage = ((string?)err["info"])?.Trim();
                 context.Logger.LogWarning("API error: {Code} - {Message}", errcode, errmessage);
                 OnApiError(errcode, errmessage, err, jobj, context);
             }
@@ -141,7 +141,7 @@ public override async Task<JsonNode> ParseResponseAsync(HttpResponseMessage resp
     /// </item>
     /// </list> 
     /// </remarks>
-    protected virtual void OnApiError(string errorCode, string errorMessage,
+    protected virtual void OnApiError(string? errorCode, string? errorMessage,
         JsonNode errorNode, JsonNode responseNode, WikiResponseParsingContext context)
     {
         var fullMessage = errorMessage;

WikiClientLibrary/Files/ChunkedUploadSource.cs

@@ -247,14 +247,15 @@ public async Task<UploadResult> StashNextChunkAsync(int chunkSize, CancellationT
                     // Possible error: code=stashfailed, info=Invalid chunk offset
                     // We will retry from the server-expected offset.
                     var err = jresult["error"];
-                    if (err != null && (string)err["code"] == "stashfailed" && err["offset"] != null)
+                    if (err != null && (string?)err["code"] == "stashfailed" && err["offset"] != null)
                     {
+                        var offset = (int)err["offset"]!;
                         Site.Logger.LogWarning("Server reported: {Message}. Will retry from offset {Offset}.",
-                            (string)err["info"], (int)err["offset"]);
-                        UploadedSize = (int)err["offset"];
+                            (string?)err["info"], offset);
+                        UploadedSize = offset;
                         goto RETRY;
                     }
-                    result = jresult["upload"].Deserialize<UploadResult>(MediaWikiHelper.WikiJsonSerializerOptions);
+                    result = jresult["upload"].Deserialize<UploadResult>(MediaWikiHelper.WikiJsonSerializerOptions)!;
                     // Ignore warnings, as long as we have filekey to continue the upload.
                     if (result.FileKey == null)
                     {
@@ -305,18 +306,15 @@ public override string ToString()
     private class ChunkedUploadResponseParser : MediaWikiJsonResponseParser
     {
 
-        public static new readonly ChunkedUploadResponseParser Default = new ChunkedUploadResponseParser();
+        public static new readonly ChunkedUploadResponseParser Default = new();
 
         /// <inheritdoc />
-        protected override void OnApiError(string errorCode, string errorMessage, JsonNode errorNode, JsonNode responseNode,
+        protected override void OnApiError(string? errorCode, string? errorMessage, JsonNode errorNode, JsonNode responseNode,
             WikiResponseParsingContext context)
         {
             // Possible error: code=stashfailed, info=Invalid chunk offset, offset=xxxx
-            // We will try to recover.
-            if (errorCode == "stashfailed" && errorNode["offset"] != null)
-            {
-                return;
-            }
+            // We will try to recover from the caller-side.
+            if (errorCode == "stashfailed" && errorNode["offset"] != null) return;
             base.OnApiError(errorCode, errorMessage, errorNode, responseNode, context);
         }
 

WikiClientLibrary/Files/UploadResult.cs

@@ -230,11 +230,11 @@ public static string FormatWarning(string warningCode, JsonElement context)
             switch (warningCode)
             {
                 case "duplicateversions":
-                    var timeStamps = context.EnumerateArray()
+                    var timestamps = context.EnumerateArray()
                         .Select(v => MediaWikiHelper.ParseDateTime(v.GetProperty("timestamp").GetString()))
                         .Take(4).ToList();
-                    contextString = string.Join(",", timeStamps.Take(3));
-                    if (timeStamps.Count > 3) contextString += ",…";
+                    contextString = string.Join(",", timestamps.Take(3));
+                    if (timestamps.Count > 3) contextString += ",…";
                     break;
                 case "duplicate":
                     var titles = context.EnumerateArray()

WikiClientLibrary/Files/WikiSiteExtensions.cs

@@ -71,7 +71,7 @@ public static async Task<UploadResult> UploadAsync(this WikiSite site, string ti
             var request = new MediaWikiFormRequestMessage(requestFields, true);
             site.Logger.LogDebug("Start uploading.");
             var jresult = await site.InvokeMediaWikiApiAsync(request, cancellationToken);
-            var result = jresult["upload"].Deserialize<UploadResult>(MediaWikiHelper.WikiJsonSerializerOptions);
+            var result = jresult["upload"].Deserialize<UploadResult>(MediaWikiHelper.WikiJsonSerializerOptions)!;
             site.Logger.LogInformation("Uploaded. Result={Result}.", result.ResultCode);
             return result;
         }