Skip to content

[java] JSpecify annotations for CommandInfo CommandPayload `Drive… #16491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+12 −4
Open

[java] JSpecify annotations for CommandInfo CommandPayload `Drive… #16491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions java/src/org/openqa/selenium/remote/CommandInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

package org.openqa.selenium.remote;

import org.jspecify.annotations.NullMarked;
import org.openqa.selenium.remote.http.HttpMethod;

@NullMarked
public class CommandInfo {
private final String url;
private final HttpMethod method;
Expand Down
9 changes: 6 additions & 3 deletions java/src/org/openqa/selenium/remote/CommandPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@
package org.openqa.selenium.remote;

import java.util.Map;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

@NullMarked
public class CommandPayload {

private final String name;
private final Map<String, ?> parameters;
private final Map<String, ? extends @Nullable Object> parameters;

public CommandPayload(String name, Map<String, ?> parameters) {
public CommandPayload(String name, Map<String, ? extends @Nullable Object> parameters) {
this.name = name;
this.parameters = parameters;
}
Expand All @@ -33,7 +36,7 @@ public String getName() {
return name;
}

public Map<String, ?> getParameters() {
public Map<String, ? extends @Nullable Object> getParameters() {
return parameters;
}
}
5 changes: 4 additions & 1 deletion java/src/org/openqa/selenium/remote/DriverCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import org.openqa.selenium.Capabilities;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.Dimension;
Expand All @@ -39,6 +41,7 @@
*
* @author jmleyba@gmail.com (Jason Leyba)
*/
@NullMarked
public interface DriverCommand {
String GET_CAPABILITIES = "getCapabilities";
String NEW_SESSION = "newSession";
Expand Down Expand Up @@ -253,7 +256,7 @@ static CommandPayload SWITCH_TO_NEW_WINDOW(WindowType typeHint) {
return new CommandPayload(SWITCH_TO_NEW_WINDOW, Map.of("type", typeHint.toString()));
}

static CommandPayload SWITCH_TO_FRAME(Object frame) {
static CommandPayload SWITCH_TO_FRAME(@Nullable Object frame) {
return new CommandPayload(SWITCH_TO_FRAME, singletonMap("id", frame));
}

Expand Down