Skip to content

Commit 33ce271

Browse files
barancevbarancev
committed
[java] Renaming classes to match CDP specification
1 parent 4caa6d9 commit 33ce271

File tree

9 files changed

+56
-56
lines changed

9 files changed

+56
-56
lines changed

‎java/client/src/org/openqa/selenium/devtools/DevTools.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static java.util.concurrent.TimeUnit.MILLISECONDS;
2121

2222
import org.openqa.selenium.devtools.target.Target;
23-
import org.openqa.selenium.devtools.target.model.TargetId;
23+
import org.openqa.selenium.devtools.target.model.TargetID;
2424
import org.openqa.selenium.devtools.target.model.TargetInfo;
2525
import org.openqa.selenium.remote.SessionId;
2626

@@ -74,7 +74,7 @@ public void createSession() {
7474

7575
// Grab the first "page" type, and glom on to that.
7676
// TODO: Find out which one might be the current one
77-
TargetId targetId = infos.stream()
77+
TargetID targetId = infos.stream()
7878
.filter(info -> "page".equals(info.getType()))
7979
.map(TargetInfo::getTargetId)
8080
.findAny()

‎java/client/src/org/openqa/selenium/devtools/target/Target.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.openqa.selenium.devtools.target.model.ReceivedMessageFromTarget;
2929
import org.openqa.selenium.devtools.target.model.RemoteLocation;
3030
import org.openqa.selenium.devtools.target.model.TargetCrashed;
31-
import org.openqa.selenium.devtools.target.model.TargetId;
31+
import org.openqa.selenium.devtools.target.model.TargetID;
3232
import org.openqa.selenium.devtools.target.model.TargetInfo;
3333
import org.openqa.selenium.remote.SessionId;
3434

@@ -44,7 +44,7 @@ public class Target {
4444
/**
4545
* Activates (focuses) the target.
4646
*/
47-
public static Command<Void> activateTarget(TargetId targetId) {
47+
public static Command<Void> activateTarget(TargetID targetId) {
4848
Objects.requireNonNull(targetId, "Target ID must be set.");
4949
return new Command<>("Target.activateTarget", ImmutableMap.of("targetId", targetId));
5050
}
@@ -65,7 +65,7 @@ public static Command<SessionId> attachToBrowserTarget() {
6565
/**
6666
* Closes the target. If the target is a page that gets closed too.
6767
*/
68-
public static Command<Boolean> closeTarget(TargetId targetId) {
68+
public static Command<Boolean> closeTarget(TargetID targetId) {
6969
Objects.requireNonNull(targetId, "Target ID must be set.");
7070
return new Command<>(
7171
"Target.closeTarget",
@@ -82,7 +82,7 @@ public static Command<Boolean> closeTarget(TargetId targetId) {
8282
*/
8383
@Beta
8484
public static Command<Void> exposeDevToolsProtocol(
85-
TargetId targetId, Optional<String> bindingName) {
85+
TargetID targetId, Optional<String> bindingName) {
8686
Objects.requireNonNull(targetId, "Target ID must be set.");
8787
String bindingNameValue = (bindingName.isPresent()) ? bindingName.get() : "cdp";
8888
return new Command<>(
@@ -118,7 +118,7 @@ public static Command<List<BrowserContextID>> getBrowserContexts() {
118118
/**
119119
* Creates a new page.
120120
*/
121-
public static Command<TargetId> createTarget(
121+
public static Command<TargetID> createTarget(
122122
String url,
123123
Optional<Integer> width,
124124
Optional<Integer> height,
@@ -137,14 +137,14 @@ public static Command<TargetId> createTarget(
137137
newWindow.ifPresent(aBoolean -> params.put("newWindow", aBoolean));
138138
background.ifPresent(aBoolean -> params.put("background", aBoolean));
139139
return new Command<>(
140-
"Target.createTarget", params.build(), ConverterFunctions.map("targetId", TargetId.class));
140+
"Target.createTarget", params.build(), ConverterFunctions.map("targetId", TargetID.class));
141141
}
142142

143143
/**
144144
* Detaches session with given id.
145145
*/
146146
public static Command<Void> detachFromTarget(
147-
Optional<SessionId> sessionId, Optional<TargetId> targetId) {
147+
Optional<SessionId> sessionId, Optional<TargetID> targetId) {
148148
final ImmutableMap.Builder<String, Object> params = ImmutableMap.builder();
149149
sessionId.ifPresent(sessionID -> params.put("sessionId", sessionID));
150150
targetId.ifPresent(targetID -> params.put("targetId", targetID));
@@ -166,7 +166,7 @@ public static Command<Void> disposeBrowserContext(BrowserContextID browserContex
166166
* Returns information about a target.EXPERIMENTAL
167167
*/
168168
@Beta
169-
public static Command<TargetInfo> getTargetInfo(Optional<TargetId> targetId) {
169+
public static Command<TargetInfo> getTargetInfo(Optional<TargetID> targetId) {
170170
final ImmutableMap.Builder<String, Object> params = ImmutableMap.builder();
171171
targetId.ifPresent(targetID -> params.put("targetId", targetID));
172172
return new Command<>(
@@ -191,7 +191,7 @@ public static Command<Set<TargetInfo>> getTargets() {
191191
* targetCreated/targetInfoChanged/targetDestroyed events.
192192
*/
193193
public static Command<Void> sendMessageToTarget(
194-
String message, Optional<SessionId> sessionID, @Deprecated Optional<TargetId> targetID) {
194+
String message, Optional<SessionId> sessionID, @Deprecated Optional<TargetID> targetID) {
195195
Objects.requireNonNull(message, "message is required");
196196
final ImmutableMap.Builder<String, Object> params = ImmutableMap.builder();
197197
params.put("message", message);
@@ -205,7 +205,7 @@ public static Command<Void> sendMessageToTarget(
205205
*
206206
* @return {@link SessionId}
207207
*/
208-
public static Command<SessionId> attachToTarget(TargetId targetId, Optional<Boolean> flatten) {
208+
public static Command<SessionId> attachToTarget(TargetID targetId, Optional<Boolean> flatten) {
209209
Objects.requireNonNull(targetId, "Target ID must be set.");
210210
final ImmutableMap.Builder<String, Object> params = ImmutableMap.builder();
211211
params.put("targetId", targetId);
@@ -290,8 +290,8 @@ public static Event<TargetInfo> targetCreated() {
290290
/**
291291
* Issued when a target is destroyed.
292292
*/
293-
public static Event<TargetId> targetDestroyed() {
294-
return new Event<>("Target.targetDestroyed", map("targetId", TargetId.class));
293+
public static Event<TargetID> targetDestroyed() {
294+
return new Event<>("Target.targetDestroyed", map("targetId", TargetID.class));
295295
}
296296

297297
/**

‎java/client/src/org/openqa/selenium/devtools/target/model/DetachedFromTarget.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,29 @@
2222

2323
public class DetachedFromTarget {
2424

25-
private final SessionId sessionId;
25+
private final SessionID sessionId;
2626

2727
@Deprecated
28-
private final TargetId targetId;
28+
private final TargetID targetId;
2929

3030

3131
public DetachedFromTarget(
32-
SessionId sessionId,
33-
TargetId targetId) {
32+
SessionID sessionId,
33+
TargetID targetId) {
3434
this.sessionId = Objects.requireNonNull(sessionId, "sessionId is required");
3535
this.targetId = targetId;
3636
}
3737

3838
private static DetachedFromTarget fromJson(JsonInput input) {
39-
SessionId sessionId = null;
40-
TargetId targetId = null;
39+
SessionID sessionId = null;
40+
TargetID targetId = null;
4141
while (input.hasNext()) {
4242
switch (input.nextName()) {
4343
case "sessionId":
44-
sessionId = input.read(SessionId.class);
44+
sessionId = input.read(SessionID.class);
4545
break;
4646
case "targetId":
47-
targetId = input.read(TargetId.class);
47+
targetId = input.read(TargetID.class);
4848
break;
4949
default:
5050
input.skipValue();

‎java/client/src/org/openqa/selenium/devtools/target/model/ReceivedMessageFromTarget.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@
2222

2323
public class ReceivedMessageFromTarget {
2424

25-
private final SessionId sessionId;
25+
private final SessionID sessionId;
2626

2727
@Deprecated
28-
private final TargetId targetId;
28+
private final TargetID targetId;
2929

3030
private final String message;
3131

32-
public ReceivedMessageFromTarget(SessionId sessionId,
33-
TargetId targetId, String message) {
32+
public ReceivedMessageFromTarget(SessionID sessionId,
33+
TargetID targetId, String message) {
3434
this.sessionId = Objects.requireNonNull(sessionId, "sessionId is required");
3535
this.targetId = targetId;
3636
this.message = Objects.requireNonNull(message, "message is require");
3737
}
3838

3939
private static ReceivedMessageFromTarget fromJson(JsonInput input) {
40-
SessionId sessionId = input.read(SessionId.class);
41-
TargetId targetId = null;
40+
SessionID sessionId = input.read(SessionID.class);
41+
TargetID targetId = null;
4242
String message = null;
4343
while (input.hasNext()) {
4444
switch (input.nextName()) {
4545
case "targetId":
46-
targetId = input.read(TargetId.class);
46+
targetId = input.read(TargetID.class);
4747
break;
4848
case "message":
4949
message = input.nextString();
@@ -56,11 +56,11 @@ private static ReceivedMessageFromTarget fromJson(JsonInput input) {
5656
return new ReceivedMessageFromTarget(sessionId, targetId, message);
5757
}
5858

59-
public SessionId getSessionId() {
59+
public SessionID getSessionId() {
6060
return sessionId;
6161
}
6262

63-
public TargetId getTargetId() {
63+
public TargetID getTargetId() {
6464
return targetId;
6565
}
6666

‎java/client/src/org/openqa/selenium/devtools/target/model/SessionId.java renamed to ‎java/client/src/org/openqa/selenium/devtools/target/model/SessionID.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818

1919
import java.util.Objects;
2020

21-
public class SessionId {
21+
public class SessionID {
2222

2323
private final String id;
2424

25-
public SessionId(String id) {
25+
public SessionID(String id) {
2626
this.id = Objects.requireNonNull(id, "Session ID must be set.");
2727
}
2828

29-
private static SessionId fromJson(String id) {
30-
return new SessionId(id);
29+
private static SessionID fromJson(String id) {
30+
return new SessionID(id);
3131
}
3232

3333
@Override
3434
public boolean equals(Object o) {
35-
if (!(o instanceof SessionId)) {
35+
if (!(o instanceof SessionID)) {
3636
return false;
3737
}
3838

39-
SessionId that = (SessionId) o;
39+
SessionID that = (SessionID) o;
4040
return Objects.equals(id, that.id);
4141
}
4242

‎java/client/src/org/openqa/selenium/devtools/target/model/TargetCrashed.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@
2222

2323
public class TargetCrashed {
2424

25-
private final TargetId targetId;
25+
private final TargetID targetId;
2626

2727
private final String status;
2828

2929
private final int errorCode;
3030

31-
public TargetCrashed(TargetId targetId, String status, Integer errorCode) {
31+
public TargetCrashed(TargetID targetId, String status, Integer errorCode) {
3232
this.targetId = Objects.requireNonNull(targetId, "targetId is required");
3333
this.status = Objects.requireNonNull(status, "status is required");
3434
this.errorCode = Objects.requireNonNull(errorCode, "errorCode is require");
3535
}
3636

3737
private static TargetCrashed fromJson(JsonInput input) {
38-
TargetId targetId = null;
38+
TargetID targetId = null;
3939
String status = null;
4040
Integer errorCode = null;
4141
while (input.hasNext()) {
4242
switch (input.nextName()) {
4343
case "targetId":
44-
targetId = input.read(TargetId.class);
44+
targetId = input.read(TargetID.class);
4545
break;
4646
case "status":
4747
status = input.nextString();
@@ -57,7 +57,7 @@ private static TargetCrashed fromJson(JsonInput input) {
5757
return new TargetCrashed(targetId, status, errorCode);
5858
}
5959

60-
public TargetId getTargetId() {
60+
public TargetID getTargetId() {
6161
return targetId;
6262
}
6363

‎java/client/src/org/openqa/selenium/devtools/target/model/TargetId.java renamed to ‎java/client/src/org/openqa/selenium/devtools/target/model/TargetID.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818

1919
import java.util.Objects;
2020

21-
public class TargetId {
21+
public class TargetID {
2222

2323
private final String id;
2424

25-
public TargetId(String id) {
25+
public TargetID(String id) {
2626
this.id = Objects.requireNonNull(id, "Target ID must be set.");
2727
}
2828

29-
private static TargetId fromJson(String id) {
30-
return new TargetId(id);
29+
private static TargetID fromJson(String id) {
30+
return new TargetID(id);
3131
}
3232

3333
@Override
3434
public boolean equals(Object o) {
35-
if (!(o instanceof TargetId)) {
35+
if (!(o instanceof TargetID)) {
3636
return false;
3737
}
3838

39-
TargetId that = (TargetId) o;
39+
TargetID that = (TargetID) o;
4040
return Objects.equals(id, that.id);
4141
}
4242

‎java/client/src/org/openqa/selenium/devtools/target/model/TargetInfo.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626

2727
public class TargetInfo {
2828

29-
private final TargetId targetId;
29+
private final TargetID targetId;
3030
private final String type;
3131
private final String title;
3232
private final String url;
3333
private final boolean attached;
3434

35-
public TargetInfo(TargetId id, String type, String title, String url, boolean attached) {
35+
public TargetInfo(TargetID id, String type, String title, String url, boolean attached) {
3636
this.targetId = Objects.requireNonNull(id);
3737
this.type = Objects.requireNonNull(type);
3838
this.title = Objects.requireNonNull(title);
@@ -41,7 +41,7 @@ public TargetInfo(TargetId id, String type, String title, String url, boolean at
4141
}
4242

4343
private static TargetInfo fromJson(JsonInput input) {
44-
TargetId id = null;
44+
TargetID id = null;
4545
String type = null;
4646
String title = null;
4747
String url = null;
@@ -55,7 +55,7 @@ private static TargetInfo fromJson(JsonInput input) {
5555
break;
5656

5757
case "targetId":
58-
id = input.read(TargetId.class);
58+
id = input.read(TargetID.class);
5959
break;
6060

6161
case "title":
@@ -81,7 +81,7 @@ private static TargetInfo fromJson(JsonInput input) {
8181
return new TargetInfo(id, type, title, url, attached);
8282
}
8383

84-
public TargetId getTargetId() {
84+
public TargetID getTargetId() {
8585
return targetId;
8686
}
8787

‎java/client/test/org/openqa/selenium/devtools/ChromeDevToolsTargetTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.junit.Test;
2222
import org.openqa.selenium.devtools.target.model.ReceivedMessageFromTarget;
2323
import org.openqa.selenium.devtools.target.model.TargetCrashed;
24-
import org.openqa.selenium.devtools.target.model.TargetId;
24+
import org.openqa.selenium.devtools.target.model.TargetID;
2525
import org.openqa.selenium.devtools.target.model.TargetInfo;
2626
import org.openqa.selenium.remote.SessionId;
2727

@@ -99,7 +99,7 @@ public void createAndContentLifeCycle() {
9999
devTools.addListener(targetDestroyed(), this::validateTargetId);
100100
devTools.addListener(targetInfoChanged(), this::validateTargetInfo);
101101

102-
TargetId target =
102+
TargetID target =
103103
devTools.send(
104104
createTarget(
105105
appServer.whereIs("devToolsConsoleTest.html"),
@@ -122,7 +122,7 @@ private void validateTargetCrashed(TargetCrashed targetCrashed) {
122122
assertNotNull(targetCrashed.getTargetId());
123123
}
124124

125-
private void validateTargetId(TargetId targetId) {
125+
private void validateTargetId(TargetID targetId) {
126126
assertNotNull(targetId);
127127
assertNotNull(targetId.getId());
128128
}

0 commit comments

Comments
 (0)