Move polymorphic workaround converters to direct type attributes

Author: RenderMichael

dotnet/src/webdriver/BiDi/Communication/Broker.cs

@@ -74,15 +74,9 @@ internal Broker(BiDi bidi, Uri url)
                 new InternalIdConverter(_bidi),
                 new PreloadScriptConverter(_bidi),
                 new RealmConverter(_bidi),
+
                 new BiDiDateTimeOffsetConverter(),
                 new JsonStringEnumConverter(JsonNamingPolicy.CamelCase),
-
-                // https://github.com/dotnet/runtime/issues/72604
-                new Json.Converters.Polymorphic.MessageConverter(),
-                new Json.Converters.Polymorphic.EvaluateResultConverter(),
-                new Json.Converters.Polymorphic.RemoteValueConverter(),
-                new Json.Converters.Polymorphic.RealmInfoConverter(),
-                new Json.Converters.Polymorphic.LogEntryConverter(),
             }
         };
 

dotnet/src/webdriver/BiDi/Communication/Message.cs

@@ -17,11 +17,15 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Communication;
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(MessageConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(MessageSuccess), "success")]
 //[JsonDerivedType(typeof(MessageError), "error")]

dotnet/src/webdriver/BiDi/Modules/Log/Entry.cs

@@ -17,12 +17,16 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Log;
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(LogEntryConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(Console), "console")]
 //[JsonDerivedType(typeof(Javascript), "javascript")]

dotnet/src/webdriver/BiDi/Modules/Script/EvaluateCommand.cs

@@ -18,6 +18,8 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
@@ -36,6 +38,8 @@ public record EvaluateOptions : CommandOptions
 }
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(EvaluateResultConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(Success), "success")]
 //[JsonDerivedType(typeof(Exception), "exception")]

dotnet/src/webdriver/BiDi/Modules/Script/RealmInfo.cs

@@ -17,11 +17,15 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(RealmInfoConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(Window), "window")]
 //[JsonDerivedType(typeof(DedicatedWorker), "dedicated-worker")]

dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs

@@ -17,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
@@ -25,6 +26,8 @@
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(RemoteValueConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(Number), "number")]
 //[JsonDerivedType(typeof(Boolean), "boolean")]