Skip to content

Commit e16d2fd

Browse files
shs96cshs96c
committed
[cdp] Get the java build working again by adding v90 and v91
1 parent 0b2a713 commit e16d2fd

File tree

18 files changed

+136
-136
lines changed

18 files changed

+136
-136
lines changed

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

88
java_export(
99
name = cdp_version,

‎java/client/src/org/openqa/selenium/devtools/v86/V86CdpInfo.java renamed to ‎java/client/src/org/openqa/selenium/devtools/v90/V90CdpInfo.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.v86;
18+
package org.openqa.selenium.devtools.v90;
1919

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

2323
@AutoService(CdpInfo.class)
24-
public class V86CdpInfo extends CdpInfo {
24+
public class V90CdpInfo extends CdpInfo {
2525

26-
public V86CdpInfo() {
27-
super(86, V86Domains::new);
26+
public V90CdpInfo() {
27+
super(90, V90Domains::new);
2828
}
2929
}

‎java/client/src/org/openqa/selenium/devtools/v86/V86Domains.java renamed to ‎java/client/src/org/openqa/selenium/devtools/v90/V90Domains.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.v86;
18+
package org.openqa.selenium.devtools.v90;
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 V86Domains implements Domains {
29+
public class V90Domains implements Domains {
3030

31-
private final V86Javascript js;
32-
private final V86Events events;
33-
private final V86Log log;
34-
private final V86Network network;
35-
private final V86Target target;
31+
private final V90Javascript js;
32+
private final V90Events events;
33+
private final V90Log log;
34+
private final org.openqa.selenium.devtools.v90.V90Network network;
35+
private final V90Target target;
3636

37-
public V86Domains(DevTools devtools) {
37+
public V90Domains(DevTools devtools) {
3838
Require.nonNull("DevTools", devtools);
39-
events = new V86Events(devtools);
40-
js = new V86Javascript(devtools);
41-
log = new V86Log();
42-
network = new V86Network(devtools);
43-
target = new V86Target();
39+
events = new V90Events(devtools);
40+
js = new V90Javascript(devtools);
41+
log = new V90Log();
42+
network = new org.openqa.selenium.devtools.v90.V90Network(devtools);
43+
target = new V90Target();
4444
}
4545

4646
@Override

‎java/client/src/org/openqa/selenium/devtools/v87/V87Events.java renamed to ‎java/client/src/org/openqa/selenium/devtools/v90/V90Events.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.v87;
18+
package org.openqa.selenium.devtools.v90;
1919

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

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

39-
public class V87Events extends Events<ConsoleAPICalled, ExceptionThrown> {
39+
public class V90Events extends Events<ConsoleAPICalled, ExceptionThrown> {
4040

41-
public V87Events(DevTools devtools) {
41+
public V90Events(DevTools devtools) {
4242
super(devtools);
4343
}
4444

@@ -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.v87.runtime.model.RemoteObject>
85+
Optional<org.openqa.selenium.devtools.v90.runtime.model.RemoteObject>
8686
maybeException = details.getException();
8787

8888
String message = maybeException

‎java/client/src/org/openqa/selenium/devtools/v87/V87Javascript.java renamed to ‎java/client/src/org/openqa/selenium/devtools/v90/V90Javascript.java

Lines changed: 8 additions & 8 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.v87;
18+
package org.openqa.selenium.devtools.v90;
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.v87.page.Page;
25-
import org.openqa.selenium.devtools.v87.page.model.ScriptIdentifier;
26-
import org.openqa.selenium.devtools.v87.runtime.Runtime;
27-
import org.openqa.selenium.devtools.v87.runtime.model.BindingCalled;
24+
import org.openqa.selenium.devtools.v90.page.Page;
25+
import org.openqa.selenium.devtools.v90.page.model.ScriptIdentifier;
26+
import org.openqa.selenium.devtools.v90.runtime.Runtime;
27+
import org.openqa.selenium.devtools.v90.runtime.model.BindingCalled;
2828

2929
import java.util.Optional;
3030

31-
public class V87Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
31+
public class V90Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
3232

33-
public V87Javascript(DevTools devtools) {
33+
public V90Javascript(DevTools devtools) {
3434
super(devtools);
3535
}
3636

@@ -46,7 +46,7 @@ protected Command<Void> disableRuntime() {
4646

4747
@Override
4848
protected Command<Void> doAddJsBinding(String scriptName) {
49-
return Runtime.addBinding(scriptName, Optional.empty());
49+
return Runtime.addBinding(scriptName, Optional.empty(), Optional.empty());
5050
}
5151

5252
@Override

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

‎java/client/src/org/openqa/selenium/devtools/v87/V87Network.java renamed to ‎java/client/src/org/openqa/selenium/devtools/v90/V90Network.java

Lines changed: 13 additions & 13 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.v87;
18+
package org.openqa.selenium.devtools.v90;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import org.openqa.selenium.UsernameAndPassword;
2222
import org.openqa.selenium.devtools.Command;
2323
import org.openqa.selenium.devtools.DevTools;
2424
import org.openqa.selenium.devtools.Event;
2525
import org.openqa.selenium.devtools.idealized.Network;
26-
import org.openqa.selenium.devtools.v87.fetch.Fetch;
27-
import org.openqa.selenium.devtools.v87.fetch.model.AuthChallengeResponse;
28-
import org.openqa.selenium.devtools.v87.fetch.model.AuthRequired;
29-
import org.openqa.selenium.devtools.v87.fetch.model.HeaderEntry;
30-
import org.openqa.selenium.devtools.v87.fetch.model.RequestPattern;
31-
import org.openqa.selenium.devtools.v87.fetch.model.RequestPaused;
32-
import org.openqa.selenium.devtools.v87.network.model.Request;
26+
import org.openqa.selenium.devtools.v90.fetch.Fetch;
27+
import org.openqa.selenium.devtools.v90.fetch.model.AuthChallengeResponse;
28+
import org.openqa.selenium.devtools.v90.fetch.model.AuthRequired;
29+
import org.openqa.selenium.devtools.v90.fetch.model.HeaderEntry;
30+
import org.openqa.selenium.devtools.v90.fetch.model.RequestPattern;
31+
import org.openqa.selenium.devtools.v90.fetch.model.RequestPaused;
32+
import org.openqa.selenium.devtools.v90.network.model.Request;
3333
import org.openqa.selenium.remote.http.Contents;
3434
import org.openqa.selenium.remote.http.HttpRequest;
3535
import org.openqa.selenium.remote.http.HttpResponse;
@@ -39,26 +39,26 @@
3939
import java.util.List;
4040
import java.util.Optional;
4141

42-
public class V87Network extends Network<AuthRequired, RequestPaused> {
42+
public class V90Network extends Network<AuthRequired, RequestPaused> {
4343

44-
public V87Network(DevTools devTools) {
44+
public V90Network(DevTools devTools) {
4545
super(devTools);
4646
}
4747

4848
@Override
4949
protected Command<Void> setUserAgentOverride(UserAgent userAgent) {
50-
return org.openqa.selenium.devtools.v87.network.Network.setUserAgentOverride(
50+
return org.openqa.selenium.devtools.v90.network.Network.setUserAgentOverride(
5151
userAgent.userAgent(), userAgent.acceptLanguage(), userAgent.platform(), Optional.empty());
5252
}
5353

5454
@Override
5555
protected Command<Void> enableNetworkCaching() {
56-
return org.openqa.selenium.devtools.v87.network.Network.setCacheDisabled(false);
56+
return org.openqa.selenium.devtools.v90.network.Network.setCacheDisabled(false);
5757
}
5858

5959
@Override
6060
protected Command<Void> disableNetworkCaching() {
61-
return org.openqa.selenium.devtools.v87.network.Network.setCacheDisabled(true);
61+
return org.openqa.selenium.devtools.v90.network.Network.setCacheDisabled(true);
6262
}
6363

6464
@Override

‎java/client/src/org/openqa/selenium/devtools/v86/V86Target.java renamed to ‎java/client/src/org/openqa/selenium/devtools/v90/V90Target.java

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

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.ImmutableMap;
@@ -24,21 +24,21 @@
2424
import org.openqa.selenium.devtools.idealized.browser.model.BrowserContextID;
2525
import org.openqa.selenium.devtools.idealized.target.model.SessionID;
2626
import org.openqa.selenium.devtools.idealized.target.model.TargetID;
27-
import org.openqa.selenium.devtools.v86.target.Target;
28-
import org.openqa.selenium.devtools.v86.target.model.TargetInfo;
27+
import org.openqa.selenium.devtools.v90.target.Target;
28+
import org.openqa.selenium.devtools.v90.target.model.TargetInfo;
2929
import org.openqa.selenium.json.JsonInput;
3030
import org.openqa.selenium.json.TypeToken;
3131

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

36-
public class V86Target implements org.openqa.selenium.devtools.idealized.target.Target {
36+
public class V90Target implements org.openqa.selenium.devtools.idealized.target.Target {
3737
@Override
3838
public Command<Void> detachFromTarget(Optional<SessionID> sessionId, Optional<TargetID> targetId) {
3939
return Target.detachFromTarget(
40-
sessionId.map(id -> new org.openqa.selenium.devtools.v86.target.model.SessionID(id.toString())),
41-
targetId.map(id -> new org.openqa.selenium.devtools.v86.target.model.TargetID(id.toString())));
40+
sessionId.map(id -> new org.openqa.selenium.devtools.v90.target.model.SessionID(id.toString())),
41+
targetId.map(id -> new org.openqa.selenium.devtools.v90.target.model.TargetID(id.toString())));
4242
}
4343

4444
@Override
@@ -68,16 +68,16 @@ public Command<List<org.openqa.selenium.devtools.idealized.target.model.TargetIn
6868

6969
@Override
7070
public Command<SessionID> attachToTarget(TargetID targetId) {
71-
Function<JsonInput, org.openqa.selenium.devtools.v86.target.model.SessionID> mapper =
72-
ConverterFunctions.map("sessionId", org.openqa.selenium.devtools.v86.target.model.SessionID.class);
71+
Function<JsonInput, org.openqa.selenium.devtools.v90.target.model.SessionID> mapper =
72+
ConverterFunctions.map("sessionId", org.openqa.selenium.devtools.v90.target.model.SessionID.class);
7373

7474
return new Command<>(
7575
"Target.attachToTarget",
7676
ImmutableMap.of(
77-
"targetId", new org.openqa.selenium.devtools.v86.target.model.TargetID(targetId.toString()),
77+
"targetId", new org.openqa.selenium.devtools.v90.target.model.TargetID(targetId.toString()),
7878
"flatten", true),
7979
input -> {
80-
org.openqa.selenium.devtools.v86.target.model.SessionID id = mapper.apply(input);
80+
org.openqa.selenium.devtools.v90.target.model.SessionID id = mapper.apply(input);
8181
return new SessionID(id.toString());
8282
});
8383
}

‎java/client/src/org/openqa/selenium/devtools/v86/BUILD.bazel renamed to ‎java/client/src/org/openqa/selenium/devtools/v91/BUILD.bazel

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ 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 = "v91"
7+
68
java_export(
7-
name = "v86",
9+
name = cdp_version,
810
srcs = glob(["*.java"]),
9-
maven_coordinates = "org.seleniumhq.selenium:selenium-devtools-v86:%s" % SE_VERSION,
11+
maven_coordinates = "org.seleniumhq.selenium:selenium-devtools-%s:%s" % (cdp_version, SE_VERSION),
1012
opens_to = [
1113
"org.openqa.selenium.json",
1214
],
@@ -51,20 +53,20 @@ genrule(
5153
":js_protocol",
5254
],
5355
outs = ["cdp.srcjar"],
54-
cmd = "$(location //java/client/src/org/openqa/selenium/devtools:cdp-client-generator) $(location :browser_protocol) $(location :js_protocol) v86 $@",
56+
cmd = "$(location //java/client/src/org/openqa/selenium/devtools:cdp-client-generator) $(location :browser_protocol) $(location :js_protocol) %s $@" % cdp_version,
5557
tools = [
5658
"//java/client/src/org/openqa/selenium/devtools:cdp-client-generator",
5759
],
5860
)
5961

6062
copy_file(
6163
name = "browser_protocol",
62-
src = "//common/devtools/chromium/v86:browser_protocol",
64+
src = "//common/devtools/chromium/%s:browser_protocol" % cdp_version,
6365
out = "browser_protocol.json",
6466
)
6567

6668
copy_file(
6769
name = "js_protocol",
68-
src = "//common/devtools/chromium/v86:js_protocol",
70+
src = "//common/devtools/chromium/%s:js_protocol" % cdp_version,
6971
out = "js_protocol.json",
7072
)

‎java/client/src/org/openqa/selenium/devtools/v87/V87CdpInfo.java renamed to ‎java/client/src/org/openqa/selenium/devtools/v91/V91CdpInfo.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.v87;
18+
package org.openqa.selenium.devtools.v91;
1919

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

2323
@AutoService(CdpInfo.class)
24-
public class V87CdpInfo extends CdpInfo {
24+
public class V91CdpInfo extends CdpInfo {
2525

26-
public V87CdpInfo() {
27-
super(87, V87Domains::new);
26+
public V91CdpInfo() {
27+
super(91, V91Domains::new);
2828
}
2929
}

0 commit comments

Comments
 (0)