Retain camel-casing of BiDi enums

RenderMichael · RenderMichael · commit e95a4fddf650 · 2025-03-08T14:04:38.000-05:00
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/CamelCaseJsonEnumStringConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/CamelCaseJsonEnumStringConverter.cs
@@ -0,0 +1,29 @@
+// <copyright file="CamelCaseJsonEnumStringConverter.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters
+{
+    internal sealed class CamelCaseJsonEnumStringConverter<TEnum>()
+        : JsonStringEnumConverter<TEnum>(JsonNamingPolicy.CamelCase)
+        where TEnum : struct, Enum;
+}
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindowInfo.cs
@@ -17,13 +17,14 @@
 // 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(JsonStringEnumConverter<ClientWindowState>))]
+[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,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
@@ -36,7 +37,7 @@ public record CaptureScreenshotOptions : CommandOptions
     public ClipRectangle? Clip { get; set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<Origin>))]
+[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,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
@@ -36,7 +37,7 @@ public record CreateOptions : CommandOptions
     public Browser.UserContext? UserContext { get; set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<ContextType>))]
+[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,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
@@ -51,7 +52,7 @@ public record InnerText(string Value) : Locator
     public record XPath(string Value) : Locator;
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<MatchType>))]
+[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,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
@@ -32,7 +33,7 @@ public record NavigateOptions : CommandOptions
     public ReadinessState? Wait { get; set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<ReadinessState>))]
+[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,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
@@ -57,7 +58,7 @@ public struct PrintMargin
     public double? Top { get; set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<PrintOrientation>))]
+[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,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
@@ -28,7 +29,7 @@ public record UserPromptOpenedEventArgs(BiDi BiDi, BrowsingContext Context, User
     public string? DefaultValue { get; internal set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<UserPromptType>))]
+[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,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -147,7 +148,7 @@ public record PointerParameters
     public PointerType? PointerType { get; set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<PointerType>))]
+[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,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
@@ -39,7 +40,7 @@ public record Javascript(BiDi BiDi, Level Level, Script.Source Source, string Te
         : Entry(BiDi, Level, Source, Text, Timestamp);
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<Level>))]
+[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,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -49,7 +50,7 @@ public record BrowsingContextAddInterceptOptions
 
 public record AddInterceptResult(Intercept Intercept);
 
-[JsonConverter(typeof(JsonStringEnumConverter<InterceptPhase>))]
+[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,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Text.Json.Serialization;
 
@@ -28,7 +29,7 @@ public record Cookie(string Name, BytesValue Value, string Domain, string Path,
     public DateTimeOffset? Expiry { get; internal set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<SameSite>))]
+[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,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Network;
@@ -32,7 +33,7 @@ public record Initiator(InitiatorType Type)
     public Request? Request { get; set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<InitiatorType>))]
+[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,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -48,7 +49,7 @@ public record BrowsingContextSetCacheBehaviorOptions
 
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<CacheBehavior>))]
+[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,11 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
-[JsonConverter(typeof(JsonStringEnumConverter<RealmType>))]
+[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,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
@@ -269,7 +270,7 @@ public record Properties(BrowsingContext.BrowsingContext Context);
 
 public abstract record PrimitiveProtocolRemoteValue : RemoteValue;
 
-[JsonConverter(typeof(JsonStringEnumConverter<Mode>))]
+[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,11 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
-[JsonConverter(typeof(JsonStringEnumConverter<ResultOwnership>))]
+[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,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
@@ -30,7 +31,7 @@ public class SerializationOptions
     public ShadowTree? IncludeShadowTree { get; set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter<ShadowTree>))]
+[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<ShadowTree>))]
 public enum ShadowTree
 {
     None,

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`// </copyright>`
`19`	`19`
`20`	`20`	`using OpenQA.Selenium.BiDi.Communication;`
	`21`	`+using OpenQA.Selenium.BiDi.Communication.Json.Converters;`
`21`	`22`	`using System.Text.Json.Serialization;`
`22`	`23`
`23`	`24`	`namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;`
`@@ -36,7 +37,7 @@ public record CaptureScreenshotOptions : CommandOptions`
`36`	`37`	`public ClipRectangle? Clip { get; set; }`
`37`	`38`	`}`
`38`	`39`
`39`		`-[JsonConverter(typeof(JsonStringEnumConverter<Origin>))]`
	`40`	`+[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<Origin>))]`
`40`	`41`	`public enum Origin`
`41`	`42`	`{`
`42`	`43`	`Viewport,`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`// under the License.`
`18`	`18`	`// </copyright>`
`19`	`19`
	`20`	`+using OpenQA.Selenium.BiDi.Communication.Json.Converters;`
`20`	`21`	`using System.Text.Json.Serialization;`
`21`	`22`
`22`	`23`	`namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;`
`@@ -51,7 +52,7 @@ public record InnerText(string Value) : Locator`
`51`	`52`	`public record XPath(string Value) : Locator;`
`52`	`53`	`}`
`53`	`54`
`54`		`-[JsonConverter(typeof(JsonStringEnumConverter<MatchType>))]`
	`55`	`+[JsonConverter(typeof(CamelCaseJsonEnumStringConverter<MatchType>))]`
`55`	`56`	`public enum MatchType`
`56`	`57`	`{`
`57`	`58`	`Full,`