Skip to content

Commit c04855f

Browse files
titusfortnertitusfortner
committed
[cdp][java] add Chrome 118 and remove 115
1 parent d7d1b4e commit c04855f

File tree

10 files changed

+66
-70
lines changed

10 files changed

+66
-70
lines changed

‎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/v115:v115.publish
102101
//java/src/org/openqa/selenium/devtools/v116:v116.publish
103102
//java/src/org/openqa/selenium/devtools/v117:v117.publish
103+
//java/src/org/openqa/selenium/devtools/v118:v118.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

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

88
java_export(
99
name = cdp_version,

‎java/src/org/openqa/selenium/devtools/v115/v115CdpInfo.java‎ renamed to ‎java/src/org/openqa/selenium/devtools/v118/v118CdpInfo.java‎

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

18-
package org.openqa.selenium.devtools.v115;
18+
package org.openqa.selenium.devtools.v118;
1919

2020
import com.google.auto.service.AutoService;
2121
import org.openqa.selenium.devtools.CdpInfo;
2222

2323
@AutoService(CdpInfo.class)
24-
public class v115CdpInfo extends CdpInfo {
24+
public class v118CdpInfo extends CdpInfo {
2525

26-
public v115CdpInfo() {
27-
super(115, v115Domains::new);
26+
public v118CdpInfo() {
27+
super(118, v118Domains::new);
2828
}
2929
}

‎java/src/org/openqa/selenium/devtools/v115/v115Domains.java‎ renamed to ‎java/src/org/openqa/selenium/devtools/v118/v118Domains.java‎

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

2020
import org.openqa.selenium.devtools.DevTools;
2121
import org.openqa.selenium.devtools.idealized.Domains;
@@ -26,21 +26,21 @@
2626
import org.openqa.selenium.devtools.idealized.target.Target;
2727
import org.openqa.selenium.internal.Require;
2828

29-
public class v115Domains implements Domains {
29+
public class v118Domains implements Domains {
3030

31-
private final v115Javascript js;
32-
private final v115Events events;
33-
private final v115Log log;
34-
private final v115Network network;
35-
private final v115Target target;
31+
private final v118Javascript js;
32+
private final v118Events events;
33+
private final v118Log log;
34+
private final v118Network network;
35+
private final v118Target target;
3636

37-
public v115Domains(DevTools devtools) {
37+
public v118Domains(DevTools devtools) {
3838
Require.nonNull("DevTools", devtools);
39-
events = new v115Events(devtools);
40-
js = new v115Javascript(devtools);
41-
log = new v115Log();
42-
network = new v115Network(devtools);
43-
target = new v115Target();
39+
events = new v118Events(devtools);
40+
js = new v118Javascript(devtools);
41+
log = new v118Log();
42+
network = new v118Network(devtools);
43+
target = new v118Target();
4444
}
4545

4646
@Override

‎java/src/org/openqa/selenium/devtools/v115/v115Events.java‎ renamed to ‎java/src/org/openqa/selenium/devtools/v118/v118Events.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.v115;
18+
package org.openqa.selenium.devtools.v118;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import java.time.Instant;
@@ -28,15 +28,15 @@
2828
import org.openqa.selenium.devtools.events.ConsoleEvent;
2929
import org.openqa.selenium.devtools.idealized.Events;
3030
import org.openqa.selenium.devtools.idealized.runtime.model.RemoteObject;
31-
import org.openqa.selenium.devtools.v115.runtime.Runtime;
32-
import org.openqa.selenium.devtools.v115.runtime.model.ConsoleAPICalled;
33-
import org.openqa.selenium.devtools.v115.runtime.model.ExceptionDetails;
34-
import org.openqa.selenium.devtools.v115.runtime.model.ExceptionThrown;
35-
import org.openqa.selenium.devtools.v115.runtime.model.StackTrace;
31+
import org.openqa.selenium.devtools.v118.runtime.Runtime;
32+
import org.openqa.selenium.devtools.v118.runtime.model.ConsoleAPICalled;
33+
import org.openqa.selenium.devtools.v118.runtime.model.ExceptionDetails;
34+
import org.openqa.selenium.devtools.v118.runtime.model.ExceptionThrown;
35+
import org.openqa.selenium.devtools.v118.runtime.model.StackTrace;
3636

37-
public class v115Events extends Events<ConsoleAPICalled, ExceptionThrown> {
37+
public class v118Events extends Events<ConsoleAPICalled, ExceptionThrown> {
3838

39-
public v115Events(DevTools devtools) {
39+
public v118Events(DevTools devtools) {
4040
super(devtools);
4141
}
4242

@@ -77,7 +77,7 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) {
7777
protected JavascriptException toJsException(ExceptionThrown event) {
7878
ExceptionDetails details = event.getExceptionDetails();
7979
Optional<StackTrace> maybeTrace = details.getStackTrace();
80-
Optional<org.openqa.selenium.devtools.v115.runtime.model.RemoteObject> maybeException =
80+
Optional<org.openqa.selenium.devtools.v118.runtime.model.RemoteObject> maybeException =
8181
details.getException();
8282

8383
String message =

‎java/src/org/openqa/selenium/devtools/v115/v115Javascript.java‎ renamed to ‎java/src/org/openqa/selenium/devtools/v118/v118Javascript.java‎

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

18-
package org.openqa.selenium.devtools.v115;
18+
package org.openqa.selenium.devtools.v118;
1919

2020
import java.util.Optional;
2121
import org.openqa.selenium.devtools.Command;
2222
import org.openqa.selenium.devtools.DevTools;
2323
import org.openqa.selenium.devtools.Event;
2424
import org.openqa.selenium.devtools.idealized.Javascript;
25-
import org.openqa.selenium.devtools.v115.page.Page;
26-
import org.openqa.selenium.devtools.v115.page.model.ScriptIdentifier;
27-
import org.openqa.selenium.devtools.v115.runtime.Runtime;
28-
import org.openqa.selenium.devtools.v115.runtime.model.BindingCalled;
25+
import org.openqa.selenium.devtools.v118.page.Page;
26+
import org.openqa.selenium.devtools.v118.page.model.ScriptIdentifier;
27+
import org.openqa.selenium.devtools.v118.runtime.Runtime;
28+
import org.openqa.selenium.devtools.v118.runtime.model.BindingCalled;
2929

30-
public class v115Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
30+
public class v118Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
3131

32-
public v115Javascript(DevTools devtools) {
32+
public v118Javascript(DevTools devtools) {
3333
super(devtools);
3434
}
3535

@@ -65,7 +65,8 @@ protected Command<Void> disablePage() {
6565

6666
@Override
6767
protected Command<ScriptIdentifier> addScriptToEvaluateOnNewDocument(String script) {
68-
return Page.addScriptToEvaluateOnNewDocument(script, Optional.empty(), Optional.empty());
68+
return Page.addScriptToEvaluateOnNewDocument(
69+
script, Optional.empty(), Optional.empty(), Optional.empty());
6970
}
7071

7172
@Override

‎java/src/org/openqa/selenium/devtools/v115/v115Log.java‎ renamed to ‎java/src/org/openqa/selenium/devtools/v118/v118Log.java‎

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

18-
package org.openqa.selenium.devtools.v115;
18+
package org.openqa.selenium.devtools.v118;
1919

2020
import java.util.function.Function;
2121
import java.util.logging.Level;
2222
import org.openqa.selenium.devtools.Command;
2323
import org.openqa.selenium.devtools.ConverterFunctions;
2424
import org.openqa.selenium.devtools.Event;
25-
import org.openqa.selenium.devtools.v115.log.Log;
26-
import org.openqa.selenium.devtools.v115.log.model.LogEntry;
27-
import org.openqa.selenium.devtools.v115.runtime.model.Timestamp;
25+
import org.openqa.selenium.devtools.v118.log.Log;
26+
import org.openqa.selenium.devtools.v118.log.model.LogEntry;
27+
import org.openqa.selenium.devtools.v118.runtime.model.Timestamp;
2828
import org.openqa.selenium.json.JsonInput;
2929

30-
public class v115Log implements org.openqa.selenium.devtools.idealized.log.Log {
30+
public class v118Log implements org.openqa.selenium.devtools.idealized.log.Log {
3131

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

‎java/src/org/openqa/selenium/devtools/v115/v115Network.java‎ renamed to ‎java/src/org/openqa/selenium/devtools/v118/v118Network.java‎

Lines changed: 11 additions & 16 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.v115;
18+
package org.openqa.selenium.devtools.v118;
1919

2020
import static java.net.HttpURLConnection.HTTP_OK;
2121

@@ -24,48 +24,43 @@
2424
import java.io.ByteArrayOutputStream;
2525
import java.io.IOException;
2626
import java.io.InputStream;
27-
import java.util.AbstractMap;
28-
import java.util.ArrayList;
29-
import java.util.Base64;
30-
import java.util.List;
31-
import java.util.Map;
32-
import java.util.Optional;
27+
import java.util.*;
3328
import java.util.logging.Logger;
3429
import org.openqa.selenium.UsernameAndPassword;
3530
import org.openqa.selenium.devtools.Command;
3631
import org.openqa.selenium.devtools.DevTools;
3732
import org.openqa.selenium.devtools.DevToolsException;
3833
import org.openqa.selenium.devtools.Event;
3934
import org.openqa.selenium.devtools.idealized.Network;
40-
import org.openqa.selenium.devtools.v115.fetch.Fetch;
41-
import org.openqa.selenium.devtools.v115.fetch.model.*;
42-
import org.openqa.selenium.devtools.v115.network.model.Request;
35+
import org.openqa.selenium.devtools.v118.fetch.Fetch;
36+
import org.openqa.selenium.devtools.v118.fetch.model.*;
37+
import org.openqa.selenium.devtools.v118.network.model.Request;
4338
import org.openqa.selenium.internal.Either;
4439
import org.openqa.selenium.remote.http.HttpRequest;
4540
import org.openqa.selenium.remote.http.HttpResponse;
4641

47-
public class v115Network extends Network<AuthRequired, RequestPaused> {
42+
public class v118Network extends Network<AuthRequired, RequestPaused> {
4843

49-
private static final Logger LOG = Logger.getLogger(v115Network.class.getName());
44+
private static final Logger LOG = Logger.getLogger(v118Network.class.getName());
5045

51-
public v115Network(DevTools devTools) {
46+
public v118Network(DevTools devTools) {
5247
super(devTools);
5348
}
5449

5550
@Override
5651
protected Command<Void> setUserAgentOverride(UserAgent userAgent) {
57-
return org.openqa.selenium.devtools.v115.network.Network.setUserAgentOverride(
52+
return org.openqa.selenium.devtools.v118.network.Network.setUserAgentOverride(
5853
userAgent.userAgent(), userAgent.acceptLanguage(), userAgent.platform(), Optional.empty());
5954
}
6055

6156
@Override
6257
protected Command<Void> enableNetworkCaching() {
63-
return org.openqa.selenium.devtools.v115.network.Network.setCacheDisabled(false);
58+
return org.openqa.selenium.devtools.v118.network.Network.setCacheDisabled(false);
6459
}
6560

6661
@Override
6762
protected Command<Void> disableNetworkCaching() {
68-
return org.openqa.selenium.devtools.v115.network.Network.setCacheDisabled(true);
63+
return org.openqa.selenium.devtools.v118.network.Network.setCacheDisabled(true);
6964
}
7065

7166
@Override

‎java/src/org/openqa/selenium/devtools/v115/v115Target.java‎ renamed to ‎java/src/org/openqa/selenium/devtools/v118/v118Target.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.v115;
18+
package org.openqa.selenium.devtools.v118;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.ImmutableMap;
@@ -28,21 +28,21 @@
2828
import org.openqa.selenium.devtools.idealized.browser.model.BrowserContextID;
2929
import org.openqa.selenium.devtools.idealized.target.model.SessionID;
3030
import org.openqa.selenium.devtools.idealized.target.model.TargetID;
31-
import org.openqa.selenium.devtools.v115.target.Target;
32-
import org.openqa.selenium.devtools.v115.target.model.TargetInfo;
31+
import org.openqa.selenium.devtools.v118.target.Target;
32+
import org.openqa.selenium.devtools.v118.target.model.TargetInfo;
3333
import org.openqa.selenium.json.JsonInput;
3434
import org.openqa.selenium.json.TypeToken;
3535

36-
public class v115Target implements org.openqa.selenium.devtools.idealized.target.Target {
36+
public class v118Target implements org.openqa.selenium.devtools.idealized.target.Target {
3737

3838
@Override
3939
public Command<Void> detachFromTarget(
4040
Optional<SessionID> sessionId, Optional<TargetID> targetId) {
4141
return Target.detachFromTarget(
4242
sessionId.map(
43-
id -> new org.openqa.selenium.devtools.v115.target.model.SessionID(id.toString())),
43+
id -> new org.openqa.selenium.devtools.v118.target.model.SessionID(id.toString())),
4444
targetId.map(
45-
id -> new org.openqa.selenium.devtools.v115.target.model.TargetID(id.toString())));
45+
id -> new org.openqa.selenium.devtools.v118.target.model.TargetID(id.toString())));
4646
}
4747

4848
@Override
@@ -74,19 +74,19 @@ public Command<Void> detachFromTarget(
7474

7575
@Override
7676
public Command<SessionID> attachToTarget(TargetID targetId) {
77-
Function<JsonInput, org.openqa.selenium.devtools.v115.target.model.SessionID> mapper =
77+
Function<JsonInput, org.openqa.selenium.devtools.v118.target.model.SessionID> mapper =
7878
ConverterFunctions.map(
79-
"sessionId", org.openqa.selenium.devtools.v115.target.model.SessionID.class);
79+
"sessionId", org.openqa.selenium.devtools.v118.target.model.SessionID.class);
8080

8181
return new Command<>(
8282
"Target.attachToTarget",
8383
ImmutableMap.of(
8484
"targetId",
85-
new org.openqa.selenium.devtools.v115.target.model.TargetID(targetId.toString()),
85+
new org.openqa.selenium.devtools.v118.target.model.TargetID(targetId.toString()),
8686
"flatten",
8787
true),
8888
input -> {
89-
org.openqa.selenium.devtools.v115.target.model.SessionID id = mapper.apply(input);
89+
org.openqa.selenium.devtools.v118.target.model.SessionID id = mapper.apply(input);
9090
return new SessionID(id.toString());
9191
});
9292
}
@@ -101,9 +101,9 @@ public Event<TargetID> detached() {
101101
return new Event<>(
102102
"Target.detachedFromTarget",
103103
input -> {
104-
Function<JsonInput, org.openqa.selenium.devtools.v115.target.model.TargetID> converter =
104+
Function<JsonInput, org.openqa.selenium.devtools.v118.target.model.TargetID> converter =
105105
ConverterFunctions.map(
106-
"targetId", org.openqa.selenium.devtools.v115.target.model.TargetID.class);
106+
"targetId", org.openqa.selenium.devtools.v118.target.model.TargetID.class);
107107
return new TargetID(converter.apply(input).toString());
108108
});
109109
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CDP_VERSIONS = [
22
"v85", # Required by Firefox
3-
"v115",
43
"v116",
54
"v117",
5+
"v118",
66
]
77

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

0 commit comments

Comments
 (0)