From b52af06863ada1b0a7a0659ea41b8830632c3151 Mon Sep 17 00:00:00 2001 From: delta456 Date: Wed, 11 Dec 2024 23:19:36 +0530 Subject: [PATCH 1/4] Revert "add alias attr to all edge structs" This reverts commit f17dd08dd32998a310510f0abc44e5b484202a4d. --- rust/src/edge.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rust/src/edge.rs b/rust/src/edge.rs index 8b844dd718630..582a7f1717b38 100644 --- a/rust/src/edge.rs +++ b/rust/src/edge.rs @@ -555,42 +555,42 @@ impl SeleniumManager for EdgeManager { #[derive(Serialize, Deserialize, Debug)] pub struct EdgeProduct { - #[serde(rename = "Product", alias = "product")] + #[serde(rename = "Product")] pub product: String, - #[serde(rename = "Releases", alias = "releases")] + #[serde(rename = "Releases")] pub releases: Vec, } #[derive(Serialize, Deserialize, Debug)] pub struct Release { - #[serde(rename = "ReleaseId", alias = "releaseId")] + #[serde(rename = "ReleaseId")] pub release_id: u32, - #[serde(rename = "Platform", alias = "platform")] + #[serde(rename = "Platform")] pub platform: String, - #[serde(rename = "Architecture", alias = "architecture")] + #[serde(rename = "Architecture")] pub architecture: String, - #[serde(rename = "CVEs", alias = "cves")] + #[serde(rename = "CVEs")] pub cves: Vec, - #[serde(rename = "ProductVersion", alias = "productVersion")] + #[serde(rename = "ProductVersion")] pub product_version: String, - #[serde(rename = "Artifacts", alias = "artifacts")] + #[serde(rename = "Artifacts")] pub artifacts: Vec, - #[serde(rename = "PublishedTime", alias = "publishedTime")] + #[serde(rename = "PublishedTime")] pub published_time: String, - #[serde(rename = "ExpectedExpiryDate", alias = "expectedExpiryDate")] + #[serde(rename = "ExpectedExpiryDate")] pub expected_expiry_date: String, } #[derive(Serialize, Deserialize, Debug)] pub struct Artifact { - #[serde(rename = "ArtifactName", alias = "artifactName")] + #[serde(rename = "ArtifactName")] pub artifact_name: String, - #[serde(rename = "Location", alias = "location")] + #[serde(rename = "Location")] pub location: String, - #[serde(rename = "Hash", alias = "hash")] + #[serde(rename = "Hash")] pub hash: String, - #[serde(rename = "HashAlgorithm", alias = "hashAlgorithm")] + #[serde(rename = "HashAlgorithm")] pub hash_algorithm: String, - #[serde(rename = "SizeInBytes", alias = "sizeInBytes")] + #[serde(rename = "SizeInBytes")] pub size_in_bytes: u32, } From 54ead9d308e1fd4c13e20ae23e120cfa68fa6e10 Mon Sep 17 00:00:00 2001 From: delta456 Date: Tue, 31 Dec 2024 17:40:08 +0530 Subject: [PATCH 2/4] Reapply "add alias attr to all edge structs" This reverts commit cc16e3fe18971d5ecb37e26a37bcda76cda7c48b. oops --- rust/src/edge.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rust/src/edge.rs b/rust/src/edge.rs index 582a7f1717b38..8b844dd718630 100644 --- a/rust/src/edge.rs +++ b/rust/src/edge.rs @@ -555,42 +555,42 @@ impl SeleniumManager for EdgeManager { #[derive(Serialize, Deserialize, Debug)] pub struct EdgeProduct { - #[serde(rename = "Product")] + #[serde(rename = "Product", alias = "product")] pub product: String, - #[serde(rename = "Releases")] + #[serde(rename = "Releases", alias = "releases")] pub releases: Vec, } #[derive(Serialize, Deserialize, Debug)] pub struct Release { - #[serde(rename = "ReleaseId")] + #[serde(rename = "ReleaseId", alias = "releaseId")] pub release_id: u32, - #[serde(rename = "Platform")] + #[serde(rename = "Platform", alias = "platform")] pub platform: String, - #[serde(rename = "Architecture")] + #[serde(rename = "Architecture", alias = "architecture")] pub architecture: String, - #[serde(rename = "CVEs")] + #[serde(rename = "CVEs", alias = "cves")] pub cves: Vec, - #[serde(rename = "ProductVersion")] + #[serde(rename = "ProductVersion", alias = "productVersion")] pub product_version: String, - #[serde(rename = "Artifacts")] + #[serde(rename = "Artifacts", alias = "artifacts")] pub artifacts: Vec, - #[serde(rename = "PublishedTime")] + #[serde(rename = "PublishedTime", alias = "publishedTime")] pub published_time: String, - #[serde(rename = "ExpectedExpiryDate")] + #[serde(rename = "ExpectedExpiryDate", alias = "expectedExpiryDate")] pub expected_expiry_date: String, } #[derive(Serialize, Deserialize, Debug)] pub struct Artifact { - #[serde(rename = "ArtifactName")] + #[serde(rename = "ArtifactName", alias = "artifactName")] pub artifact_name: String, - #[serde(rename = "Location")] + #[serde(rename = "Location", alias = "location")] pub location: String, - #[serde(rename = "Hash")] + #[serde(rename = "Hash", alias = "hash")] pub hash: String, - #[serde(rename = "HashAlgorithm")] + #[serde(rename = "HashAlgorithm", alias = "hashAlgorithm")] pub hash_algorithm: String, - #[serde(rename = "SizeInBytes")] + #[serde(rename = "SizeInBytes", alias = "sizeInBytes")] pub size_in_bytes: u32, } From b9a02327f3606a73ff2a01bc48a0947d5c9f372e Mon Sep 17 00:00:00 2001 From: delta456 Date: Mon, 27 Jan 2025 17:17:29 +0530 Subject: [PATCH 3/4] [java] do not enable CDP deprecation warning if BiDi enabled --- .../org/openqa/selenium/devtools/CdpEndpointFinder.java | 8 +++++--- java/src/org/openqa/selenium/firefox/FirefoxDriver.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java b/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java index 91c25138c23df..a21d3cebec5b9 100644 --- a/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java +++ b/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java @@ -91,9 +91,11 @@ public static Optional getReportedUri(Capabilities caps) { break; case "firefox": key = "moz:debuggerAddress"; - LOG.warning( - "CDP support for Firefox is deprecated and will be removed in future versions. " - + "Please switch to WebDriver BiDi."); + if (!(Boolean) caps.getCapability("webSocketUrl")) { + LOG.warning( + "CDP support for Firefox is deprecated and will be removed in future versions. " + + "Please switch to WebDriver BiDi."); + } break; default: return Optional.empty(); diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java index 01ec605d2fa08..58cd5439befc2 100644 --- a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java +++ b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java @@ -165,7 +165,7 @@ private FirefoxDriver( Optional reportedUri = CdpEndpointFinder.getReportedUri("moz:debuggerAddress", capabilities); - if (reportedUri.isPresent()) { + if (reportedUri.isPresent() && !(Boolean) capabilities.getCapability("webSocketUrl")) { LOG.warning( "CDP support for Firefox is deprecated and will be removed in future versions. " + "Please switch to WebDriver BiDi."); From 1c1cb80b6485cc291d0333eb0fe722727b496968 Mon Sep 17 00:00:00 2001 From: delta456 Date: Thu, 30 Jan 2025 15:13:29 +0530 Subject: [PATCH 4/4] enhance check --- java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java | 2 +- java/src/org/openqa/selenium/firefox/FirefoxDriver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java b/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java index a21d3cebec5b9..c63e2f153eaf1 100644 --- a/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java +++ b/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java @@ -91,7 +91,7 @@ public static Optional getReportedUri(Capabilities caps) { break; case "firefox": key = "moz:debuggerAddress"; - if (!(Boolean) caps.getCapability("webSocketUrl")) { + if (!caps.is("webSocketUrl")) { LOG.warning( "CDP support for Firefox is deprecated and will be removed in future versions. " + "Please switch to WebDriver BiDi."); diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java index 58cd5439befc2..9d48f66fbab85 100644 --- a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java +++ b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java @@ -165,7 +165,7 @@ private FirefoxDriver( Optional reportedUri = CdpEndpointFinder.getReportedUri("moz:debuggerAddress", capabilities); - if (reportedUri.isPresent() && !(Boolean) capabilities.getCapability("webSocketUrl")) { + if (reportedUri.isPresent() && !capabilities.is("webSocketUrl")) { LOG.warning( "CDP support for Firefox is deprecated and will be removed in future versions. " + "Please switch to WebDriver BiDi.");