Skip to content

Commit beaaed8

Browse files
titusfortnertitusfortner
committed
[java][cdp] add support for Chrome 109 and remove support for Chrome 106
1 parent ef9a6b4 commit beaaed8

11 files changed

Lines changed: 68 additions & 77 deletions

File tree

‎Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ task '//java/test/org/openqa/selenium/environment/webserver:webserver:uber' => [
9898
JAVA_RELEASE_TARGETS = %w[
9999
//java/src/org/openqa/selenium/chrome:chrome.publish
100100
//java/src/org/openqa/selenium/chromium:chromium.publish
101-
//java/src/org/openqa/selenium/devtools/v106:v106.publish
102101
//java/src/org/openqa/selenium/devtools/v107:v107.publish
103102
//java/src/org/openqa/selenium/devtools/v108:v108.publish
103+
//java/src/org/openqa/selenium/devtools/v109:v109.publish
104104
//java/src/org/openqa/selenium/devtools/v85:v85.publish
105105
//java/src/org/openqa/selenium/edge:edge.publish
106106
//java/src/org/openqa/selenium/firefox:firefox.publish

‎common/devtools/chromium/v109/browser_protocol.pdl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,9 +790,7 @@ experimental domain Audits
790790
PrefixedStorageInfo
791791
PrefixedVideoDisplayingFullscreen
792792
PrefixedVideoEnterFullscreen
793-
PrefixedVideoEnterFullScreen
794793
PrefixedVideoExitFullscreen
795-
PrefixedVideoExitFullScreen
796794
PrefixedVideoSupportsFullscreen
797795
RangeExpand
798796
RequestedSubresourceWithEmbeddedCredentials

java/src/org/openqa/selenium/devtools/v106/BUILD.bazel renamed to java/src/org/openqa/selenium/devtools/v109/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("//common:defs.bzl", "copy_file")
33
load("//java:defs.bzl", "java_export", "java_library")
44
load("//java:version.bzl", "SE_VERSION")
55

6-
cdp_version = "v106"
6+
cdp_version = "v109"
77

88
java_export(
99
name = cdp_version,

java/src/org/openqa/selenium/devtools/v106/V106CdpInfo.java renamed to java/src/org/openqa/selenium/devtools/v109/V109CdpInfo.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.devtools.v106;
18+
package org.openqa.selenium.devtools.v109;
1919

2020
import com.google.auto.service.AutoService;
2121
import org.openqa.selenium.devtools.CdpInfo;
22-
import org.openqa.selenium.devtools.v106.V106Domains;
2322

2423
@AutoService(CdpInfo.class)
25-
public class V106CdpInfo extends CdpInfo {
24+
public class V109CdpInfo extends CdpInfo {
2625

27-
public V106CdpInfo() {
28-
super(106, V106Domains::new);
26+
public V109CdpInfo() {
27+
super(109, V109Domains::new);
2928
}
3029
}

java/src/org/openqa/selenium/devtools/v106/V106Domains.java renamed to java/src/org/openqa/selenium/devtools/v109/V109Domains.java

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.devtools.v106;
18+
package org.openqa.selenium.devtools.v109;
1919

2020
import org.openqa.selenium.devtools.DevTools;
2121
import org.openqa.selenium.devtools.idealized.Domains;
@@ -24,28 +24,23 @@
2424
import org.openqa.selenium.devtools.idealized.Network;
2525
import org.openqa.selenium.devtools.idealized.log.Log;
2626
import org.openqa.selenium.devtools.idealized.target.Target;
27-
import org.openqa.selenium.devtools.v106.V106Events;
28-
import org.openqa.selenium.devtools.v106.V106Javascript;
29-
import org.openqa.selenium.devtools.v106.V106Log;
30-
import org.openqa.selenium.devtools.v106.V106Network;
31-
import org.openqa.selenium.devtools.v106.V106Target;
3227
import org.openqa.selenium.internal.Require;
3328

34-
public class V106Domains implements Domains {
29+
public class V109Domains implements Domains {
3530

36-
private final V106Javascript js;
37-
private final V106Events events;
38-
private final V106Log log;
39-
private final V106Network network;
40-
private final V106Target target;
31+
private final V109Javascript js;
32+
private final V109Events events;
33+
private final V109Log log;
34+
private final V109Network network;
35+
private final V109Target target;
4136

42-
public V106Domains(DevTools devtools) {
37+
public V109Domains(DevTools devtools) {
4338
Require.nonNull("DevTools", devtools);
44-
events = new V106Events(devtools);
45-
js = new V106Javascript(devtools);
46-
log = new V106Log();
47-
network = new V106Network(devtools);
48-
target = new V106Target();
39+
events = new V109Events(devtools);
40+
js = new V109Javascript(devtools);
41+
log = new V109Log();
42+
network = new V109Network(devtools);
43+
target = new V109Target();
4944
}
5045

5146
@Override

java/src/org/openqa/selenium/devtools/v106/V106Events.java renamed to java/src/org/openqa/selenium/devtools/v109/V109Events.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.devtools.v106;
18+
package org.openqa.selenium.devtools.v109;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import org.openqa.selenium.JavascriptException;
@@ -25,19 +25,19 @@
2525
import org.openqa.selenium.devtools.events.ConsoleEvent;
2626
import org.openqa.selenium.devtools.idealized.Events;
2727
import org.openqa.selenium.devtools.idealized.runtime.model.RemoteObject;
28-
import org.openqa.selenium.devtools.v106.runtime.Runtime;
29-
import org.openqa.selenium.devtools.v106.runtime.model.ConsoleAPICalled;
30-
import org.openqa.selenium.devtools.v106.runtime.model.ExceptionDetails;
31-
import org.openqa.selenium.devtools.v106.runtime.model.ExceptionThrown;
32-
import org.openqa.selenium.devtools.v106.runtime.model.StackTrace;
28+
import org.openqa.selenium.devtools.v109.runtime.Runtime;
29+
import org.openqa.selenium.devtools.v109.runtime.model.ConsoleAPICalled;
30+
import org.openqa.selenium.devtools.v109.runtime.model.ExceptionDetails;
31+
import org.openqa.selenium.devtools.v109.runtime.model.ExceptionThrown;
32+
import org.openqa.selenium.devtools.v109.runtime.model.StackTrace;
3333

3434
import java.time.Instant;
3535
import java.util.List;
3636
import java.util.Optional;
3737

38-
public class V106Events extends Events<ConsoleAPICalled, ExceptionThrown> {
38+
public class V109Events extends Events<ConsoleAPICalled, ExceptionThrown> {
3939

40-
public V106Events(DevTools devtools) {
40+
public V109Events(DevTools devtools) {
4141
super(devtools);
4242
}
4343

@@ -82,7 +82,7 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) {
8282
protected JavascriptException toJsException(ExceptionThrown event) {
8383
ExceptionDetails details = event.getExceptionDetails();
8484
Optional<StackTrace> maybeTrace = details.getStackTrace();
85-
Optional<org.openqa.selenium.devtools.v106.runtime.model.RemoteObject>
85+
Optional<org.openqa.selenium.devtools.v109.runtime.model.RemoteObject>
8686
maybeException = details.getException();
8787

8888
String message = maybeException

java/src/org/openqa/selenium/devtools/v106/V106Javascript.java renamed to java/src/org/openqa/selenium/devtools/v109/V109Javascript.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.devtools.v106;
18+
package org.openqa.selenium.devtools.v109;
1919

2020
import org.openqa.selenium.devtools.Command;
2121
import org.openqa.selenium.devtools.DevTools;
2222
import org.openqa.selenium.devtools.Event;
2323
import org.openqa.selenium.devtools.idealized.Javascript;
24-
import org.openqa.selenium.devtools.v106.page.Page;
25-
import org.openqa.selenium.devtools.v106.page.model.ScriptIdentifier;
26-
import org.openqa.selenium.devtools.v106.runtime.Runtime;
27-
import org.openqa.selenium.devtools.v106.runtime.model.BindingCalled;
24+
import org.openqa.selenium.devtools.v109.page.Page;
25+
import org.openqa.selenium.devtools.v109.page.model.ScriptIdentifier;
26+
import org.openqa.selenium.devtools.v109.runtime.Runtime;
27+
import org.openqa.selenium.devtools.v109.runtime.model.BindingCalled;
2828

2929
import java.util.Optional;
3030

31-
public class V106Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
31+
public class V109Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
3232

33-
public V106Javascript(DevTools devtools) {
33+
public V109Javascript(DevTools devtools) {
3434
super(devtools);
3535
}
3636

java/src/org/openqa/selenium/devtools/v106/V106Log.java renamed to java/src/org/openqa/selenium/devtools/v109/V109Log.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.devtools.v106;
18+
package org.openqa.selenium.devtools.v109;
1919

2020
import org.openqa.selenium.devtools.Command;
2121
import org.openqa.selenium.devtools.ConverterFunctions;
2222
import org.openqa.selenium.devtools.Event;
23-
import org.openqa.selenium.devtools.v106.log.Log;
24-
import org.openqa.selenium.devtools.v106.log.model.LogEntry;
25-
import org.openqa.selenium.devtools.v106.runtime.model.Timestamp;
23+
import org.openqa.selenium.devtools.v109.log.Log;
24+
import org.openqa.selenium.devtools.v109.log.model.LogEntry;
25+
import org.openqa.selenium.devtools.v109.runtime.model.Timestamp;
2626
import org.openqa.selenium.json.JsonInput;
2727

2828
import java.util.function.Function;
2929
import java.util.logging.Level;
3030

31-
public class V106Log implements org.openqa.selenium.devtools.idealized.log.Log {
31+
public class V109Log implements org.openqa.selenium.devtools.idealized.log.Log {
3232

3333
@Override
3434
public Command<Void> enable() {

java/src/org/openqa/selenium/devtools/v106/V106Network.java renamed to java/src/org/openqa/selenium/devtools/v109/V109Network.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.devtools.v106;
18+
package org.openqa.selenium.devtools.v109;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.io.ByteStreams;
@@ -25,14 +25,14 @@
2525
import org.openqa.selenium.devtools.DevToolsException;
2626
import org.openqa.selenium.devtools.Event;
2727
import org.openqa.selenium.devtools.idealized.Network;
28-
import org.openqa.selenium.devtools.v106.fetch.Fetch;
29-
import org.openqa.selenium.devtools.v106.fetch.model.AuthChallengeResponse;
30-
import org.openqa.selenium.devtools.v106.fetch.model.AuthRequired;
31-
import org.openqa.selenium.devtools.v106.fetch.model.HeaderEntry;
32-
import org.openqa.selenium.devtools.v106.fetch.model.RequestPattern;
33-
import org.openqa.selenium.devtools.v106.fetch.model.RequestPaused;
34-
import org.openqa.selenium.devtools.v106.fetch.model.RequestStage;
35-
import org.openqa.selenium.devtools.v106.network.model.Request;
28+
import org.openqa.selenium.devtools.v109.fetch.Fetch;
29+
import org.openqa.selenium.devtools.v109.fetch.model.AuthChallengeResponse;
30+
import org.openqa.selenium.devtools.v109.fetch.model.AuthRequired;
31+
import org.openqa.selenium.devtools.v109.fetch.model.HeaderEntry;
32+
import org.openqa.selenium.devtools.v109.fetch.model.RequestPattern;
33+
import org.openqa.selenium.devtools.v109.fetch.model.RequestPaused;
34+
import org.openqa.selenium.devtools.v109.fetch.model.RequestStage;
35+
import org.openqa.selenium.devtools.v109.network.model.Request;
3636
import org.openqa.selenium.internal.Either;
3737
import org.openqa.selenium.remote.http.HttpRequest;
3838
import org.openqa.selenium.remote.http.HttpResponse;
@@ -50,28 +50,28 @@
5050

5151
import static java.net.HttpURLConnection.HTTP_OK;
5252

53-
public class V106Network extends Network<AuthRequired, RequestPaused> {
53+
public class V109Network extends Network<AuthRequired, RequestPaused> {
5454

55-
private static final Logger LOG = Logger.getLogger(V106Network.class.getName());
55+
private static final Logger LOG = Logger.getLogger(V109Network.class.getName());
5656

57-
public V106Network(DevTools devTools) {
57+
public V109Network(DevTools devTools) {
5858
super(devTools);
5959
}
6060

6161
@Override
6262
protected Command<Void> setUserAgentOverride(UserAgent userAgent) {
63-
return org.openqa.selenium.devtools.v106.network.Network.setUserAgentOverride(
63+
return org.openqa.selenium.devtools.v109.network.Network.setUserAgentOverride(
6464
userAgent.userAgent(), userAgent.acceptLanguage(), userAgent.platform(), Optional.empty());
6565
}
6666

6767
@Override
6868
protected Command<Void> enableNetworkCaching() {
69-
return org.openqa.selenium.devtools.v106.network.Network.setCacheDisabled(false);
69+
return org.openqa.selenium.devtools.v109.network.Network.setCacheDisabled(false);
7070
}
7171

7272
@Override
7373
protected Command<Void> disableNetworkCaching() {
74-
return org.openqa.selenium.devtools.v106.network.Network.setCacheDisabled(true);
74+
return org.openqa.selenium.devtools.v109.network.Network.setCacheDisabled(true);
7575
}
7676

7777
@Override

java/src/org/openqa/selenium/devtools/v106/V106Target.java renamed to java/src/org/openqa/selenium/devtools/v109/V109Target.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.devtools.v106;
18+
package org.openqa.selenium.devtools.v109;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.ImmutableMap;
@@ -25,26 +25,25 @@
2525
import org.openqa.selenium.devtools.idealized.browser.model.BrowserContextID;
2626
import org.openqa.selenium.devtools.idealized.target.model.SessionID;
2727
import org.openqa.selenium.devtools.idealized.target.model.TargetID;
28-
import org.openqa.selenium.devtools.v106.target.Target;
29-
import org.openqa.selenium.devtools.v106.target.model.TargetFilter;
30-
import org.openqa.selenium.devtools.v106.target.model.TargetInfo;
28+
import org.openqa.selenium.devtools.v109.target.Target;
29+
import org.openqa.selenium.devtools.v109.target.model.TargetInfo;
3130
import org.openqa.selenium.json.JsonInput;
3231
import org.openqa.selenium.json.TypeToken;
3332

3433
import java.util.List;
3534
import java.util.Optional;
3635
import java.util.function.Function;
3736

38-
public class V106Target implements org.openqa.selenium.devtools.idealized.target.Target {
37+
public class V109Target implements org.openqa.selenium.devtools.idealized.target.Target {
3938

4039
@Override
4140
public Command<Void> detachFromTarget(Optional<SessionID> sessionId,
4241
Optional<TargetID> targetId) {
4342
return Target.detachFromTarget(
4443
sessionId.map(
45-
id -> new org.openqa.selenium.devtools.v106.target.model.SessionID(id.toString())),
44+
id -> new org.openqa.selenium.devtools.v109.target.model.SessionID(id.toString())),
4645
targetId.map(
47-
id -> new org.openqa.selenium.devtools.v106.target.model.TargetID(id.toString())));
46+
id -> new org.openqa.selenium.devtools.v109.target.model.TargetID(id.toString())));
4847
}
4948

5049
@Override
@@ -75,18 +74,18 @@ public Command<List<org.openqa.selenium.devtools.idealized.target.model.TargetIn
7574

7675
@Override
7776
public Command<SessionID> attachToTarget(TargetID targetId) {
78-
Function<JsonInput, org.openqa.selenium.devtools.v106.target.model.SessionID> mapper =
77+
Function<JsonInput, org.openqa.selenium.devtools.v109.target.model.SessionID> mapper =
7978
ConverterFunctions.map("sessionId",
80-
org.openqa.selenium.devtools.v106.target.model.SessionID.class);
79+
org.openqa.selenium.devtools.v109.target.model.SessionID.class);
8180

8281
return new Command<>(
8382
"Target.attachToTarget",
8483
ImmutableMap.of(
8584
"targetId",
86-
new org.openqa.selenium.devtools.v106.target.model.TargetID(targetId.toString()),
85+
new org.openqa.selenium.devtools.v109.target.model.TargetID(targetId.toString()),
8786
"flatten", true),
8887
input -> {
89-
org.openqa.selenium.devtools.v106.target.model.SessionID id = mapper.apply(input);
88+
org.openqa.selenium.devtools.v109.target.model.SessionID id = mapper.apply(input);
9089
return new SessionID(id.toString());
9190
});
9291
}
@@ -101,9 +100,9 @@ public Event<TargetID> detached() {
101100
return new Event<>(
102101
"Target.detachedFromTarget",
103102
input -> {
104-
Function<JsonInput, org.openqa.selenium.devtools.v106.target.model.TargetID> converter =
103+
Function<JsonInput, org.openqa.selenium.devtools.v109.target.model.TargetID> converter =
105104
ConverterFunctions.map("targetId",
106-
org.openqa.selenium.devtools.v106.target.model.TargetID.class);
105+
org.openqa.selenium.devtools.v109.target.model.TargetID.class);
107106
return new TargetID(converter.apply(input).toString());
108107
}
109108
);

0 commit comments

Comments
 (0)