Skip to content

[dotnet] [bidi] AOT safe json converter for OptionalConverter #16963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvborisenko merged 2 commits into from
Jan 20, 2026
Merged

[dotnet] [bidi] AOT safe json converter for OptionalConverter #16963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d51628d
[dotnet] [bidi] AOT safe json converter for OptionalConverter
nvborisenko Jan 20, 2026
e369807
Throw if typeinfo not found
nvborisenko Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dotnet/src/webdriver/BiDi/Json/Converters/OptionalConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ public override Optional<T> Read(ref Utf8JsonReader reader, Type typeToConvert,
return new Optional<T>(default!);
}

T value = JsonSerializer.Deserialize<T>(ref reader, options)!;
T value = JsonSerializer.Deserialize(ref reader, options.GetTypeInfo<T>())!;
return new Optional<T>(value);
}

public override void Write(Utf8JsonWriter writer, Optional<T> value, JsonSerializerOptions options)
{
if (value.TryGetValue(out var optionalValue))
{
JsonSerializer.Serialize(writer, optionalValue, options);
JsonSerializer.Serialize(writer, optionalValue, options.GetTypeInfo<T>());
}
else
{
Expand Down
7 changes: 6 additions & 1 deletion dotnet/src/webdriver/BiDi/Json/JsonExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public static string GetDiscriminator(this ref Utf8JsonReader reader, string nam

public static JsonTypeInfo<T> GetTypeInfo<T>(this JsonSerializerOptions options)
{
return (JsonTypeInfo<T>)options.GetTypeInfo(typeof(T));
if (options.TryGetTypeInfo(typeof(T), out JsonTypeInfo? typeInfo))
{
return (JsonTypeInfo<T>)typeInfo;
}

throw new JsonException($"Type info for '{typeof(T).FullName}' is not available in the serializer context. Ensure the type is included in the JsonSerializerContext.");
}
}