Skip to content

Commit 7ca963e

Browse files
titusfortnertitusfortner
committed
[java][cdp] add support for Chrome 98 and remove support for Chrome 95
1 parent 4378db7 commit 7ca963e

10 files changed

Lines changed: 75 additions & 70 deletions

File tree

‎Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ JAVA_RELEASE_TARGETS = %w[
100100
//java/src/org/openqa/selenium/chrome:chrome.publish
101101
//java/src/org/openqa/selenium/chromium:chromium.publish
102102
//java/src/org/openqa/selenium/devtools/v85:v85.publish
103-
//java/src/org/openqa/selenium/devtools/v95:v95.publish
104103
//java/src/org/openqa/selenium/devtools/v96:v96.publish
105104
//java/src/org/openqa/selenium/devtools/v97:v97.publish
105+
//java/src/org/openqa/selenium/devtools/v98:v97\8.publish
106106
//java/src/org/openqa/selenium/edge:edge.publish
107107
//java/src/org/openqa/selenium/firefox:firefox.publish
108108
//java/src/org/openqa/selenium/grid/sessionmap/jdbc:jdbc.publish

java/src/org/openqa/selenium/devtools/v95/BUILD.bazel renamed to java/src/org/openqa/selenium/devtools/v98/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 = "v95"
6+
cdp_version = "v98"
77

88
java_export(
99
name = cdp_version,

java/src/org/openqa/selenium/devtools/v95/V95CdpInfo.java renamed to java/src/org/openqa/selenium/devtools/v98/V98CdpInfo.java

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

18-
package org.openqa.selenium.devtools.v95;
18+
package org.openqa.selenium.devtools.v98;
1919

2020
import com.google.auto.service.AutoService;
2121
import org.openqa.selenium.devtools.CdpInfo;
22+
import org.openqa.selenium.devtools.v98.V98Domains;
2223

2324
@AutoService(CdpInfo.class)
24-
public class V95CdpInfo extends CdpInfo {
25+
public class V98CdpInfo extends CdpInfo {
2526

26-
public V95CdpInfo() {
27-
super(95, V95Domains::new);
27+
public V98CdpInfo() {
28+
super(98, V98Domains::new);
2829
}
2930
}

java/src/org/openqa/selenium/devtools/v95/V95Domains.java renamed to java/src/org/openqa/selenium/devtools/v98/V98Domains.java

Lines changed: 18 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.v95;
18+
package org.openqa.selenium.devtools.v98;
1919

2020
import org.openqa.selenium.devtools.DevTools;
2121
import org.openqa.selenium.devtools.idealized.Domains;
@@ -24,23 +24,28 @@
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.v98.V98Events;
28+
import org.openqa.selenium.devtools.v98.V98Javascript;
29+
import org.openqa.selenium.devtools.v98.V98Log;
30+
import org.openqa.selenium.devtools.v98.V98Network;
31+
import org.openqa.selenium.devtools.v98.V98Target;
2732
import org.openqa.selenium.internal.Require;
2833

29-
public class V95Domains implements Domains {
34+
public class V98Domains implements Domains {
3035

31-
private final V95Javascript js;
32-
private final V95Events events;
33-
private final V95Log log;
34-
private final V95Network network;
35-
private final V95Target target;
36+
private final V98Javascript js;
37+
private final V98Events events;
38+
private final V98Log log;
39+
private final V98Network network;
40+
private final V98Target target;
3641

37-
public V95Domains(DevTools devtools) {
42+
public V98Domains(DevTools devtools) {
3843
Require.nonNull("DevTools", devtools);
39-
events = new V95Events(devtools);
40-
js = new V95Javascript(devtools);
41-
log = new V95Log();
42-
network = new V95Network(devtools);
43-
target = new V95Target();
44+
events = new V98Events(devtools);
45+
js = new V98Javascript(devtools);
46+
log = new V98Log();
47+
network = new V98Network(devtools);
48+
target = new V98Target();
4449
}
4550

4651
@Override

java/src/org/openqa/selenium/devtools/v95/V95Events.java renamed to java/src/org/openqa/selenium/devtools/v98/V98Events.java

Lines changed: 9 additions & 10 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.v95;
18+
package org.openqa.selenium.devtools.v98;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import org.openqa.selenium.JavascriptException;
@@ -25,20 +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.v95.runtime.Runtime;
29-
import org.openqa.selenium.devtools.v95.runtime.model.ConsoleAPICalled;
30-
import org.openqa.selenium.devtools.v95.runtime.model.ExceptionDetails;
31-
import org.openqa.selenium.devtools.v95.runtime.model.ExceptionThrown;
32-
import org.openqa.selenium.devtools.v95.runtime.model.StackTrace;
28+
import org.openqa.selenium.devtools.v98.runtime.Runtime;
29+
import org.openqa.selenium.devtools.v98.runtime.model.ConsoleAPICalled;
30+
import org.openqa.selenium.devtools.v98.runtime.model.ExceptionDetails;
31+
import org.openqa.selenium.devtools.v98.runtime.model.ExceptionThrown;
32+
import org.openqa.selenium.devtools.v98.runtime.model.StackTrace;
3333

34-
import java.math.BigDecimal;
3534
import java.time.Instant;
3635
import java.util.List;
3736
import java.util.Optional;
3837

39-
public class V95Events extends Events<ConsoleAPICalled, ExceptionThrown> {
38+
public class V98Events extends Events<ConsoleAPICalled, ExceptionThrown> {
4039

41-
public V95Events(DevTools devtools) {
40+
public V98Events(DevTools devtools) {
4241
super(devtools);
4342
}
4443

@@ -82,7 +81,7 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) {
8281
protected JavascriptException toJsException(ExceptionThrown event) {
8382
ExceptionDetails details = event.getExceptionDetails();
8483
Optional<StackTrace> maybeTrace = details.getStackTrace();
85-
Optional<org.openqa.selenium.devtools.v95.runtime.model.RemoteObject>
84+
Optional<org.openqa.selenium.devtools.v98.runtime.model.RemoteObject>
8685
maybeException = details.getException();
8786

8887
String message = maybeException

java/src/org/openqa/selenium/devtools/v95/V95Javascript.java renamed to java/src/org/openqa/selenium/devtools/v98/V98Javascript.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.v95;
18+
package org.openqa.selenium.devtools.v98;
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.v95.page.Page;
25-
import org.openqa.selenium.devtools.v95.page.model.ScriptIdentifier;
26-
import org.openqa.selenium.devtools.v95.runtime.Runtime;
27-
import org.openqa.selenium.devtools.v95.runtime.model.BindingCalled;
24+
import org.openqa.selenium.devtools.v98.page.Page;
25+
import org.openqa.selenium.devtools.v98.page.model.ScriptIdentifier;
26+
import org.openqa.selenium.devtools.v98.runtime.Runtime;
27+
import org.openqa.selenium.devtools.v98.runtime.model.BindingCalled;
2828

2929
import java.util.Optional;
3030

31-
public class V95Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
31+
public class V98Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
3232

33-
public V95Javascript(DevTools devtools) {
33+
public V98Javascript(DevTools devtools) {
3434
super(devtools);
3535
}
3636

java/src/org/openqa/selenium/devtools/v95/V95Log.java renamed to java/src/org/openqa/selenium/devtools/v98/V98Log.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.v95;
18+
package org.openqa.selenium.devtools.v98;
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.v95.log.Log;
24-
import org.openqa.selenium.devtools.v95.log.model.LogEntry;
25-
import org.openqa.selenium.devtools.v95.runtime.model.Timestamp;
23+
import org.openqa.selenium.devtools.v98.log.Log;
24+
import org.openqa.selenium.devtools.v98.log.model.LogEntry;
25+
import org.openqa.selenium.devtools.v98.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 V95Log implements org.openqa.selenium.devtools.idealized.log.Log {
31+
public class V98Log implements org.openqa.selenium.devtools.idealized.log.Log {
3232
@Override
3333
public Command<Void> enable() {
3434
return Log.enable();

java/src/org/openqa/selenium/devtools/v95/V95Network.java renamed to java/src/org/openqa/selenium/devtools/v98/V98Network.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.v95;
18+
package org.openqa.selenium.devtools.v98;
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.v95.fetch.Fetch;
29-
import org.openqa.selenium.devtools.v95.fetch.model.AuthChallengeResponse;
30-
import org.openqa.selenium.devtools.v95.fetch.model.AuthRequired;
31-
import org.openqa.selenium.devtools.v95.fetch.model.HeaderEntry;
32-
import org.openqa.selenium.devtools.v95.fetch.model.RequestPattern;
33-
import org.openqa.selenium.devtools.v95.fetch.model.RequestPaused;
34-
import org.openqa.selenium.devtools.v95.fetch.model.RequestStage;
35-
import org.openqa.selenium.devtools.v95.network.model.Request;
28+
import org.openqa.selenium.devtools.v98.fetch.Fetch;
29+
import org.openqa.selenium.devtools.v98.fetch.model.AuthChallengeResponse;
30+
import org.openqa.selenium.devtools.v98.fetch.model.AuthRequired;
31+
import org.openqa.selenium.devtools.v98.fetch.model.HeaderEntry;
32+
import org.openqa.selenium.devtools.v98.fetch.model.RequestPattern;
33+
import org.openqa.selenium.devtools.v98.fetch.model.RequestPaused;
34+
import org.openqa.selenium.devtools.v98.fetch.model.RequestStage;
35+
import org.openqa.selenium.devtools.v98.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 V95Network extends Network<AuthRequired, RequestPaused> {
53+
public class V98Network extends Network<AuthRequired, RequestPaused> {
5454

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

57-
public V95Network(DevTools devTools) {
57+
public V98Network(DevTools devTools) {
5858
super(devTools);
5959
}
6060

6161
@Override
6262
protected Command<Void> setUserAgentOverride(UserAgent userAgent) {
63-
return org.openqa.selenium.devtools.v95.network.Network.setUserAgentOverride(
63+
return org.openqa.selenium.devtools.v98.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.v95.network.Network.setCacheDisabled(false);
69+
return org.openqa.selenium.devtools.v98.network.Network.setCacheDisabled(false);
7070
}
7171

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

7777
@Override

java/src/org/openqa/selenium/devtools/v95/V95Target.java renamed to java/src/org/openqa/selenium/devtools/v98/V98Target.java

Lines changed: 12 additions & 12 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.v95;
18+
package org.openqa.selenium.devtools.v98;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.ImmutableMap;
@@ -25,21 +25,21 @@
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.v95.target.Target;
29-
import org.openqa.selenium.devtools.v95.target.model.TargetInfo;
28+
import org.openqa.selenium.devtools.v98.target.Target;
29+
import org.openqa.selenium.devtools.v98.target.model.TargetInfo;
3030
import org.openqa.selenium.json.JsonInput;
3131
import org.openqa.selenium.json.TypeToken;
3232

3333
import java.util.List;
3434
import java.util.Optional;
3535
import java.util.function.Function;
3636

37-
public class V95Target implements org.openqa.selenium.devtools.idealized.target.Target {
37+
public class V98Target implements org.openqa.selenium.devtools.idealized.target.Target {
3838
@Override
3939
public Command<Void> detachFromTarget(Optional<SessionID> sessionId, Optional<TargetID> targetId) {
4040
return Target.detachFromTarget(
41-
sessionId.map(id -> new org.openqa.selenium.devtools.v95.target.model.SessionID(id.toString())),
42-
targetId.map(id -> new org.openqa.selenium.devtools.v95.target.model.TargetID(id.toString())));
41+
sessionId.map(id -> new org.openqa.selenium.devtools.v98.target.model.SessionID(id.toString())),
42+
targetId.map(id -> new org.openqa.selenium.devtools.v98.target.model.TargetID(id.toString())));
4343
}
4444

4545
@Override
@@ -69,16 +69,16 @@ public Command<List<org.openqa.selenium.devtools.idealized.target.model.TargetIn
6969

7070
@Override
7171
public Command<SessionID> attachToTarget(TargetID targetId) {
72-
Function<JsonInput, org.openqa.selenium.devtools.v95.target.model.SessionID> mapper =
73-
ConverterFunctions.map("sessionId", org.openqa.selenium.devtools.v95.target.model.SessionID.class);
72+
Function<JsonInput, org.openqa.selenium.devtools.v98.target.model.SessionID> mapper =
73+
ConverterFunctions.map("sessionId", org.openqa.selenium.devtools.v98.target.model.SessionID.class);
7474

7575
return new Command<>(
7676
"Target.attachToTarget",
7777
ImmutableMap.of(
78-
"targetId", new org.openqa.selenium.devtools.v95.target.model.TargetID(targetId.toString()),
78+
"targetId", new org.openqa.selenium.devtools.v98.target.model.TargetID(targetId.toString()),
7979
"flatten", true),
8080
input -> {
81-
org.openqa.selenium.devtools.v95.target.model.SessionID id = mapper.apply(input);
81+
org.openqa.selenium.devtools.v98.target.model.SessionID id = mapper.apply(input);
8282
return new SessionID(id.toString());
8383
});
8484
}
@@ -93,8 +93,8 @@ public Event<TargetID> detached() {
9393
return new Event<>(
9494
"Target.detachedFromTarget",
9595
input -> {
96-
Function<JsonInput, org.openqa.selenium.devtools.v95.target.model.TargetID> converter =
97-
ConverterFunctions.map("targetId", org.openqa.selenium.devtools.v95.target.model.TargetID.class);
96+
Function<JsonInput, org.openqa.selenium.devtools.v98.target.model.TargetID> converter =
97+
ConverterFunctions.map("targetId", org.openqa.selenium.devtools.v98.target.model.TargetID.class);
9898
return new TargetID(converter.apply(input).toString());
9999
}
100100
);

‎java/src/org/openqa/selenium/devtools/versions.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CDP_VERSIONS = [
22
"v85", # Required by Firefox
3-
"v95",
43
"v96",
5-
"v97"
4+
"v97",
5+
"v98"
66
]
77

88
CDP_DEPS = ["//java/src/org/openqa/selenium/devtools/%s" % v for v in CDP_VERSIONS]

0 commit comments

Comments
 (0)