Skip to content

fix: Possible NPE in initBiDi() #2325

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

Merged
merged 4 commits into from
Aug 12, 2025
Merged

fix: Possible NPE in initBiDi() #2325

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a942d67
fix possible NPE in initBiDi()
panchenko Aug 8, 2025
8feb425
CR
panchenko Aug 9, 2025
ece0c2e
CR
panchenko Aug 9, 2025
3ff2053
fix checkstyle
panchenko Aug 9, 2025
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
28 changes: 13 additions & 15 deletions src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import io.appium.java_client.AppiumClientConfig;
import io.appium.java_client.internal.ReflectionHelpers;
import lombok.Getter;
import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import org.openqa.selenium.SessionNotCreatedException;
import org.openqa.selenium.WebDriverException;
Expand Down Expand Up @@ -53,11 +53,12 @@
import static java.util.Optional.ofNullable;
import static org.openqa.selenium.remote.DriverCommand.NEW_SESSION;

@NullMarked
public class AppiumCommandExecutor extends HttpCommandExecutor {

private final Optional<DriverService> serviceOptional;
@Getter
private final HttpClient.Factory httpClientFactory;
private final Factory httpClientFactory;
@Getter
private final AppiumClientConfig appiumClientConfig;

Expand All @@ -66,32 +67,32 @@ public class AppiumCommandExecutor extends HttpCommandExecutor {
*
* @param additionalCommands is the map of Appium commands
* @param service take a look at {@link DriverService}
* @param httpClientFactory take a look at {@link HttpClient.Factory}
* @param httpClientFactory take a look at {@link Factory}
* @param appiumClientConfig take a look at {@link AppiumClientConfig}
*/
public AppiumCommandExecutor(
@NonNull Map<String, CommandInfo> additionalCommands,
Map<String, CommandInfo> additionalCommands,
@Nullable DriverService service,
@Nullable Factory httpClientFactory,
@NonNull AppiumClientConfig appiumClientConfig) {
AppiumClientConfig appiumClientConfig) {
super(additionalCommands,
appiumClientConfig,
ofNullable(httpClientFactory).orElseGet(AppiumCommandExecutor::getDefaultClientFactory)
ofNullable(httpClientFactory).orElseGet(HttpCommandExecutor::getDefaultClientFactory)
);
serviceOptional = ofNullable(service);

this.httpClientFactory = httpClientFactory;
this.httpClientFactory = ofNullable(httpClientFactory).orElseGet(HttpCommandExecutor::getDefaultClientFactory);
this.appiumClientConfig = appiumClientConfig;
}

public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, DriverService service,
HttpClient.Factory httpClientFactory) {
@Nullable Factory httpClientFactory) {
this(additionalCommands, requireNonNull(service), httpClientFactory,
AppiumClientConfig.defaultConfig().baseUrl(requireNonNull(service).getUrl()));
}

public AppiumCommandExecutor(Map<String, CommandInfo> additionalCommands, URL addressOfRemoteServer,
HttpClient.Factory httpClientFactory) {
@Nullable Factory httpClientFactory) {
this(additionalCommands, null, httpClientFactory,
AppiumClientConfig.defaultConfig().baseUrl(requireNonNull(addressOfRemoteServer)));
}
Expand Down Expand Up @@ -140,6 +141,7 @@ public Map<String, CommandInfo> getAdditionalCommands() {
return getPrivateFieldValue(HttpCommandExecutor.class, "additionalCommands", Map.class);
}

@Nullable
protected CommandCodec<HttpRequest> getCommandCodec() {
return this.commandCodec;
}
Expand All @@ -163,12 +165,8 @@ protected HttpClient getClient() {
* @param serverUrl A url to override.
*/
protected void overrideServerUrl(URL serverUrl) {
if (this.appiumClientConfig == null) {
return;
}
setPrivateFieldValue(HttpCommandExecutor.class, "client",
ofNullable(this.httpClientFactory).orElseGet(AppiumCommandExecutor::getDefaultClientFactory)
.createClient(this.appiumClientConfig.baseUrl(serverUrl)));
this.httpClientFactory.createClient(this.appiumClientConfig.baseUrl(serverUrl)));
}

private Response createSession(Command command) throws IOException {
Expand All @@ -186,7 +184,7 @@ private Response createSession(Command command) throws IOException {
refreshAdditionalCommands();
setResponseCodec(dialect.getResponseCodec());
Response response = result.createResponse();
if (this.appiumClientConfig != null && this.appiumClientConfig.isDirectConnectEnabled()) {
if (appiumClientConfig.isDirectConnectEnabled()) {
setDirectConnect(response);
}

Expand Down
Loading