Skip to content

Use generated JSON context for event args #15195

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 1 commit into from
Closed

Use generated JSON context for event args #15195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 0 additions & 35 deletions dotnet/src/webdriver/DevTools/Json/DevToolsJsonOptions.cs
View file
Open in desktop

This file was deleted.

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
2 changes: 1 addition & 1 deletion 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 @@ -60,7 +60,7 @@ namespace {{rootNamespace}}.{{domain.Name}}
if (m_eventMap.ContainsKey(e.EventName))
{
var eventData = m_eventMap[e.EventName];
var eventArgs = e.EventData.Deserialize(eventData.EventArgsType, global::OpenQA.Selenium.DevTools.Json.DevToolsJsonOptions.Default);
var eventArgs = e.EventData.Deserialize(eventData.EventArgsType, {{rootNamespace}}.{{protocolVersion}}JsonSerializerContext.Default);
eventData.EventInvoker(eventArgs);
}
}
Expand Down
Loading