Use JsonNode instead of JsonDocument

Author: nvborisenko

dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetClientWindowsResultConverter.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 #nullable enable
@@ -31,8 +32,9 @@ internal class GetClientWindowsResultConverter : JsonConverter<GetClientWindowsR
 {
     public override GetClientWindowsResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        using var doc = JsonDocument.ParseValue(ref reader);
-        var clientWindows = doc.RootElement.GetProperty("clientWindows").Deserialize<IReadOnlyList<ClientWindowInfo>>(options);
+        var jsonNode = JsonNode.Parse(ref reader);
+
+        var clientWindows = jsonNode?["clientWindows"].Deserialize<IReadOnlyList<ClientWindowInfo>>(options);
 
         return new GetClientWindowsResult(clientWindows!);
     }

dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetCookiesResultConverter.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 #nullable enable
@@ -31,9 +32,10 @@ internal class GetCookiesResultConverter : JsonConverter<GetCookiesResult>
 {
     public override GetCookiesResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        using var doc = JsonDocument.ParseValue(ref reader);
-        var cookies = doc.RootElement.GetProperty("cookies").Deserialize<IReadOnlyList<Modules.Network.Cookie>>(options);
-        var partitionKey = doc.RootElement.GetProperty("partitionKey").Deserialize<PartitionKey>(options);
+        var jsonNode = JsonNode.Parse(ref reader);
+
+        var cookies = jsonNode?["cookies"].Deserialize<IReadOnlyList<Modules.Network.Cookie>>(options);
+        var partitionKey = jsonNode?["partitionKey"].Deserialize<PartitionKey>(options);
 
         return new GetCookiesResult(cookies!, partitionKey!);
     }

dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetRealmsResultConverter.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 #nullable enable
@@ -31,8 +32,9 @@ internal class GetRealmsResultConverter : JsonConverter<GetRealmsResult>
 {
     public override GetRealmsResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        using var doc = JsonDocument.ParseValue(ref reader);
-        var realms = doc.RootElement.GetProperty("realms").Deserialize<IReadOnlyList<RealmInfo>>(options);
+        var jsonNode = JsonNode.Parse(ref reader);
+
+        var realms = jsonNode?["realms"].Deserialize<IReadOnlyList<RealmInfo>>(options);
 
         return new GetRealmsResult(realms!);
     }

dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetUserContextsResultConverter.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 #nullable enable
@@ -31,8 +32,9 @@ internal class GetUserContextsResultConverter : JsonConverter<GetUserContextsRes
 {
     public override GetUserContextsResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        using var doc = JsonDocument.ParseValue(ref reader);
-        var userContexts = doc.RootElement.GetProperty("userContexts").Deserialize<IReadOnlyList<UserContextInfo>>(options);
+        var jsonNode = JsonNode.Parse(ref reader);
+
+        var userContexts = jsonNode?["userContexts"].Deserialize<IReadOnlyList<UserContextInfo>>(options);
 
         return new GetUserContextsResult(userContexts!);
     }

dotnet/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/LocateNodesResultConverter.cs

@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
 #nullable enable
@@ -32,8 +33,9 @@ internal class LocateNodesResultConverter : JsonConverter<LocateNodesResult>
 {
     public override LocateNodesResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        using var doc = JsonDocument.ParseValue(ref reader);
-        var nodes = doc.RootElement.GetProperty("nodes").Deserialize<IReadOnlyList<RemoteValue.Node>>(options);
+        var jsonNode = JsonNode.Parse(ref reader);
+
+        var nodes = jsonNode?["qwe"].Deserialize<IReadOnlyList<RemoteValue.Node>>(options);
 
         return new LocateNodesResult(nodes!);
     }