Skip to content

Handle command serialization/response deserialization within the domain #15186

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

Closed
wants to merge 7 commits into from
Closed

Handle command serialization/response deserialization within the domain #15186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b41c82f
Handle command serialization/response deserialization within the domain
RenderMichael Jan 30, 2025
e733d14
fix whitespace
RenderMichael Jan 30, 2025
c413984
Merge branch 'dotnet-devtools-aot' into devtools-command
RenderMichael Jan 30, 2025
02e0cb3
Use generated JSON context
RenderMichael Jan 30, 2025
3d5136c
Fix namespace and protocol reference
RenderMichael Jan 30, 2025
51fd74c
Pass in options to JsonNode/JsonElement serialization
RenderMichael Jan 30, 2025
3b11ba1
Remove JSON context for now
RenderMichael Jan 30, 2025
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: 3 additions & 1 deletion third_party/dotnet/devtools/src/generator/CodeGen/DomainGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using OpenQA.Selenium.DevToolsGenerator.ProtocolDefinition;
using System;
using System.Collections.Generic;
using System.Linq;

namespace OpenQA.Selenium.DevToolsGenerator.CodeGen
{
Expand Down Expand Up @@ -61,7 +62,8 @@ public override IDictionary<string, string> GenerateCode(DomainDefinition domain
domain = domainDefinition,
className = className,
rootNamespace = Settings.RootNamespace,
context = context
context = context,
protocolVersion = Settings.RootNamespace.Split(".").Last()
});

var outputPath = Utility.ReplaceTokensInPath(Settings.DefinitionTemplates.DomainTemplate.OutputPath, className, context, Settings);
Expand Down
15 changes: 13 additions & 2 deletions third_party/dotnet/devtools/src/generator/Templates/domain.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,20 @@ namespace {{rootNamespace}}.{{domain.Name}}
/// <summary>
/// {{xml-code-comment Description 2}}
/// </summary>
public Task<{{dehumanize Name}}CommandResponse> {{dehumanize Name}}({{dehumanize Name}}CommandSettings command{{#if NoParameters}} = null{{/if}}, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
public async Task<{{dehumanize Name}}CommandResponse> {{dehumanize Name}}({{dehumanize Name}}CommandSettings command{{#if NoParameters}} = null{{/if}}, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
{
return Session.SendCommand<{{dehumanize Name}}CommandSettings, {{dehumanize Name}}CommandResponse>(command{{#if NoParameters}} ?? new {{dehumanize Name}}CommandSettings(){{/if}}, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived);
{{#if NoParameters}}
command ??= new {{dehumanize Name}}CommandSettings();
{{/if}}
global::System.Text.Json.Nodes.JsonNode serializedCommand = global::System.Text.Json.JsonSerializer.SerializeToNode(command);
global::System.Text.Json.JsonElement? response = await Session.SendCommand(command.CommandName, serializedCommand, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived).ConfigureAwait(false);

if (response == null)
{
return default({{dehumanize Name}}CommandResponse);
}

return global::System.Text.Json.JsonSerializer.Deserialize<{{dehumanize Name}}CommandResponse>(response.Value);
}
Copy link
Contributor Author

@RenderMichael RenderMichael Jan 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks like this:
image

Copy link
Contributor Author

@RenderMichael RenderMichael Jan 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternative, shorter syntax:
image

I can switch to this if it's preferable.


{{/each}}
Expand Down
Loading