Skip to content

Commit 5daec91

Browse files
committed
[bidi] Prefer returning immutable versions of values when serialising to JSON
1 parent 86156cb commit 5daec91

24 files changed

+24
-24
lines changed

java/src/org/openqa/selenium/bidi/browsingcontext/BoxClipRectangle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public BoxClipRectangle(double x, double y, double width, double height) {
3333
public Map<String, Object> toMap() {
3434
map.put("type", super.getType().toString());
3535

36-
return map;
36+
return Map.copyOf(map);
3737
}
3838
}

java/src/org/openqa/selenium/bidi/browsingcontext/CaptureScreenshotParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ public CaptureScreenshotParameters clipRectangle(ClipRectangle clipRectangle) {
6161
}
6262

6363
public Map<String, Object> toMap() {
64-
return map;
64+
return Map.copyOf(map);
6565
}
6666
}

java/src/org/openqa/selenium/bidi/browsingcontext/CreateContextParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ public CreateContextParameters userContext(String userContext) {
4646

4747
public Map<String, Object> toMap() {
4848
map.put("type", windowType.toString());
49-
return map;
49+
return Map.copyOf(map);
5050
}
5151
}

java/src/org/openqa/selenium/bidi/browsingcontext/ElementClipRectangle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public ElementClipRectangle(String sharedId, String handle) {
3636
public Map<String, Object> toMap() {
3737
map.put("type", super.getType().toString());
3838

39-
return map;
39+
return Map.copyOf(map);
4040
}
4141
}

java/src/org/openqa/selenium/bidi/browsingcontext/LocateNodeParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ public Map<String, Object> toMap() {
7171
map.put("startNodes", startNodesJson);
7272
});
7373

74-
return map;
74+
return Map.copyOf(map);
7575
}
7676
}

java/src/org/openqa/selenium/bidi/browsingcontext/Locator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ public static Locator xpath(String value) {
8080
}
8181

8282
public Map<String, Object> toMap() {
83-
return map;
83+
return Map.copyOf(map);
8484
}
8585
}

java/src/org/openqa/selenium/bidi/network/AddInterceptParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ public Map<String, Object> toMap() {
6262
if (!urlPatterns.isEmpty()) {
6363
map.put("urlPatterns", urlPatterns);
6464
}
65-
return map;
65+
return Map.copyOf(map);
6666
}
6767
}

java/src/org/openqa/selenium/bidi/network/BytesValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ public Map<String, String> toMap() {
8585
map.put("type", type.toString());
8686
map.put("value", value);
8787

88-
return map;
88+
return Map.copyOf(map);
8989
}
9090
}

java/src/org/openqa/selenium/bidi/network/ContinueRequestParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ public ContinueRequestParameters url(http://github.com/String%20url) {
6060
}
6161

6262
public Map<String, Object> toMap() {
63-
return map;
63+
return Map.copyOf(map);
6464
}
6565
}

java/src/org/openqa/selenium/bidi/network/ContinueResponseParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ public ContinueResponseParameters statusCode(int statusCode) {
6868
}
6969

7070
public Map<String, Object> toMap() {
71-
return map;
71+
return Map.copyOf(map);
7272
}
7373
}

java/src/org/openqa/selenium/bidi/network/Cookie.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,6 @@ public Map<String, Object> toMap() {
182182

183183
getExpiry().ifPresent(expiryValue -> map.put("expiry", expiryValue));
184184

185-
return map;
185+
return Map.copyOf(map);
186186
}
187187
}

java/src/org/openqa/selenium/bidi/network/Header.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ public Map<String, Object> toMap() {
6666
map.put("name", this.name);
6767
map.put("value", this.value.toMap());
6868

69-
return map;
69+
return Map.copyOf(map);
7070
}
7171
}

java/src/org/openqa/selenium/bidi/network/ProvideResponseParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ public ProvideResponseParameters statusCode(int statusCode) {
5959
}
6060

6161
public Map<String, Object> toMap() {
62-
return map;
62+
return Map.copyOf(map);
6363
}
6464
}

java/src/org/openqa/selenium/bidi/network/SetCookieHeader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ public SetCookieHeader expiry(long expiry) {
6464
}
6565

6666
public Map<String, Object> toMap() {
67-
return map;
67+
return Map.copyOf(map);
6868
}
6969
}

java/src/org/openqa/selenium/bidi/network/UrlPattern.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ public UrlPattern search(String search) {
5050

5151
public Map<String, String> toMap() {
5252
map.put("type", "pattern");
53-
return map;
53+
return Map.copyOf(map);
5454
}
5555
}

java/src/org/openqa/selenium/bidi/script/CallFunctionParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ public CallFunctionParameters userActivation(boolean userActivation) {
5757
}
5858

5959
public Map<String, Object> toMap() {
60-
return map;
60+
return Map.copyOf(map);
6161
}
6262
}

java/src/org/openqa/selenium/bidi/script/EvaluateParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ public EvaluateParameters userActivation(boolean userActivation) {
4646
}
4747

4848
public Map<String, Object> toMap() {
49-
return map;
49+
return Map.copyOf(map);
5050
}
5151
}

java/src/org/openqa/selenium/bidi/storage/BrowsingContextPartitionDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public Map<String, Object> toMap() {
3333
map.put("type", super.type.toString());
3434
map.put("context", this.context);
3535

36-
return map;
36+
return Map.copyOf(map);
3737
}
3838
}

java/src/org/openqa/selenium/bidi/storage/CookieFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ public CookieFilter expiry(long expiry) {
7171
}
7272

7373
public Map<String, Object> toMap() {
74-
return map;
74+
return Map.copyOf(map);
7575
}
7676
}

java/src/org/openqa/selenium/bidi/storage/DeleteCookiesParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ public Map<String, Object> toMap() {
4343
cookieFilter.ifPresent(filter -> map.put("filter", cookieFilter));
4444
partitionDescriptor.ifPresent(descriptor -> map.put("partition", partitionDescriptor));
4545

46-
return map;
46+
return Map.copyOf(map);
4747
}
4848
}

java/src/org/openqa/selenium/bidi/storage/GetCookiesParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ public Map<String, Object> toMap() {
4242
cookieFilter.ifPresent(filter -> map.put("filter", filter));
4343
partitionDescriptor.ifPresent(descriptor -> map.put("partition", descriptor));
4444

45-
return map;
45+
return Map.copyOf(map);
4646
}
4747
}

java/src/org/openqa/selenium/bidi/storage/PartialCookie.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ public PartialCookie expiry(long expiry) {
6262
}
6363

6464
public Map<String, Object> toMap() {
65-
return map;
65+
return Map.copyOf(map);
6666
}
6767
}

java/src/org/openqa/selenium/bidi/storage/SetCookieParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ public Map<String, Object> toMap() {
3838
map.put("cookie", cookie.toMap());
3939
partitionDescriptor.ifPresent(descriptor -> map.put("partition", descriptor));
4040

41-
return map;
41+
return Map.copyOf(map);
4242
}
4343
}

java/src/org/openqa/selenium/bidi/storage/StorageKeyPartitionDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ public StorageKeyPartitionDescriptor sourceOrigin(String sourceOrigin) {
3939
}
4040

4141
public Map<String, Object> toMap() {
42-
return map;
42+
return Map.copyOf(map);
4343
}
4444
}

0 commit comments

Comments
 (0)