chore: enable #nullable iteration 2 (#3167)

Author: mxschmitt

src/Playwright/Core/APIResponse.cs

@@ -67,7 +67,7 @@ public async Task<byte[]> BodyAsync()
             return await _context.WrapApiCallAsync(
                 async () =>
                 {
-                    var response = await _context.SendMessageToServerAsync("fetchResponseBody", new Dictionary<string, object> { ["fetchUid"] = FetchUid() }).ConfigureAwait(false);
+                    var response = await _context.SendMessageToServerAsync("fetchResponseBody", new Dictionary<string, object?> { ["fetchUid"] = FetchUid() }).ConfigureAwait(false);
                     if (response?.TryGetProperty("binary", out var binary) == true)
                     {
                         return Convert.FromBase64String(binary.ToString());
@@ -96,11 +96,11 @@ public async Task<string> TextAsync()
 
     internal async Task<string[]> FetchLogAsync()
     {
-        var response = await _context.SendMessageToServerAsync("fetchLog", new Dictionary<string, object> { ["fetchUid"] = FetchUid() }).ConfigureAwait(false);
+        var response = await _context.SendMessageToServerAsync("fetchLog", new Dictionary<string, object?> { ["fetchUid"] = FetchUid() }).ConfigureAwait(false);
         return response.Value.GetProperty("log").ToObject<string[]>();
     }
 
-    public ValueTask DisposeAsync() => new(_context.SendMessageToServerAsync("disposeAPIResponse", new Dictionary<string, object> { ["fetchUid"] = FetchUid() }));
+    public ValueTask DisposeAsync() => new(_context.SendMessageToServerAsync("disposeAPIResponse", new Dictionary<string, object?> { ["fetchUid"] = FetchUid() }));
 
     public override string ToString()
     {

src/Playwright/Core/BrowserType.cs

@@ -176,8 +176,7 @@ public async Task<IBrowser> ConnectAsync(string wsEndpoint, BrowserTypeConnectOp
             {
                 new KeyValuePair<string, string>("x-playwright-browser", Name),
             }.ToDictionary(pair => pair.Key, pair => pair.Value);
-        var localUtils = _connection.LocalUtils;
-        var pipe = await localUtils.ConnectAsync(wsEndpoint: wsEndpoint, headers: headers, slowMo: options.SlowMo, timeout: options.Timeout, exposeNetwork: options.ExposeNetwork).ConfigureAwait(false);
+        var pipe = await _connection.LocalUtils!.ConnectAsync(wsEndpoint: wsEndpoint, headers: headers, slowMo: options.SlowMo, timeout: options.Timeout, exposeNetwork: options.ExposeNetwork).ConfigureAwait(false);
 
         void ClosePipe()
         {

src/Playwright/Core/CDPSession.cs

@@ -58,7 +58,7 @@ internal override void OnMessage(string method, JsonElement? serverParams)
     [MethodImpl(MethodImplOptions.NoInlining)]
     public async Task<JsonElement?> SendAsync(string method, Dictionary<string, object>? args = null)
     {
-        var newArgs = new Dictionary<string, object>() { { "method", method } };
+        var newArgs = new Dictionary<string, object?>() { { "method", method } };
         if (args != null)
         {
             newArgs["params"] = args;

src/Playwright/Helpers/ChannelHelpers.cs

@@ -26,8 +26,6 @@
 using System.Text.Json;
 using Microsoft.Playwright.Transport;
 
-#nullable enable
-
 namespace Microsoft.Playwright.Helpers;
 
 internal static class ChannelHelpers

src/Playwright/Helpers/ClassUtils.cs

@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 
+#nullable enable
 namespace Microsoft.Playwright.Helpers;
 
 internal static class ClassUtils

src/Playwright/Helpers/EnumHelper.cs

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+#nullable enable
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

src/Playwright/Helpers/RouteFallbackOptionsExtensions.cs

@@ -22,7 +22,6 @@
  * SOFTWARE.
  */
 #nullable enable
-
 namespace Microsoft.Playwright.Helpers;
 
 internal static class RouteFallbackOptionsExtensions

src/Playwright/Transport/ApiZone.cs

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+#nullable enable
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using Microsoft.Playwright.Transport.Protocol;
@@ -31,7 +31,7 @@ namespace Microsoft.Playwright.Transport;
 internal class ApiZone
 {
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public string ApiName { get; set; }
+    public string? ApiName { get; set; }
 
-    public List<StackFrame> Frames { get; set; }
+    public List<StackFrame> Frames { get; set; } = null!;
 }

src/Playwright/Transport/ChannelOwner.cs

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
+#nullable enable
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -39,13 +39,13 @@ internal class ChannelOwner
     internal bool _wasCollected;
     internal bool _isInternalType;
 
-    internal ChannelOwner(ChannelOwner parent, string guid) : this(parent, null, guid)
+    internal ChannelOwner(ChannelOwner parent, string guid) : this(parent, parent._connection, guid)
     {
     }
 
     internal ChannelOwner(ChannelOwner parent, Connection connection, string guid)
     {
-        _connection = parent?._connection ?? connection;
+        _connection = connection;
 
         Guid = guid;
         Parent = parent;
@@ -61,20 +61,20 @@ internal ChannelOwner(ChannelOwner parent, Connection connection, string guid)
 
     internal string Guid { get; set; }
 
-    internal ChannelOwner Parent { get; set; }
+    internal ChannelOwner? Parent { get; set; }
 
     internal virtual void OnMessage(string method, JsonElement? serverParams)
     {
     }
 
     internal void Adopt(ChannelOwner child)
     {
-        child.Parent.Objects.TryRemove(child.Guid, out _);
+        child.Parent!.Objects.TryRemove(child.Guid, out _);
         Objects[child.Guid] = child;
         child.Parent = this;
     }
 
-    internal void DisposeOwner(string reason)
+    internal void DisposeOwner(string? reason)
     {
         Parent?.Objects?.TryRemove(Guid, out var _);
         _connection?.Objects.TryRemove(Guid, out var _);
@@ -96,7 +96,7 @@ internal void DisposeOwner(string reason)
 
     internal void MarkAsInternalType() => _isInternalType = true;
 
-    internal EventHandler<T> UpdateEventHandler<T>(string eventName, EventHandler<T> handlers, EventHandler<T> handler, bool add)
+    internal EventHandler<T>? UpdateEventHandler<T>(string eventName, EventHandler<T>? handlers, EventHandler<T> handler, bool add)
     {
         if (add)
         {
@@ -124,7 +124,7 @@ private void UpdateEventSubscription(string eventName, bool enabled)
             () => _connection.SendMessageToServerAsync(
             this,
             "updateSubscription",
-            new Dictionary<string, object>
+            new Dictionary<string, object?>
             {
                 ["event"] = eventName,
                 ["enabled"] = enabled,
@@ -134,12 +134,12 @@ private void UpdateEventSubscription(string eventName, bool enabled)
 
     internal Task<JsonElement?> SendMessageToServerAsync(
         string method,
-        Dictionary<string, object> args = null,
+        Dictionary<string, object?>? args = null,
         bool keepNulls = false)
         => SendMessageToServerAsync<JsonElement?>(method, args, keepNulls);
 
     internal Task<T> SendMessageToServerAsync<T>(
         string method,
-        Dictionary<string, object> args = null,
+        Dictionary<string, object?>? args = null,
         bool keepNulls = false) => _connection.SendMessageToServerAsync<T>(this, method, args, keepNulls);
 }

src/Playwright/Transport/Connection.cs

@@ -150,10 +150,7 @@ private async Task<T> InnerSendMessageToServerAsync<T>(
 
         int id = Interlocked.Increment(ref _lastId);
         var tcs = new TaskCompletionSource<JsonElement?>(TaskCreationOptions.RunContinuationsAsynchronously);
-        var callback = new ConnectionCallback
-        {
-            TaskCompletionSource = tcs,
-        };
+        var callback = new ConnectionCallback(tcs);
 
         _callbacks.TryAdd(id, callback);
 
@@ -186,21 +183,20 @@ private async Task<T> InnerSendMessageToServerAsync<T>(
 
         if (_tracingCount > 0 && frames.Count > 0 && @object.Guid != "localUtils")
         {
-            LocalUtils.AddStackToTracingNoReply(frames, id);
+            LocalUtils?.AddStackToTracingNoReply(frames, id);
         }
 
         await _queue.EnqueueAsync(() =>
         {
-            return OnMessage(
-                new MessageRequest
-                {
-                    Id = id,
-                    Guid = @object == null ? string.Empty : @object.Guid,
-                    Method = method,
-                    Params = sanitizedArgs,
-                    Metadata = metadata,
-                },
-                keepNulls);
+            var message = new Dictionary<string, object>
+            {
+                ["id"] = id,
+                ["guid"] = @object?.Guid ?? string.Empty,
+                ["method"] = method,
+                ["params"] = sanitizedArgs,
+                ["metadata"] = metadata,
+            };
+            return OnMessage(message, keepNulls);
         }).ConfigureAwait(false);
 
         var result = await tcs.Task.ConfigureAwait(false);
@@ -276,8 +272,7 @@ internal void Dispatch(PlaywrightServerMessage message)
         {
             if (message.Method == "__create__")
             {
-                var createObjectInfo = message.Params.Value.ToObject<CreateObjectInfo>(DefaultJsonSerializerOptions);
-                CreateRemoteObject(message.Guid, createObjectInfo.Type, createObjectInfo.Guid, createObjectInfo.Initializer);
+                CreateRemoteObject(message.Guid, message.Params.Value.GetProperty("type").ToObject<ChannelOwnerType>(), message.Params.GetString("guid", false)!, message.Params?.GetProperty("initializer"));
                 return;
             }
 
@@ -584,5 +579,10 @@ private void EnsureApiZoneExists()
 
 internal class ConnectionCallback
 {
-    public TaskCompletionSource<JsonElement?> TaskCompletionSource { get; set; }
+    public ConnectionCallback(TaskCompletionSource<JsonElement?> taskCompletionSource)
+    {
+        TaskCompletionSource = taskCompletionSource;
+    }
+
+    internal TaskCompletionSource<JsonElement?> TaskCompletionSource { get; }
 }