Skip to content

Commit 0de81ee

Browse files
titusfortnertitusfortner
committed
[java] add cdp v105 remove v102
1 parent 0f4edb7 commit 0de81ee

11 files changed

Lines changed: 69 additions & 69 deletions

File tree

‎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/v102:v102.publish
103102
//java/src/org/openqa/selenium/devtools/v103:v103.publish
104103
//java/src/org/openqa/selenium/devtools/v104:v104.publish
104+
//java/src/org/openqa/selenium/devtools/v105:v105.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/v102/BUILD.bazel renamed to java/src/org/openqa/selenium/devtools/v105/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 = "v102"
6+
cdp_version = "v105"
77

88
java_export(
99
name = cdp_version,

java/src/org/openqa/selenium/devtools/v102/V102CdpInfo.java renamed to java/src/org/openqa/selenium/devtools/v105/V105CdpInfo.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.v102;
18+
package org.openqa.selenium.devtools.v105;
1919

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

2323
@AutoService(CdpInfo.class)
24-
public class V102CdpInfo extends CdpInfo {
24+
public class V105CdpInfo extends CdpInfo {
2525

26-
public V102CdpInfo() {
27-
super(102, V102Domains::new);
26+
public V105CdpInfo() {
27+
super(105, V105Domains::new);
2828
}
2929
}

java/src/org/openqa/selenium/devtools/v102/V102Domains.java renamed to java/src/org/openqa/selenium/devtools/v105/V105Domains.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.v102;
18+
package org.openqa.selenium.devtools.v105;
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 V102Domains implements Domains {
29+
public class V105Domains implements Domains {
3030

31-
private final V102Javascript js;
32-
private final V102Events events;
33-
private final V102Log log;
34-
private final V102Network network;
35-
private final V102Target target;
31+
private final V105Javascript js;
32+
private final V105Events events;
33+
private final V105Log log;
34+
private final V105Network network;
35+
private final V105Target target;
3636

37-
public V102Domains(DevTools devtools) {
37+
public V105Domains(DevTools devtools) {
3838
Require.nonNull("DevTools", devtools);
39-
events = new V102Events(devtools);
40-
js = new V102Javascript(devtools);
41-
log = new V102Log();
42-
network = new V102Network(devtools);
43-
target = new V102Target();
39+
events = new V105Events(devtools);
40+
js = new V105Javascript(devtools);
41+
log = new V105Log();
42+
network = new V105Network(devtools);
43+
target = new V105Target();
4444
}
4545

4646
@Override

java/src/org/openqa/selenium/devtools/v102/V102Events.java renamed to java/src/org/openqa/selenium/devtools/v105/V105Events.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.v102;
18+
package org.openqa.selenium.devtools.v105;
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.v102.runtime.Runtime;
29-
import org.openqa.selenium.devtools.v102.runtime.model.ConsoleAPICalled;
30-
import org.openqa.selenium.devtools.v102.runtime.model.ExceptionDetails;
31-
import org.openqa.selenium.devtools.v102.runtime.model.ExceptionThrown;
32-
import org.openqa.selenium.devtools.v102.runtime.model.StackTrace;
28+
import org.openqa.selenium.devtools.v105.runtime.Runtime;
29+
import org.openqa.selenium.devtools.v105.runtime.model.ConsoleAPICalled;
30+
import org.openqa.selenium.devtools.v105.runtime.model.ExceptionDetails;
31+
import org.openqa.selenium.devtools.v105.runtime.model.ExceptionThrown;
32+
import org.openqa.selenium.devtools.v105.runtime.model.StackTrace;
3333

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

38-
public class V102Events extends Events<ConsoleAPICalled, ExceptionThrown> {
38+
public class V105Events extends Events<ConsoleAPICalled, ExceptionThrown> {
3939

40-
public V102Events(DevTools devtools) {
40+
public V105Events(DevTools devtools) {
4141
super(devtools);
4242
}
4343

@@ -81,7 +81,7 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) {
8181
protected JavascriptException toJsException(ExceptionThrown event) {
8282
ExceptionDetails details = event.getExceptionDetails();
8383
Optional<StackTrace> maybeTrace = details.getStackTrace();
84-
Optional<org.openqa.selenium.devtools.v102.runtime.model.RemoteObject>
84+
Optional<org.openqa.selenium.devtools.v105.runtime.model.RemoteObject>
8585
maybeException = details.getException();
8686

8787
String message = maybeException

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

2929
import java.util.Optional;
3030

31-
public class V102Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
31+
public class V105Javascript extends Javascript<ScriptIdentifier, BindingCalled> {
3232

33-
public V102Javascript(DevTools devtools) {
33+
public V105Javascript(DevTools devtools) {
3434
super(devtools);
3535
}
3636

java/src/org/openqa/selenium/devtools/v102/V102Log.java renamed to java/src/org/openqa/selenium/devtools/v105/V105Log.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.v102;
18+
package org.openqa.selenium.devtools.v105;
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.v102.log.Log;
24-
import org.openqa.selenium.devtools.v102.log.model.LogEntry;
25-
import org.openqa.selenium.devtools.v102.runtime.model.Timestamp;
23+
import org.openqa.selenium.devtools.v105.log.Log;
24+
import org.openqa.selenium.devtools.v105.log.model.LogEntry;
25+
import org.openqa.selenium.devtools.v105.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 V102Log implements org.openqa.selenium.devtools.idealized.log.Log {
31+
public class V105Log implements org.openqa.selenium.devtools.idealized.log.Log {
3232

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

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

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

57-
public V102Network(DevTools devTools) {
57+
public V105Network(DevTools devTools) {
5858
super(devTools);
5959
}
6060

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

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

7777
@Override

java/src/org/openqa/selenium/devtools/v102/V102Target.java renamed to java/src/org/openqa/selenium/devtools/v105/V105Target.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.v102;
18+
package org.openqa.selenium.devtools.v105;
1919

2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.ImmutableMap;
@@ -25,25 +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.v102.target.Target;
29-
import org.openqa.selenium.devtools.v102.target.model.TargetInfo;
28+
import org.openqa.selenium.devtools.v105.target.Target;
29+
import org.openqa.selenium.devtools.v105.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 V102Target implements org.openqa.selenium.devtools.idealized.target.Target {
37+
public class V105Target implements org.openqa.selenium.devtools.idealized.target.Target {
3838

3939
@Override
4040
public Command<Void> detachFromTarget(Optional<SessionID> sessionId,
4141
Optional<TargetID> targetId) {
4242
return Target.detachFromTarget(
4343
sessionId.map(
44-
id -> new org.openqa.selenium.devtools.v102.target.model.SessionID(id.toString())),
44+
id -> new org.openqa.selenium.devtools.v105.target.model.SessionID(id.toString())),
4545
targetId.map(
46-
id -> new org.openqa.selenium.devtools.v102.target.model.TargetID(id.toString())));
46+
id -> new org.openqa.selenium.devtools.v105.target.model.TargetID(id.toString())));
4747
}
4848

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

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

8181
return new Command<>(
8282
"Target.attachToTarget",
8383
ImmutableMap.of(
8484
"targetId",
85-
new org.openqa.selenium.devtools.v102.target.model.TargetID(targetId.toString()),
85+
new org.openqa.selenium.devtools.v105.target.model.TargetID(targetId.toString()),
8686
"flatten", true),
8787
input -> {
88-
org.openqa.selenium.devtools.v102.target.model.SessionID id = mapper.apply(input);
88+
org.openqa.selenium.devtools.v105.target.model.SessionID id = mapper.apply(input);
8989
return new SessionID(id.toString());
9090
});
9191
}
@@ -100,9 +100,9 @@ public Event<TargetID> detached() {
100100
return new Event<>(
101101
"Target.detachedFromTarget",
102102
input -> {
103-
Function<JsonInput, org.openqa.selenium.devtools.v102.target.model.TargetID> converter =
103+
Function<JsonInput, org.openqa.selenium.devtools.v105.target.model.TargetID> converter =
104104
ConverterFunctions.map("targetId",
105-
org.openqa.selenium.devtools.v102.target.model.TargetID.class);
105+
org.openqa.selenium.devtools.v105.target.model.TargetID.class);
106106
return new TargetID(converter.apply(input).toString());
107107
}
108108
);

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

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

0 commit comments

Comments
 (0)