Skip to content
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

[dotnet] [bidi] Make ProxyConfiguration as not nested #15438

Merged
merged 1 commit into from
Mar 17, 2025
Merged

[dotnet] [bidi] Make ProxyConfiguration as not nested #15438

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
39 changes: 19 additions & 20 deletions dotnet/src/webdriver/BiDi/Modules/Session/ProxyConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,30 @@
namespace OpenQA.Selenium.BiDi.Modules.Session;

[JsonPolymorphic(TypeDiscriminatorPropertyName = "proxyType")]
[JsonDerivedType(typeof(AutoDetect), "autodetect")]
[JsonDerivedType(typeof(Direct), "direct")]
[JsonDerivedType(typeof(Manual), "manual")]
[JsonDerivedType(typeof(Pac), "pac")]
[JsonDerivedType(typeof(System), "system")]
public abstract record ProxyConfiguration
{
public record AutoDetect : ProxyConfiguration;

public record Direct : ProxyConfiguration;
[JsonDerivedType(typeof(AutoDetectProxyConfiguration), "autodetect")]
[JsonDerivedType(typeof(DirectProxyConfiguration), "direct")]
[JsonDerivedType(typeof(ManualProxyConfiguration), "manual")]
[JsonDerivedType(typeof(PacProxyConfiguration), "pac")]
[JsonDerivedType(typeof(SystemProxyConfiguration), "system")]
public abstract record ProxyConfiguration;

public record Manual : ProxyConfiguration
{
public string? FtpProxy { get; set; }
public record AutoDetectProxyConfiguration : ProxyConfiguration;

public string? HttpProxy { get; set; }
public record DirectProxyConfiguration : ProxyConfiguration;

public string? SslProxy { get; set; }
public record ManualProxyConfiguration : ProxyConfiguration
{
public string? FtpProxy { get; set; }

public string? SocksProxy { get; set; }
public string? HttpProxy { get; set; }

public long? SocksVersion { get; set; }
}
public string? SslProxy { get; set; }

public record Pac(string ProxyAutoConfigUrl) : ProxyConfiguration;
public string? SocksProxy { get; set; }

public record System : ProxyConfiguration;
public long? SocksVersion { get; set; }
}

public record PacProxyConfiguration(string ProxyAutoConfigUrl) : ProxyConfiguration;

public record SystemProxyConfiguration : ProxyConfiguration;
Loading