Skip to content

Commit 792df95

Browse files
mk868diemol
andauthored
[java] JSpecify annotations for Response SessionId HttpSessionId (#16490)
Co-authored-by: Diego Molina <[email protected]>
1 parent a98783f commit 792df95

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

java/src/org/openqa/selenium/remote/HttpSessionId.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
package org.openqa.selenium.remote;
1919

2020
import java.util.Optional;
21+
import org.jspecify.annotations.NullMarked;
2122

23+
@NullMarked
2224
public class HttpSessionId {
2325

2426
private HttpSessionId() {

java/src/org/openqa/selenium/remote/Response.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@
2020
import java.util.Map;
2121
import java.util.Objects;
2222
import java.util.Optional;
23+
import org.jspecify.annotations.NullMarked;
24+
import org.jspecify.annotations.Nullable;
2325

26+
@NullMarked
2427
public class Response {
2528

26-
private volatile Object value;
27-
private volatile String sessionId;
29+
private volatile @Nullable Object value;
30+
private volatile @Nullable String sessionId;
2831
@Deprecated // (forRemoval = true)
29-
private volatile Integer status;
30-
private volatile String state;
32+
private volatile @Nullable Integer status;
33+
private volatile @Nullable String state;
3134

3235
public Response() {}
3336

@@ -36,36 +39,36 @@ public Response(SessionId sessionId) {
3639
}
3740

3841
@Deprecated // (forRemoval = true)
39-
public Integer getStatus() {
42+
public @Nullable Integer getStatus() {
4043
return status;
4144
}
4245

4346
@Deprecated // (forRemoval = true)
44-
public void setStatus(Integer status) {
47+
public void setStatus(@Nullable Integer status) {
4548
this.status = status;
4649
}
4750

48-
public String getState() {
51+
public @Nullable String getState() {
4952
return state;
5053
}
5154

52-
public void setState(String state) {
55+
public void setState(@Nullable String state) {
5356
this.state = state;
5457
}
5558

56-
public void setValue(Object value) {
59+
public void setValue(@Nullable Object value) {
5760
this.value = value;
5861
}
5962

60-
public Object getValue() {
63+
public @Nullable Object getValue() {
6164
return value;
6265
}
6366

64-
public void setSessionId(String sessionId) {
67+
public void setSessionId(@Nullable String sessionId) {
6568
this.sessionId = sessionId;
6669
}
6770

68-
public String getSessionId() {
71+
public @Nullable String getSessionId() {
6972
return sessionId;
7073
}
7174

@@ -76,7 +79,7 @@ public String toString() {
7679
}
7780

7881
@Override
79-
public boolean equals(Object o) {
82+
public boolean equals(@Nullable Object o) {
8083
if (!(o instanceof Response)) {
8184
return false;
8285
}

java/src/org/openqa/selenium/remote/SessionId.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020
import java.io.Serializable;
2121
import java.util.Map;
2222
import java.util.UUID;
23+
import org.jspecify.annotations.NullMarked;
24+
import org.jspecify.annotations.Nullable;
2325
import org.openqa.selenium.internal.Require;
2426
import org.openqa.selenium.json.JsonException;
2527

28+
@NullMarked
2629
public class SessionId implements Serializable {
2730

2831
private final String opaqueKey;
@@ -46,7 +49,7 @@ public int hashCode() {
4649
}
4750

4851
@Override
49-
public boolean equals(Object obj) {
52+
public boolean equals(@Nullable Object obj) {
5053
return obj instanceof SessionId && opaqueKey.equals(((SessionId) obj).opaqueKey);
5154
}
5255

0 commit comments

Comments
 (0)