Skip to content

Commit 5170bc6

Browse files
committed
Add all built-in types
1 parent 8d45068 commit 5170bc6

File tree

2 files changed

+23
-12
lines changed

2 files changed

+23
-12
lines changed

dotnet/src/webdriver/Command.cs

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class Command
3434

3535
private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
3636
{
37-
TypeInfoResolver = CommandSerializerContext.Default,
37+
TypeInfoResolver = CommandJsonSerializerContext.Default,
3838
Converters = { new ResponseValueJsonConverter() }
3939
};
4040

@@ -135,20 +135,31 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
135135
}
136136
}
137137

138-
[JsonSerializable(typeof(Dictionary<string, object>))]
139-
[JsonSerializable(typeof(char[]))]
138+
// Built-in types
140139
[JsonSerializable(typeof(bool))]
141-
[JsonSerializable(typeof(string))]
142-
[JsonSerializable(typeof(uint))]
140+
[JsonSerializable(typeof(byte))]
141+
[JsonSerializable(typeof(sbyte))]
142+
[JsonSerializable(typeof(char))]
143+
[JsonSerializable(typeof(decimal))]
144+
[JsonSerializable(typeof(double))]
145+
[JsonSerializable(typeof(float))]
143146
[JsonSerializable(typeof(int))]
144-
[JsonSerializable(typeof(ulong))]
147+
[JsonSerializable(typeof(uint))]
148+
[JsonSerializable(typeof(nint))]
149+
[JsonSerializable(typeof(nuint))]
145150
[JsonSerializable(typeof(long))]
146-
[JsonSerializable(typeof(float))]
147-
[JsonSerializable(typeof(double))]
148-
[JsonSerializable(typeof(decimal))]
151+
[JsonSerializable(typeof(ulong))]
152+
[JsonSerializable(typeof(short))]
153+
[JsonSerializable(typeof(ushort))]
154+
155+
[JsonSerializable(typeof(string))]
156+
157+
// Selenium WebDriver types
158+
[JsonSerializable(typeof(char[]))]
159+
[JsonSerializable(typeof(Dictionary<string, object>))]
149160
[JsonSerializable(typeof(Cookie))]
150161
[JsonSerializable(typeof(Proxy))]
151-
internal partial class CommandSerializerContext : JsonSerializerContext
162+
internal partial class CommandJsonSerializerContext : JsonSerializerContext
152163
{
153164

154165
}

dotnet/src/webdriver/Response.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class Response
3232
{
3333
private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
3434
{
35-
TypeInfoResolver = ResponseSerializerContext.Default,
35+
TypeInfoResolver = ResponseJsonSerializerContext.Default,
3636
Converters = { new ResponseValueJsonConverter() } // we still need it to make `Object` as `Dictionary`
3737
};
3838

@@ -212,7 +212,7 @@ public override string ToString()
212212
}
213213

214214
[JsonSerializable(typeof(Dictionary<string, object>))]
215-
internal partial class ResponseSerializerContext : JsonSerializerContext
215+
internal partial class ResponseJsonSerializerContext : JsonSerializerContext
216216
{
217217

218218
}

0 commit comments

Comments
 (0)