Remove JSON enum string changes

RenderMichael · RenderMichael · commit b13ae71403c3 · 2025-03-08T14:36:48.000-05:00
diff --git a/dotnet/src/webdriver/BiDi/Communication/Broker.cs b/dotnet/src/webdriver/BiDi/Communication/Broker.cs
@@ -82,6 +82,7 @@ internal Broker(BiDi bidi, ITransport transport)
                 new PrintPageRangeConverter(),
                 new InputOriginConverter(),
                 new SubscriptionConverter(),
+                new JsonStringEnumConverter(JsonNamingPolicy.CamelCase),
 
                 // https://github.com/dotnet/runtime/issues/72604
                 new Json.Converters.Polymorphic.MessageConverter(),
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/CamelCaseJsonEnumStringConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/CamelCaseJsonEnumStringConverter.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/BrowserModule.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/BrowserModule.cs
@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using OpenQA.Selenium.BiDi.Communication;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs
@@ -17,14 +17,12 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
 public record ClientWindowInfo([property: JsonPropertyName("active")] bool IsActive, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y);
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<ClientWindowState>))]
 public enum ClientWindowState
 {
     Fullscreen,
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs
@@ -18,7 +18,6 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
@@ -37,7 +36,6 @@ public record CaptureScreenshotOptions : CommandOptions
     public ClipRectangle? Clip { get; set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<Origin>))]
 public enum Origin
 {
     Viewport,
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CreateCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CreateCommand.cs
@@ -18,8 +18,6 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
-using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
@@ -37,7 +35,6 @@ public record CreateOptions : CommandOptions
     public Browser.UserContext? UserContext { get; set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<ContextType>))]
 public enum ContextType
 {
     Tab,
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Locator.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/Locator.cs
@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
@@ -52,7 +51,6 @@ public record InnerText(string Value) : Locator
     public record XPath(string Value) : Locator;
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<MatchType>))]
 public enum MatchType
 {
     Full,
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigateCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigateCommand.cs
@@ -18,8 +18,6 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
-using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
@@ -33,7 +31,6 @@ public record NavigateOptions : CommandOptions
     public ReadinessState? Wait { get; set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<ReadinessState>))]
 public enum ReadinessState
 {
     None,
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/PrintCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/PrintCommand.cs
@@ -18,10 +18,8 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
@@ -58,7 +56,6 @@ public struct PrintMargin
     public double? Top { get; set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<PrintOrientation>))]
 public enum PrintOrientation
 {
     Portrait,
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptOpenedEventArgs.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/UserPromptOpenedEventArgs.cs
@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
@@ -29,7 +28,6 @@ public record UserPromptOpenedEventArgs(BiDi BiDi, BrowsingContext Context, User
     public string? DefaultValue { get; internal set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<UserPromptType>))]
 public enum UserPromptType
 {
     Alert,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/SourceActions.cs b/dotnet/src/webdriver/BiDi/Modules/Input/SourceActions.cs
@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -148,7 +147,6 @@ public record PointerParameters
     public PointerType? PointerType { get; set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<PointerType>))]
 public enum PointerType
 {
     Mouse,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Log/Entry.cs b/dotnet/src/webdriver/BiDi/Modules/Log/Entry.cs
@@ -17,10 +17,8 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Log;
 
@@ -40,7 +38,6 @@ public record Javascript(BiDi BiDi, Level Level, Script.Source Source, string Te
         : Entry(BiDi, Level, Source, Text, Timestamp);
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<Level>))]
 public enum Level
 {
     Debug,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/AddInterceptCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/AddInterceptCommand.cs
@@ -18,9 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
@@ -50,7 +48,6 @@ public record BrowsingContextAddInterceptOptions
 
 public record AddInterceptResult(Intercept Intercept);
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<InterceptPhase>))]
 public enum InterceptPhase
 {
     BeforeRequestSent,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/Cookie.cs b/dotnet/src/webdriver/BiDi/Modules/Network/Cookie.cs
@@ -17,7 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Text.Json.Serialization;
 
@@ -29,7 +28,6 @@ public record Cookie(string Name, BytesValue Value, string Domain, string Path,
     public DateTimeOffset? Expiry { get; internal set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<SameSite>))]
 public enum SameSite
 {
     Strict,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/Initiator.cs b/dotnet/src/webdriver/BiDi/Modules/Network/Initiator.cs
@@ -17,9 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
-using System.Text.Json.Serialization;
-
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 public record Initiator(InitiatorType Type)
@@ -33,7 +30,6 @@ public record Initiator(InitiatorType Type)
     public Request? Request { get; set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<InitiatorType>))]
 public enum InitiatorType
 {
     Parser,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs
@@ -18,9 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
@@ -49,7 +47,6 @@ public record BrowsingContextSetCacheBehaviorOptions
 
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<CacheBehavior>))]
 public enum CacheBehavior
 {
     Default,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RealmType.cs b/dotnet/src/webdriver/BiDi/Modules/Script/RealmType.cs
@@ -17,12 +17,8 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
-using System.Text.Json.Serialization;
-
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<RealmType>))]
 public enum RealmType
 {
     Window,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs b/dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs
@@ -17,10 +17,8 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections.Generic;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
@@ -270,7 +268,6 @@ public record Properties(BrowsingContext.BrowsingContext Context);
 
 public abstract record PrimitiveProtocolRemoteValue : RemoteValue;
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<Mode>))]
 public enum Mode
 {
     Open,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/ResultOwnership.cs b/dotnet/src/webdriver/BiDi/Modules/Script/ResultOwnership.cs
@@ -17,12 +17,8 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
-using System.Text.Json.Serialization;
-
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<ResultOwnership>))]
 public enum ResultOwnership
 {
     Root,
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/SerializationOptions.cs b/dotnet/src/webdriver/BiDi/Modules/Script/SerializationOptions.cs
@@ -17,9 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
-using System.Text.Json.Serialization;
-
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 public class SerializationOptions
@@ -31,7 +28,6 @@ public class SerializationOptions
     public ShadowTree? IncludeShadowTree { get; set; }
 }
 
-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<ShadowTree>))]
 public enum ShadowTree
 {
     None,

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`// </copyright>`
`19`	`19`
`20`	`20`	`using OpenQA.Selenium.BiDi.Communication;`
`21`		`-using OpenQA.Selenium.BiDi.Communication.Json.Converters;`
`22`	`21`	`using System.Text.Json.Serialization;`
`23`	`22`
`24`	`23`	`namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;`
`@@ -37,7 +36,6 @@ public record CaptureScreenshotOptions : CommandOptions`
`37`	`36`	`public ClipRectangle? Clip { get; set; }`
`38`	`37`	`}`
`39`	`38`
`40`		`-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<Origin>))]`
`41`	`39`	`public enum Origin`
`42`	`40`	`{`
`43`	`41`	`Viewport,`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`// </copyright>`
`19`	`19`
`20`	`20`	`using OpenQA.Selenium.BiDi.Communication;`
`21`		`-using OpenQA.Selenium.BiDi.Communication.Json.Converters;`
`22`		`-using System.Text.Json.Serialization;`
`23`	`21`
`24`	`22`	`namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;`
`25`	`23`
`@@ -37,7 +35,6 @@ public record CreateOptions : CommandOptions`
`37`	`35`	`public Browser.UserContext? UserContext { get; set; }`
`38`	`36`	`}`
`39`	`37`
`40`		`-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<ContextType>))]`
`41`	`38`	`public enum ContextType`
`42`	`39`	`{`
`43`	`40`	`Tab,`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`// under the License.`
`18`	`18`	`// </copyright>`
`19`	`19`
`20`		`-using OpenQA.Selenium.BiDi.Communication.Json.Converters;`
`21`	`20`	`using System.Text.Json.Serialization;`
`22`	`21`
`23`	`22`	`namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;`
`@@ -52,7 +51,6 @@ public record InnerText(string Value) : Locator`
`52`	`51`	`public record XPath(string Value) : Locator;`
`53`	`52`	`}`
`54`	`53`
`55`		`-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<MatchType>))]`
`56`	`54`	`public enum MatchType`
`57`	`55`	`{`
`58`	`56`	`Full,`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,8 @@`
`18`	`18`	`// </copyright>`
`19`	`19`
`20`	`20`	`using OpenQA.Selenium.BiDi.Communication;`
`21`		`-using OpenQA.Selenium.BiDi.Communication.Json.Converters;`
`22`	`21`	`using System;`
`23`	`22`	`using System.Collections.Generic;`
`24`		`-using System.Text.Json.Serialization;`
`25`	`23`
`26`	`24`	`namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;`
`27`	`25`
`@@ -58,7 +56,6 @@ public struct PrintMargin`
`58`	`56`	`public double? Top { get; set; }`
`59`	`57`	`}`
`60`	`58`
`61`		`-[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<PrintOrientation>))]`
`62`	`59`	`public enum PrintOrientation`
`63`	`60`	`{`
`64`	`61`	`Portrait,`