Skip to content

Split Json.cs into partial-class files #9040

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
Amaury Levé (Evangelink) merged 4 commits into from
Jun 11, 2026
Merged

Split Json.cs into partial-class files #9040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
673e50f
Split Json.cs into partial-class files
Jun 11, 2026
dd82f5b
Merge branch 'main' into dev/amauryleve/split-json-partials
Evangelink Jun 11, 2026
9f56331
Address PR review: fix RpcMessage result binding + stale comment
Jun 11, 2026
15904bb
Trigger CI retry: flaky ILLink Mono.Cecil PDB crash on net10.0 trim test
Evangelink Jun 11, 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
3 changes: 3 additions & 0 deletions src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ This package provides the core platform and the .NET implementation of the proto
<ItemGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETCoreApp'">
<Compile Remove="Configurations/JsonConfigurationFileParser.cs" />
<Compile Remove="ServerMode/JsonRpc/Json/Json.cs" />
<Compile Remove="ServerMode/JsonRpc/Json/Json.Deserializers.cs" />
<Compile Remove="ServerMode/JsonRpc/Json/Json.Serializers.cs" />
<Compile Remove="ServerMode/JsonRpc/Json/Json.TestNodeSerializer.cs" />
<Compile Remove="ServerMode/JsonRpc/Json/JsonCollectionDeserializer.cs" />
<Compile Remove="ServerMode/JsonRpc/Json/JsonDeserializer.cs" />
<Compile Remove="ServerMode/JsonRpc/Json/JsonElementDeserializer.cs" />
Expand Down
247 changes: 247 additions & 0 deletions src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/Json/Json.Deserializers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.Text.Json;

using Microsoft.Testing.Platform.Extensions.Messages;

namespace Microsoft.Testing.Platform.ServerMode.Json;

internal sealed partial class Json
{
private static void RegisterDefaultDeserializers(Dictionary<Type, JsonDeserializer> deserializers)
{
// Deserializers
deserializers[typeof(string)] = new JsonElementDeserializer<string>((json, jsonDocument) => jsonDocument.GetString()!);
deserializers[typeof(bool)] = new JsonElementDeserializer<bool>((json, jsonDocument) => jsonDocument.GetBoolean());
deserializers[typeof(int)] = new JsonElementDeserializer<int>((json, jsonDocument) => jsonDocument.GetInt32());
deserializers[typeof(decimal)] = new JsonElementDeserializer<decimal>((json, jsonDocument) => jsonDocument.GetDecimal());
deserializers[typeof(DateTime)] = new JsonElementDeserializer<DateTime>((json, jsonDocument) => jsonDocument.GetDateTime());

deserializers[typeof(IDictionary<string, object?>)] = new JsonElementDeserializer<IDictionary<string, object?>>((json, jsonDocument) =>
{
Dictionary<string, object?> items = [];
foreach (JsonProperty kvp in jsonDocument.EnumerateObject())
{
switch (kvp.Value.ValueKind)
{
case JsonValueKind.String:
items.Add(kvp.Name, kvp.Value.GetString());
break;
case JsonValueKind.Number:
items.Add(kvp.Name, kvp.Value.GetInt32());
break;
case JsonValueKind.True:
items.Add(kvp.Name, true);
break;
case JsonValueKind.False:
items.Add(kvp.Name, false);
break;
case JsonValueKind.Object:
items.Add(kvp.Name, json.Bind<IDictionary<string, object?>>(kvp.Value));
break;
case JsonValueKind.Array:
items.Add(kvp.Name, json.Bind<object[]>(kvp.Value));
break;
case JsonValueKind.Null:
items.Add(kvp.Name, null);
break;
default:
throw new InvalidOperationException($"key: {kvp.Name}, value: {kvp.Value}, type: {kvp.Value.ValueKind}");
}
}

return items;
});

deserializers[typeof(RpcMessage)] = new JsonElementDeserializer<RpcMessage>((json, jsonElement) =>
{
ValidateJsonRpcHeader(json, jsonElement);

if (json.TryBind(jsonElement, out string? method, JsonRpcStrings.Method))
{
bool hasId = json.TryBind(jsonElement, out int id, JsonRpcStrings.Id);

object? @params = null;
if (jsonElement.TryGetProperty(JsonRpcStrings.Params, out JsonElement value))
{
try
{
// Parse the specific methods
@params = method switch
{
JsonRpcMethods.Initialize => json.Bind<InitializeRequestArgs>(value),
JsonRpcMethods.TestingDiscoverTests => json.Bind<DiscoverRequestArgs>(value),
JsonRpcMethods.TestingRunTests => json.Bind<RunRequestArgs>(value),
JsonRpcMethods.CancelRequest => json.Bind<CancelRequestArgs>(value),
JsonRpcMethods.Exit => json.Bind<ExitRequestArgs>(value),

// Note: Let the server report unknown RPC request back to the client.
_ => null,
};
}
catch (Exception ex) when (ex is MessageFormatException or InvalidOperationException or JsonException)
{
// If params can't be deserialized for a request, capture the failure so
// we can later send back a properly coded JSON-RPC error using the request id.
// For notifications there's no one to respond to, but we still avoid
// crashing the message-handling loop by swallowing into the sentinel.
// We catch the broader set of deserialization-related exceptions because the
// request payload is untrusted client input and the lower-level helpers
// (e.g. JsonElement.GetString() on a non-string element) can throw types
// other than MessageFormatException.
@params = new InvalidRequestParamsArgs(ErrorCodes.InvalidParams, ex.Message);
}
}

return hasId
? new RequestMessage(id, method!, @params)
: new NotificationMessage(method!, @params);
}

if (jsonElement.TryGetProperty(JsonRpcStrings.Result, out JsonElement element))
{
// Note: Because the result message does not contain the original method name,
// it's not possible for us to do a typed deserialization.
// The best option we've got is to return a generic property bag.
int id = json.Bind<int>(jsonElement, JsonRpcStrings.Id);

IDictionary<string, object?>? result = element.ValueKind == JsonValueKind.Null ? null :
json.Bind<IDictionary<string, object?>>(jsonElement, JsonRpcStrings.Result);

return new ResponseMessage(id, result);
Comment thread
Copilot marked this conversation as resolved.
}

return json.TryBind(jsonElement, out ErrorMessage? errorMessage) ? errorMessage! : throw new MessageFormatException();
});

deserializers[typeof(InitializeRequestArgs)] = new JsonElementDeserializer<InitializeRequestArgs>((json, jsonElement) => new InitializeRequestArgs(
ProcessId: json.Bind<int>(jsonElement, JsonRpcStrings.ProcessId),
ClientInfo: json.Bind<ClientInfo>(jsonElement, JsonRpcStrings.ClientInfo),
Capabilities: json.Bind<ClientCapabilities>(jsonElement, JsonRpcStrings.Capabilities)));

deserializers[typeof(ClientInfo)] = new JsonElementDeserializer<ClientInfo>((json, jsonElement) => new ClientInfo(
Name: json.Bind<string>(jsonElement, JsonRpcStrings.Name),
Version: json.Bind<string>(jsonElement, JsonRpcStrings.Version)));

deserializers[typeof(ClientCapabilities)] = new JsonElementDeserializer<ClientCapabilities>((json, jsonElement) =>
{
jsonElement.TryGetProperty(JsonRpcStrings.Testing, out JsonElement testing);

return new ClientCapabilities(
DebuggerProvider: json.Bind<bool>(testing, JsonRpcStrings.DebuggerProvider));
});

deserializers[typeof(InitializeResponseArgs)] = new JsonElementDeserializer<InitializeResponseArgs>(
(json, jsonElement) => new InitializeResponseArgs(
ProcessId: json.Bind<int>(jsonElement, JsonRpcStrings.ProcessId),
ServerInfo: json.Bind<ServerInfo>(jsonElement, JsonRpcStrings.ServerInfo),
Capabilities: json.Bind<ServerCapabilities>(jsonElement, JsonRpcStrings.Capabilities)));

deserializers[typeof(ServerInfo)] = new JsonElementDeserializer<ServerInfo>(
(json, jsonElement) => new ServerInfo(
Name: json.Bind<string>(jsonElement, JsonRpcStrings.Name),
Version: json.Bind<string>(jsonElement, JsonRpcStrings.Version)));

deserializers[typeof(ServerCapabilities)] = new JsonElementDeserializer<ServerCapabilities>(
(json, jsonElement) => new ServerCapabilities(
TestingCapabilities: json.Bind<ServerTestingCapabilities>(jsonElement, JsonRpcStrings.Testing)));

deserializers[typeof(ServerTestingCapabilities)] = new JsonElementDeserializer<ServerTestingCapabilities>(
(json, jsonElement) => new ServerTestingCapabilities(
SupportsDiscovery: json.Bind<bool>(jsonElement, JsonRpcStrings.SupportsDiscovery),
MultiRequestSupport: json.Bind<bool>(jsonElement, JsonRpcStrings.MultiRequestSupport),
VSTestProviderSupport: json.Bind<bool>(jsonElement, JsonRpcStrings.VSTestProviderSupport),
SupportsAttachments: json.Bind<bool>(jsonElement, JsonRpcStrings.AttachmentsSupport),
MultiConnectionProvider: json.Bind<bool>(jsonElement, JsonRpcStrings.MultiConnectionProvider)));

deserializers[typeof(DiscoverRequestArgs)] = new JsonElementDeserializer<DiscoverRequestArgs>((json, jsonElement) =>
{
string runId = json.Bind<string>(jsonElement, JsonRpcStrings.RunId);
if (!Guid.TryParse(runId, out Guid result))
{
throw new MessageFormatException(JsonRpcStrings.InvalidRunIdErrorMessage);
}

json.TryArrayBind(jsonElement, out TestNode[]? testNodes, JsonRpcStrings.Tests);
json.TryBind(jsonElement, out string? graphFilter, JsonRpcStrings.Filter);

return new DiscoverRequestArgs(
RunId: result,
TestNodes: testNodes,
GraphFilter: graphFilter);
});

deserializers[typeof(RunRequestArgs)] = new JsonElementDeserializer<RunRequestArgs>((json, jsonElement) =>
{
string runId = json.Bind<string>(jsonElement, JsonRpcStrings.RunId);
if (!Guid.TryParse(runId, out Guid result))
{
throw new MessageFormatException(JsonRpcStrings.InvalidRunIdErrorMessage);
}

json.TryArrayBind(jsonElement, out TestNode[]? testNodes, JsonRpcStrings.Tests);
json.TryBind(jsonElement, out string? graphFilter, JsonRpcStrings.Filter);

return new RunRequestArgs(
RunId: result,
TestNodes: testNodes,
GraphFilter: graphFilter);
});

deserializers[typeof(TestNode)] = new JsonElementDeserializer<TestNode>(
(json, properties) =>
{
PropertyBag propertyBag = new();
string uid = json.Bind<string>(properties, JsonRpcStrings.Uid) ?? string.Empty;
string displayName = json.Bind<string>(properties, JsonRpcStrings.DisplayName);

if (json.TryBind(properties, out string? locationFile, "location.file"))
{
json.TryBind(properties, out int locationLineStart, "location.line-start");
json.TryBind(properties, out int locationLineEnd, "location.line-end");

TestFileLocationProperty testFileLocationProperty = new(
locationFile!,
new LinePositionSpan(new LinePosition(locationLineStart, 0), new LinePosition(locationLineEnd, 0)));
propertyBag.Add(testFileLocationProperty);
}

return new TestNode
{
Uid = new TestNodeUid(uid),
DisplayName = displayName,
Properties = propertyBag,
};
});

deserializers[typeof(CancelRequestArgs)] = new JsonElementDeserializer<CancelRequestArgs>(
(json, jsonElement) => json.TryBind(jsonElement, out int id, JsonRpcStrings.Id) ? new CancelRequestArgs(id) : throw new MessageFormatException("id field should be an int"));

deserializers[typeof(ExitRequestArgs)] = new JsonElementDeserializer<ExitRequestArgs>(
(json, jsonElement) => new ExitRequestArgs());

deserializers[typeof(ErrorMessage)] = new JsonElementDeserializer<ErrorMessage>(
(json, jsonElement) =>
{
ValidateJsonRpcHeader(json, jsonElement);

int id = json.Bind<int>(jsonElement, JsonRpcStrings.Id);
JsonElement error = jsonElement.GetProperty(JsonRpcStrings.Error);

int code = json.Bind<int>(error, JsonRpcStrings.Code);
string message = json.Bind<string>(error, JsonRpcStrings.Message);

if (json.TryBind(error, out IDictionary<string, object?>? data, JsonRpcStrings.Data) && data?.Count == 0)
{
data = null;
}

return new ErrorMessage(
Id: id,
ErrorCode: code,
Message: message ?? string.Empty,
Data: data);
});
}
}
Loading
Loading