Skip to content

Commit 2a05eb1

Browse files
titusfortnertitusfortner
committed
[java] add cdp v106 remove v103
1 parent 697c717 commit 2a05eb1

File tree

10 files changed

+78
-75
lines changed

10 files changed

+78
-75
lines changed

‎Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ JAVA_RELEASE_TARGETS = %w[
9999
//java/src/org/openqa/selenium/chrome:chrome.publish
100100
//java/src/org/openqa/selenium/chromium:chromium.publish
101101
//java/src/org/openqa/selenium/devtools/v85:v85.publish
102-
//java/src/org/openqa/selenium/devtools/v103:v103.publish
103102
//java/src/org/openqa/selenium/devtools/v104:v104.publish
104103
//java/src/org/openqa/selenium/devtools/v105:v105.publish
104+
//java/src/org/openqa/selenium/devtools/v106:v106.publish
105105
//java/src/org/openqa/selenium/edge:edge.publish
106106
//java/src/org/openqa/selenium/firefox:firefox.publish
107107
//java/src/org/openqa/selenium/grid/sessionmap/jdbc:jdbc.publish

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

88
java_export(
99
name = cdp_version,

‎java/src/org/openqa/selenium/devtools/v103/V103CdpInfo.java renamed to ‎java/src/org/openqa/selenium/devtools/v106/V106CdpInfo.java

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

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

2020
import com.google.auto.service.AutoService;
21-
2221
import org.openqa.selenium.devtools.CdpInfo;
22+
import org.openqa.selenium.devtools.v106.V106Domains;
2323

2424
@AutoService(CdpInfo.class)
25-
public class V103CdpInfo extends CdpInfo {
25+
public class V106CdpInfo extends CdpInfo {
2626

27-
public V103CdpInfo() {
28-
super(103, V103Domains::new);
27+
public V106CdpInfo() {
28+
super(106, V106Domains::new);
2929
}
3030
}

‎java/src/org/openqa/selenium/devtools/v103/V103Domains.java renamed to ‎java/src/org/openqa/selenium/devtools/v106/V106Domains.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.v103;
18+
package org.openqa.selenium.devtools.v106;
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.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;
2732
import org.openqa.selenium.internal.Require;
2833

29-
public class V103Domains implements Domains {
34+
public class V106Domains implements Domains {
3035

31-
private final V103Javascript js;
32-
private final V103Events events;
33-
private final V103Log log;
34-
private final V103Network network;
35-
private final V103Target target;
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;
3641

37-
public V103Domains(DevTools devtools) {
42+
public V106Domains(DevTools devtools) {
3843
Require.nonNull("DevTools", devtools);
39-
events = new V103Events(devtools);
40-
js = new V103Javascript(devtools);
41-
log = new V103Log();
42-
network = new V103Network(devtools);
43-
target = new V103Target();
44+
events = new V106Events(devtools);
45+
js = new V106Javascript(devtools);
46+
log = new V106Log();
47+
network = new V106Network(devtools);
48+
target = new V106Target();
4449
}
4550

4651
@Override

‎java/src/org/openqa/selenium/devtools/v103/V103Events.java renamed to ‎java/src/org/openqa/selenium/devtools/v106/V106Events.java

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

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

2020
import com.google.common.collect.ImmutableList;
21-
2221
import org.openqa.selenium.JavascriptException;
2322
import org.openqa.selenium.devtools.Command;
2423
import org.openqa.selenium.devtools.DevTools;
2524
import org.openqa.selenium.devtools.Event;
2625
import org.openqa.selenium.devtools.events.ConsoleEvent;
2726
import org.openqa.selenium.devtools.idealized.Events;
2827
import org.openqa.selenium.devtools.idealized.runtime.model.RemoteObject;
29-
import org.openqa.selenium.devtools.v103.runtime.Runtime;
30-
import org.openqa.selenium.devtools.v103.runtime.model.ConsoleAPICalled;
31-
import org.openqa.selenium.devtools.v103.runtime.model.ExceptionDetails;
32-
import org.openqa.selenium.devtools.v103.runtime.model.ExceptionThrown;
33-
import org.openqa.selenium.devtools.v103.runtime.model.StackTrace;
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;
3433

3534
import java.time.Instant;
3635
import java.util.List;
3736
import java.util.Optional;
3837

39-
public class V103Events extends Events<ConsoleAPICalled, ExceptionThrown> {
38+
public class V106Events extends Events<ConsoleAPICalled, ExceptionThrown> {
4039

41-
public V103Events(DevTools devtools) {
40+
public V106Events(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.v103.runtime.model.RemoteObject>
84+
Optional<org.openqa.selenium.devtools.v106.runtime.model.RemoteObject>
8685
maybeException = details.getException();
8786

8887
String message = maybeException

‎java/src/org/openqa/selenium/devtools/v103/V103Javascript.java renamed to ‎java/src/org/openqa/selenium/devtools/v106/V106Javascript.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.v103;
18+
package org.openqa.selenium.devtools.v106;
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.v103.page.Page;
25-
import org.openqa.selenium.devtools.v103.page.model.ScriptIdentifier;
26-
import org.openqa.selenium.devtools.v103.runtime.Runtime;
27-
import org.openqa.selenium.devtools.v103.runtime.model.BindingCalled;
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;
2828

2929
import java.util.Optional;
3030

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

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

‎java/src/org/openqa/selenium/devtools/v103/V103Log.java renamed to ‎java/src/org/openqa/selenium/devtools/v106/V106Log.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.v103;
18+
package org.openqa.selenium.devtools.v106;
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.v103.log.Log;
24-
import org.openqa.selenium.devtools.v103.log.model.LogEntry;
25-
import org.openqa.selenium.devtools.v103.runtime.model.Timestamp;
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;
2626
import org.openqa.selenium.json.JsonInput;
2727

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

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

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

‎java/src/org/openqa/selenium/devtools/v103/V103Network.java renamed to ‎java/src/org/openqa/selenium/devtools/v106/V106Network.java

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

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

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.io.ByteStreams;
22-
2322
import org.openqa.selenium.UsernameAndPassword;
2423
import org.openqa.selenium.devtools.Command;
2524
import org.openqa.selenium.devtools.DevTools;
2625
import org.openqa.selenium.devtools.DevToolsException;
2726
import org.openqa.selenium.devtools.Event;
2827
import org.openqa.selenium.devtools.idealized.Network;
29-
import org.openqa.selenium.devtools.v103.fetch.Fetch;
30-
import org.openqa.selenium.devtools.v103.fetch.model.AuthChallengeResponse;
31-
import org.openqa.selenium.devtools.v103.fetch.model.AuthRequired;
32-
import org.openqa.selenium.devtools.v103.fetch.model.HeaderEntry;
33-
import org.openqa.selenium.devtools.v103.fetch.model.RequestPattern;
34-
import org.openqa.selenium.devtools.v103.fetch.model.RequestPaused;
35-
import org.openqa.selenium.devtools.v103.fetch.model.RequestStage;
36-
import org.openqa.selenium.devtools.v103.network.model.Request;
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;
3736
import org.openqa.selenium.internal.Either;
3837
import org.openqa.selenium.remote.http.HttpRequest;
3938
import org.openqa.selenium.remote.http.HttpResponse;
@@ -51,28 +50,28 @@
5150

5251
import static java.net.HttpURLConnection.HTTP_OK;
5352

54-
public class V103Network extends Network<AuthRequired, RequestPaused> {
53+
public class V106Network extends Network<AuthRequired, RequestPaused> {
5554

56-
private static final Logger LOG = Logger.getLogger(V103Network.class.getName());
55+
private static final Logger LOG = Logger.getLogger(V106Network.class.getName());
5756

58-
public V103Network(DevTools devTools) {
57+
public V106Network(DevTools devTools) {
5958
super(devTools);
6059
}
6160

6261
@Override
6362
protected Command<Void> setUserAgentOverride(UserAgent userAgent) {
64-
return org.openqa.selenium.devtools.v103.network.Network.setUserAgentOverride(
63+
return org.openqa.selenium.devtools.v106.network.Network.setUserAgentOverride(
6564
userAgent.userAgent(), userAgent.acceptLanguage(), userAgent.platform(), Optional.empty());
6665
}
6766

6867
@Override
6968
protected Command<Void> enableNetworkCaching() {
70-
return org.openqa.selenium.devtools.v103.network.Network.setCacheDisabled(false);
69+
return org.openqa.selenium.devtools.v106.network.Network.setCacheDisabled(false);
7170
}
7271

7372
@Override
7473
protected Command<Void> disableNetworkCaching() {
75-
return org.openqa.selenium.devtools.v103.network.Network.setCacheDisabled(true);
74+
return org.openqa.selenium.devtools.v106.network.Network.setCacheDisabled(true);
7675
}
7776

7877
@Override

‎java/src/org/openqa/selenium/devtools/v103/V103Target.java renamed to ‎java/src/org/openqa/selenium/devtools/v106/V106Target.java

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

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

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.ImmutableMap;
22-
2322
import org.openqa.selenium.devtools.Command;
2423
import org.openqa.selenium.devtools.ConverterFunctions;
2524
import org.openqa.selenium.devtools.Event;
2625
import org.openqa.selenium.devtools.idealized.browser.model.BrowserContextID;
2726
import org.openqa.selenium.devtools.idealized.target.model.SessionID;
2827
import org.openqa.selenium.devtools.idealized.target.model.TargetID;
29-
import org.openqa.selenium.devtools.v103.target.Target;
30-
import org.openqa.selenium.devtools.v103.target.model.TargetInfo;
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;
3131
import org.openqa.selenium.json.JsonInput;
3232
import org.openqa.selenium.json.TypeToken;
3333

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

38-
public class V103Target implements org.openqa.selenium.devtools.idealized.target.Target {
38+
public class V106Target implements org.openqa.selenium.devtools.idealized.target.Target {
3939

4040
@Override
4141
public Command<Void> detachFromTarget(Optional<SessionID> sessionId,
4242
Optional<TargetID> targetId) {
4343
return Target.detachFromTarget(
4444
sessionId.map(
45-
id -> new org.openqa.selenium.devtools.v103.target.model.SessionID(id.toString())),
45+
id -> new org.openqa.selenium.devtools.v106.target.model.SessionID(id.toString())),
4646
targetId.map(
47-
id -> new org.openqa.selenium.devtools.v103.target.model.TargetID(id.toString())));
47+
id -> new org.openqa.selenium.devtools.v106.target.model.TargetID(id.toString())));
4848
}
4949

5050
@Override
@@ -55,7 +55,7 @@ public Command<List<org.openqa.selenium.devtools.idealized.target.model.TargetIn
5555
}.getType());
5656

5757
return new Command<>(
58-
Target.getTargets().getMethod(),
58+
Target.getTargets(Optional.empty()).getMethod(),
5959
ImmutableMap.of(),
6060
input -> {
6161
List<TargetInfo> infos = mapper.apply(input);
@@ -75,35 +75,35 @@ public Command<List<org.openqa.selenium.devtools.idealized.target.model.TargetIn
7575

7676
@Override
7777
public Command<SessionID> attachToTarget(TargetID targetId) {
78-
Function<JsonInput, org.openqa.selenium.devtools.v103.target.model.SessionID> mapper =
78+
Function<JsonInput, org.openqa.selenium.devtools.v106.target.model.SessionID> mapper =
7979
ConverterFunctions.map("sessionId",
80-
org.openqa.selenium.devtools.v103.target.model.SessionID.class);
80+
org.openqa.selenium.devtools.v106.target.model.SessionID.class);
8181

8282
return new Command<>(
8383
"Target.attachToTarget",
8484
ImmutableMap.of(
8585
"targetId",
86-
new org.openqa.selenium.devtools.v103.target.model.TargetID(targetId.toString()),
86+
new org.openqa.selenium.devtools.v106.target.model.TargetID(targetId.toString()),
8787
"flatten", true),
8888
input -> {
89-
org.openqa.selenium.devtools.v103.target.model.SessionID id = mapper.apply(input);
89+
org.openqa.selenium.devtools.v106.target.model.SessionID id = mapper.apply(input);
9090
return new SessionID(id.toString());
9191
});
9292
}
9393

9494
@Override
9595
public Command<Void> setAutoAttach() {
96-
return Target.setAutoAttach(true, false, Optional.of(true));
96+
return Target.setAutoAttach(true, false, Optional.of(true), Optional.empty());
9797
}
9898

9999
@Override
100100
public Event<TargetID> detached() {
101101
return new Event<>(
102102
"Target.detachedFromTarget",
103103
input -> {
104-
Function<JsonInput, org.openqa.selenium.devtools.v103.target.model.TargetID> converter =
104+
Function<JsonInput, org.openqa.selenium.devtools.v106.target.model.TargetID> converter =
105105
ConverterFunctions.map("targetId",
106-
org.openqa.selenium.devtools.v103.target.model.TargetID.class);
106+
org.openqa.selenium.devtools.v106.target.model.TargetID.class);
107107
return new TargetID(converter.apply(input).toString());
108108
}
109109
);

‎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-
"v103",
43
"v104",
5-
"v105"
4+
"v105",
5+
"v106"
66
]
77

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

0 commit comments

Comments
 (0)