Polymorphic

nvborisenko · nvborisenko · commit ed9bf29424e0 · 2025-04-07T19:30:56.000+03:00
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/EvaluateResultConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/EvaluateResultConverter.cs
@@ -20,23 +20,20 @@
 using OpenQA.Selenium.BiDi.Communication.Json.Internal;
 using OpenQA.Selenium.BiDi.Modules.Script;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 
-[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Json serializer options should have AOT-safe type resolution")]
-[UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Json serializer options should have AOT-safe type resolution")]
 // https://github.com/dotnet/runtime/issues/72604
 internal class EvaluateResultConverter : JsonConverter<EvaluateResult>
 {
     public override EvaluateResult? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         return reader.GetDiscriminator("type") switch
         {
-            "success" => JsonSerializer.Deserialize<EvaluateResultSuccess>(ref reader, options),
-            "exception" => JsonSerializer.Deserialize<EvaluateResultException>(ref reader, options),
+            "success" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<EvaluateResultSuccess>()),
+            "exception" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<EvaluateResultException>()),
             _ => null,
         };
     }
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/LogEntryConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/LogEntryConverter.cs
@@ -20,23 +20,20 @@
 using OpenQA.Selenium.BiDi.Communication.Json.Internal;
 using OpenQA.Selenium.BiDi.Modules.Log;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 
 // https://github.com/dotnet/runtime/issues/72604
-[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Json serializer options should have AOT-safe type resolution")]
-[UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Json serializer options should have AOT-safe type resolution")]
 internal class LogEntryConverter : JsonConverter<Modules.Log.LogEntry>
 {
     public override Modules.Log.LogEntry? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         return reader.GetDiscriminator("type") switch
         {
-            "console" => JsonSerializer.Deserialize<ConsoleLogEntry>(ref reader, options),
-            "javascript" => JsonSerializer.Deserialize<JavascriptLogEntry>(ref reader, options),
+            "console" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<ConsoleLogEntry>()),
+            "javascript" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<JavascriptLogEntry>()),
             _ => null,
         };
     }
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RealmInfoConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RealmInfoConverter.cs
@@ -20,29 +20,26 @@
 using OpenQA.Selenium.BiDi.Communication.Json.Internal;
 using OpenQA.Selenium.BiDi.Modules.Script;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 
 // https://github.com/dotnet/runtime/issues/72604
-[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Json serializer options should have AOT-safe type resolution")]
-[UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Json serializer options should have AOT-safe type resolution")]
 internal class RealmInfoConverter : JsonConverter<RealmInfo>
 {
     public override RealmInfo? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         return reader.GetDiscriminator("type") switch
         {
-            "window" => JsonSerializer.Deserialize<WindowRealmInfo>(ref reader, options),
-            "dedicated-worker" => JsonSerializer.Deserialize<DedicatedWorkerRealmInfo>(ref reader, options),
-            "shared-worker" => JsonSerializer.Deserialize<SharedWorkerRealmInfo>(ref reader, options),
-            "service-worker" => JsonSerializer.Deserialize<ServiceWorkerRealmInfo>(ref reader, options),
-            "worker" => JsonSerializer.Deserialize<WorkerRealmInfo>(ref reader, options),
-            "paint-worklet" => JsonSerializer.Deserialize<PaintWorkletRealmInfo>(ref reader, options),
-            "audio-worklet" => JsonSerializer.Deserialize<AudioWorkletRealmInfo>(ref reader, options),
-            "worklet" => JsonSerializer.Deserialize<WorkletRealmInfo>(ref reader, options),
+            "window" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<WindowRealmInfo>()),
+            "dedicated-worker" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<DedicatedWorkerRealmInfo>()),
+            "shared-worker" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<SharedWorkerRealmInfo>()),
+            "service-worker" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<ServiceWorkerRealmInfo>()),
+            "worker" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<WorkerRealmInfo>()),
+            "paint-worklet" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<PaintWorkletRealmInfo>()),
+            "audio-worklet" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<AudioWorkletRealmInfo>()),
+            "worklet" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<WorkletRealmInfo>()),
             _ => null,
         };
     }
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RemoteValueConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/RemoteValueConverter.cs
@@ -20,15 +20,12 @@
 using OpenQA.Selenium.BiDi.Communication.Json.Internal;
 using OpenQA.Selenium.BiDi.Modules.Script;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 
 // https://github.com/dotnet/runtime/issues/72604
-[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Json serializer options should have AOT-safe type resolution")]
-[UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Json serializer options should have AOT-safe type resolution")]
 internal class RemoteValueConverter : JsonConverter<RemoteValue>
 {
     public override RemoteValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -40,32 +37,32 @@ internal class RemoteValueConverter : JsonConverter<RemoteValue>
 
         return reader.GetDiscriminator("type") switch
         {
-            "number" => JsonSerializer.Deserialize<NumberRemoteValue>(ref reader, options),
-            "boolean" => JsonSerializer.Deserialize<BooleanRemoteValue>(ref reader, options),
-            "bigint" => JsonSerializer.Deserialize<BigIntRemoteValue>(ref reader, options),
-            "string" => JsonSerializer.Deserialize<StringRemoteValue>(ref reader, options),
-            "null" => JsonSerializer.Deserialize<NullRemoteValue>(ref reader, options),
-            "undefined" => JsonSerializer.Deserialize<UndefinedRemoteValue>(ref reader, options),
-            "symbol" => JsonSerializer.Deserialize<SymbolRemoteValue>(ref reader, options),
-            "array" => JsonSerializer.Deserialize<ArrayRemoteValue>(ref reader, options),
-            "object" => JsonSerializer.Deserialize<ObjectRemoteValue>(ref reader, options),
-            "function" => JsonSerializer.Deserialize<FunctionRemoteValue>(ref reader, options),
-            "regexp" => JsonSerializer.Deserialize<RegExpRemoteValue>(ref reader, options),
-            "date" => JsonSerializer.Deserialize<DateRemoteValue>(ref reader, options),
-            "map" => JsonSerializer.Deserialize<MapRemoteValue>(ref reader, options),
-            "set" => JsonSerializer.Deserialize<SetRemoteValue>(ref reader, options),
-            "weakmap" => JsonSerializer.Deserialize<WeakMapRemoteValue>(ref reader, options),
-            "weakset" => JsonSerializer.Deserialize<WeakSetRemoteValue>(ref reader, options),
-            "generator" => JsonSerializer.Deserialize<GeneratorRemoteValue>(ref reader, options),
-            "error" => JsonSerializer.Deserialize<ErrorRemoteValue>(ref reader, options),
-            "proxy" => JsonSerializer.Deserialize<ProxyRemoteValue>(ref reader, options),
-            "promise" => JsonSerializer.Deserialize<PromiseRemoteValue>(ref reader, options),
-            "typedarray" => JsonSerializer.Deserialize<TypedArrayRemoteValue>(ref reader, options),
-            "arraybuffer" => JsonSerializer.Deserialize<ArrayBufferRemoteValue>(ref reader, options),
-            "nodelist" => JsonSerializer.Deserialize<NodeListRemoteValue>(ref reader, options),
-            "htmlcollection" => JsonSerializer.Deserialize<HtmlCollectionRemoteValue>(ref reader, options),
-            "node" => JsonSerializer.Deserialize<NodeRemoteValue>(ref reader, options),
-            "window" => JsonSerializer.Deserialize<WindowProxyRemoteValue>(ref reader, options),
+            "number" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<NumberRemoteValue>()),
+            "boolean" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<BooleanRemoteValue>()),
+            "bigint" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<BigIntRemoteValue>()),
+            "string" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<StringRemoteValue>()),
+            "null" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<NullRemoteValue>()),
+            "undefined" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<UndefinedRemoteValue>()),
+            "symbol" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<SymbolRemoteValue>()),
+            "array" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<ArrayRemoteValue>()),
+            "object" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<ObjectRemoteValue>()),
+            "function" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<FunctionRemoteValue>()),
+            "regexp" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<RegExpRemoteValue>()),
+            "date" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<DateRemoteValue>()),
+            "map" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<MapRemoteValue>()),
+            "set" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<SetRemoteValue>()),
+            "weakmap" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<WeakMapRemoteValue>()),
+            "weakset" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<WeakSetRemoteValue>()),
+            "generator" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<GeneratorRemoteValue>()),
+            "error" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<ErrorRemoteValue>()),
+            "proxy" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<ProxyRemoteValue>()),
+            "promise" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<PromiseRemoteValue>()),
+            "typedarray" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<TypedArrayRemoteValue>()),
+            "arraybuffer" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<ArrayBufferRemoteValue>()),
+            "nodelist" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<NodeListRemoteValue>()),
+            "htmlcollection" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<HtmlCollectionRemoteValue>()),
+            "node" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<NodeRemoteValue>()),
+            "window" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<WindowProxyRemoteValue>()),
             _ => null,
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -20,23 +20,20 @@`
`20`	`20`	`using OpenQA.Selenium.BiDi.Communication.Json.Internal;`
`21`	`21`	`using OpenQA.Selenium.BiDi.Modules.Script;`
`22`	`22`	`using System;`
`23`		`-using System.Diagnostics.CodeAnalysis;`
`24`	`23`	`using System.Text.Json;`
`25`	`24`	`using System.Text.Json.Serialization;`
`26`	`25`
`27`	`26`	`namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;`
`28`	`27`
`29`		`-[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Json serializer options should have AOT-safe type resolution")]`
`30`		`-[UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Json serializer options should have AOT-safe type resolution")]`
`31`	`28`	`// https://github.com/dotnet/runtime/issues/72604`
`32`	`29`	`internal class EvaluateResultConverter : JsonConverter<EvaluateResult>`
`33`	`30`	`{`
`34`	`31`	`public override EvaluateResult? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`35`	`32`	`{`
`36`	`33`	`return reader.GetDiscriminator("type") switch`
`37`	`34`	`{`
`38`		`- "success" => JsonSerializer.Deserialize<EvaluateResultSuccess>(ref reader, options),`
`39`		`- "exception" => JsonSerializer.Deserialize<EvaluateResultException>(ref reader, options),`
	`35`	`+ "success" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<EvaluateResultSuccess>()),`
	`36`	`+ "exception" => JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<EvaluateResultException>()),`
`40`	`37`	`_ => null,`
`41`	`38`	`};`
`42`	`39`	`}`