make API changes compatible with Selenium 4.24.0-SNAPSHOT

Unfortunately, these two public methods have been changed in Selenium 4.24.0-SNAPSHOT:

* org.openqa.selenium.remote.ExecuteMethod#execute
* org.openqa.selenium.support.ui.FluentWait#until

Author: asolntsev

gradle.properties

@@ -1,5 +1,6 @@
 org.gradle.daemon=true
 
-selenium.version=4.40.0
+#selenium.version=4.40.0
+selenium.version=4.42.0-SNAPSHOT
 # Please increment the value in a release
 appiumClient.version=10.0.0

src/main/java/io/appium/java_client/AppiumExecutionMethod.java

@@ -16,6 +16,7 @@
 
 package io.appium.java_client;
 
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.remote.ExecuteMethod;
 import org.openqa.selenium.remote.Response;
 
@@ -35,7 +36,9 @@ public AppiumExecutionMethod(AppiumDriver driver) {
      * @param parameters is a map which contains parameter names as keys and parameter values
      * @return a command execution result
      */
-    public Object execute(String commandName, Map<String, ?> parameters) {
+    @Nullable
+    @SuppressWarnings("unchecked")
+    public <T> T execute(String commandName, @Nullable Map<String, ?> parameters) {
         Response response;
 
         if (parameters == null || parameters.isEmpty()) {
@@ -44,6 +47,6 @@ public Object execute(String commandName, Map<String, ?> parameters) {
             response = driver.execute(commandName, parameters);
         }
 
-        return response.getValue();
+        return (T) response.getValue();
     }
 }

src/main/java/io/appium/java_client/AppiumFluentWait.java

@@ -19,6 +19,9 @@
 import com.google.common.base.Throwables;
 import lombok.AccessLevel;
 import lombok.Getter;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.support.ui.FluentWait;
@@ -32,7 +35,9 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+@NullMarked
 public class AppiumFluentWait<T> extends FluentWait<T> {
+    @Nullable
     private Function<IterationInfo, Duration> pollingStrategy = null;
 
     private static final Duration DEFAULT_POLL_DELAY_DURATION = Duration.ZERO;
@@ -133,7 +138,7 @@ protected List<Class<? extends Throwable>> getIgnoredExceptions() {
         return ignoredExceptions;
     }
 
-    protected Supplier<String> getMessageSupplier() {
+    protected Supplier<@Nullable String> getMessageSupplier() {
         return messageSupplier;
     }
 
@@ -203,15 +208,15 @@ public AppiumFluentWait<T> withPollingStrategy(Function<IterationInfo, Duration>
      * @throws TimeoutException If the timeout expires.
      */
     @Override
-    public <V> V until(Function<? super T, V> isTrue) {
+    public <V extends @Nullable Object> @NonNull V until(Function<? super T, ? extends V> isTrue) {
         final var start = getClock().instant();
         // Adding pollDelay to end instant will allow to verify the condition for the expected timeout duration.
         final var end = start.plus(getTimeout()).plus(pollDelay);
 
         return performIteration(isTrue, start, end);
     }
 
-    private <V> V performIteration(Function<? super T, V> isTrue, Instant start, Instant end) {
+    private <V extends @Nullable Object> @NonNull V performIteration(Function<? super T, ? extends V> isTrue, Instant start, Instant end) {
         var iterationNumber = 1;
         Throwable lastException;
 
@@ -245,8 +250,8 @@ private <V> V performIteration(Function<? super T, V> isTrue, Instant start, Ins
         }
     }
 
-    private <V> void handleTimeoutException(Throwable lastException, Function<? super T, V> isTrue) {
-        var message = Optional.ofNullable(getMessageSupplier())
+    private <V> void handleTimeoutException(@Nullable Throwable lastException, Function<? super T, ? extends V> isTrue) {
+        var message = Optional.of(getMessageSupplier())
                 .map(Supplier::get)
                 .orElseGet(() -> "waiting for " + isTrue);