Merge remote-tracking branch 'origin/feature/webelement-widget' into feature/webelement-widget

iFatRain · iFatRain · commit 3d049bce12b8 · 2025-04-23T16:18:18.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'maven-publish'
     id 'jacoco'
     id 'signing'
-    id 'org.owasp.dependencycheck' version '12.1.0'
+    id 'org.owasp.dependencycheck' version '12.1.1'
     id 'com.gradleup.shadow' version '8.3.6'
 }
 
@@ -38,8 +38,8 @@ ext {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.36'
-    annotationProcessor 'org.projectlombok:lombok:1.18.36'
+    compileOnly 'org.projectlombok:lombok:1.18.38'
+    annotationProcessor 'org.projectlombok:lombok:1.18.38'
 
     if (project.hasProperty("isCI")) {
         api "org.seleniumhq.selenium:selenium-api:${seleniumVersion}"
@@ -65,8 +65,9 @@ dependencies {
             }
         }
     }
-    implementation 'com.google.code.gson:gson:2.12.1'
+    implementation 'com.google.code.gson:gson:2.13.0'
     implementation "org.slf4j:slf4j-api:${slf4jVersion}"
+    implementation 'org.jspecify:jspecify:1.0.0'
 }
 
 dependencyCheck {
@@ -195,7 +196,7 @@ testing {
         configureEach {
             useJUnitJupiter()
             dependencies {
-                implementation 'org.junit.jupiter:junit-jupiter:5.12.0'
+                implementation 'org.junit.jupiter:junit-jupiter:5.12.2'
                 runtimeOnly 'org.junit.platform:junit-platform-launcher'
                 implementation 'org.hamcrest:hamcrest:3.0'
                 runtimeOnly "org.slf4j:slf4j-simple:${slf4jVersion}"
@@ -213,7 +214,7 @@ testing {
         test {
             dependencies {
                 implementation "org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}"
-                implementation('io.github.bonigarcia:webdrivermanager:5.9.3') {
+                implementation('io.github.bonigarcia:webdrivermanager:6.0.1') {
                     exclude group: 'org.seleniumhq.selenium'
                 }
             }
@@ -257,7 +258,7 @@ testing {
             dependencies {
                 implementation project()
                 implementation(sourceSets.test.output)
-                implementation('io.github.bonigarcia:webdrivermanager:5.9.3') {
+                implementation('io.github.bonigarcia:webdrivermanager:6.0.1') {
                     exclude group: 'org.seleniumhq.selenium'
                 }
             }
diff --git a/src/main/java/io/appium/java_client/AppiumClientConfig.java b/src/main/java/io/appium/java_client/AppiumClientConfig.java
@@ -18,12 +18,12 @@
 
 import io.appium.java_client.internal.filters.AppiumIdempotencyFilter;
 import io.appium.java_client.internal.filters.AppiumUserAgentFilter;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.Credentials;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.Filter;
 
-import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import java.net.Proxy;
 import java.net.URI;
diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -25,6 +25,7 @@
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
 import lombok.Getter;
+import org.jspecify.annotations.NonNull;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.OutputType;
@@ -47,7 +48,6 @@
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpMethod;
 
-import javax.annotation.Nonnull;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -275,7 +275,7 @@ public Optional<BiDi> maybeGetBiDi() {
     }
 
     @Override
-    @Nonnull
+    @NonNull
     public BiDi getBiDi() {
         var webSocketUrl = ((BaseOptions<?>) this.capabilities).getWebSocketUrl().orElseThrow(
                 () -> {
diff --git a/src/main/java/io/appium/java_client/CommandExecutionHelper.java b/src/main/java/io/appium/java_client/CommandExecutionHelper.java
@@ -16,9 +16,9 @@
 
 package io.appium.java_client;
 
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.remote.Response;
 
-import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.Map;
 
diff --git a/src/main/java/io/appium/java_client/ComparesImages.java b/src/main/java/io/appium/java_client/ComparesImages.java
@@ -23,8 +23,8 @@
 import io.appium.java_client.imagecomparison.OccurrenceMatchingResult;
 import io.appium.java_client.imagecomparison.SimilarityMatchingOptions;
 import io.appium.java_client.imagecomparison.SimilarityMatchingResult;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/src/main/java/io/appium/java_client/ExecuteCDPCommand.java b/src/main/java/io/appium/java_client/ExecuteCDPCommand.java
@@ -16,9 +16,9 @@
 
 package io.appium.java_client;
 
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.remote.Response;
 
-import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/io/appium/java_client/ExecutesDriverScript.java b/src/main/java/io/appium/java_client/ExecutesDriverScript.java
@@ -18,9 +18,9 @@
 
 import io.appium.java_client.driverscripts.ScriptOptions;
 import io.appium.java_client.driverscripts.ScriptValue;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.remote.Response;
 
-import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/main/java/io/appium/java_client/InteractsWithApps.java b/src/main/java/io/appium/java_client/InteractsWithApps.java
@@ -22,10 +22,10 @@
 import io.appium.java_client.appmanagement.BaseOptions;
 import io.appium.java_client.appmanagement.BaseRemoveApplicationOptions;
 import io.appium.java_client.appmanagement.BaseTerminateApplicationOptions;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.InvalidArgumentException;
 import org.openqa.selenium.UnsupportedCommandException;
 
-import javax.annotation.Nullable;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/io/appium/java_client/Location.java b/src/main/java/io/appium/java_client/Location.java
@@ -19,8 +19,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
-
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents the physical location.
diff --git a/src/main/java/io/appium/java_client/MobileCommand.java b/src/main/java/io/appium/java_client/MobileCommand.java
@@ -21,10 +21,10 @@
 import io.appium.java_client.imagecomparison.ComparisonMode;
 import io.appium.java_client.screenrecording.BaseStartScreenRecordingOptions;
 import io.appium.java_client.screenrecording.BaseStopScreenRecordingOptions;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.http.HttpMethod;
 
-import javax.annotation.Nullable;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Collections;
diff --git a/src/main/java/io/appium/java_client/android/StartsActivity.java b/src/main/java/io/appium/java_client/android/StartsActivity.java
@@ -19,10 +19,9 @@
 import io.appium.java_client.CanRememberExtensionPresence;
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.UnsupportedCommandException;
 
-import javax.annotation.Nullable;
-
 import java.util.Map;
 
 import static io.appium.java_client.MobileCommand.CURRENT_ACTIVITY;
diff --git a/src/main/java/io/appium/java_client/internal/CapabilityHelpers.java b/src/main/java/io/appium/java_client/internal/CapabilityHelpers.java
@@ -16,9 +16,9 @@
 
 package io.appium.java_client.internal;
 
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
 
-import javax.annotation.Nullable;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
diff --git a/src/main/java/io/appium/java_client/internal/filters/AppiumUserAgentFilter.java b/src/main/java/io/appium/java_client/internal/filters/AppiumUserAgentFilter.java
@@ -17,14 +17,13 @@
 package io.appium.java_client.internal.filters;
 
 import io.appium.java_client.internal.Config;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.remote.http.AddSeleniumUserAgent;
 import org.openqa.selenium.remote.http.Filter;
 import org.openqa.selenium.remote.http.HttpHandler;
 import org.openqa.selenium.remote.http.HttpHeader;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /**
  * Manage Appium Client configurations.
  */
@@ -41,7 +40,7 @@ public class AppiumUserAgentFilter implements Filter {
      */
     public static final String USER_AGENT = buildUserAgentHeaderValue(AddSeleniumUserAgent.USER_AGENT);
 
-    private static String buildUserAgentHeaderValue(@Nonnull String previousUA) {
+    private static String buildUserAgentHeaderValue(@NonNull String previousUA) {
         return String.format("%s%s (%s)",
                 USER_AGENT_PREFIX, Config.main().getValue(VERSION_KEY, String.class), previousUA);
     }
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java
@@ -19,9 +19,9 @@
 import io.appium.java_client.pagefactory.bys.builder.AppiumByBuilder;
 import io.appium.java_client.pagefactory.locator.CacheableElementLocatorFactory;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.SearchContext;
 
-import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
@@ -19,6 +19,8 @@
 import io.appium.java_client.internal.CapabilityHelpers;
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
@@ -30,8 +32,6 @@
 import org.openqa.selenium.support.pagefactory.ElementLocatorFactory;
 import org.openqa.selenium.support.pagefactory.FieldDecorator;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -123,7 +123,7 @@ contextReference, duration, new WidgetByBuilder(platform, automation)
         );
     }
 
-    @Nonnull
+    @NonNull
     private static WeakReference<WebDriver> requireWebDriverReference(SearchContext searchContext) {
         var wd = unpackObjectFromSearchContext(
                 checkNotNull(searchContext, "The provided search context cannot be null"),
diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java
@@ -19,11 +19,11 @@
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.pagefactory.interceptors.InterceptorOfASingleElement;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.PageFactory;
 
-import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -48,11 +48,9 @@ public class WidgetInterceptor extends InterceptorOfASingleElement {
      * Proxy interceptor class for widgets.
      */
     public WidgetInterceptor(
-            @Nullable
-            CacheableLocator locator,
+            @Nullable CacheableLocator locator,
             WeakReference<WebDriver> driverReference,
-            @Nullable
-            WeakReference<WebElement> cachedElementReference,
+            @Nullable WeakReference<WebElement> cachedElementReference,
             Map<ContentType, Constructor<? extends Widget>> instantiationMap,
             Duration duration
     ) {
diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java
@@ -19,10 +19,10 @@
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.pagefactory.interceptors.InterceptorOfAListOfElements;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
-import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -50,8 +50,7 @@ public class WidgetListInterceptor extends InterceptorOfAListOfElements {
      * Proxy interceptor class for lists of widgets.
      */
     public WidgetListInterceptor(
-            @Nullable
-            CacheableLocator locator,
+            @Nullable CacheableLocator locator,
             WeakReference<WebDriver> driver,
             Map<ContentType, Constructor<? extends Widget>> instantiationMap,
             Class<? extends Widget> declaredType,
diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java b/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java
@@ -17,11 +17,11 @@
 package io.appium.java_client.pagefactory.bys;
 
 import lombok.EqualsAndHashCode;
+import org.jspecify.annotations.NonNull;
 import org.openqa.selenium.By;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebElement;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Map;
 
@@ -43,7 +43,7 @@ public ContentMappedBy(Map<ContentType, By> map) {
      * @param type required content type {@link ContentType}
      * @return self-reference.
      */
-    public By useContent(@Nonnull ContentType type) {
+    public By useContent(@NonNull ContentType type) {
         requireNonNull(type);
         currentContent = type;
         return this;
diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java
@@ -16,11 +16,11 @@
 
 package io.appium.java_client.pagefactory.bys.builder;
 
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.By;
 import org.openqa.selenium.support.pagefactory.AbstractAnnotations;
 import org.openqa.selenium.support.pagefactory.ByAll;
 
-import javax.annotation.Nullable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
diff --git a/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfAListOfElements.java b/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfAListOfElements.java
@@ -17,10 +17,10 @@
 package io.appium.java_client.pagefactory.interceptors;
 
 import io.appium.java_client.proxy.MethodCallListener;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.pagefactory.ElementLocator;
 
-import javax.annotation.Nullable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java b/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java
@@ -17,13 +17,13 @@
 package io.appium.java_client.pagefactory.interceptors;
 
 import io.appium.java_client.proxy.MethodCallListener;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.WrapsDriver;
 import org.openqa.selenium.remote.RemoteWebElement;
 import org.openqa.selenium.support.pagefactory.ElementLocator;
 
-import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 import java.util.Objects;
@@ -34,8 +34,7 @@ public abstract class InterceptorOfASingleElement implements MethodCallListener
     private final WeakReference<WebDriver> driverReference;
 
     public InterceptorOfASingleElement(
-            @Nullable
-            ElementLocator locator,
+            @Nullable ElementLocator locator,
             WeakReference<WebDriver> driverReference
     ) {
         this.locator = locator;
diff --git a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java
@@ -18,14 +18,13 @@
 
 import io.appium.java_client.HasBrowserCheck;
 import io.appium.java_client.pagefactory.bys.ContentType;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.ContextAware;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WrapsDriver;
 import org.openqa.selenium.WrapsElement;
 
-import javax.annotation.Nullable;
-
 import java.util.Optional;
 
 import static io.appium.java_client.HasBrowserCheck.NATIVE_CONTEXT;
diff --git a/src/main/java/io/appium/java_client/proxy/Helpers.java b/src/main/java/io/appium/java_client/proxy/Helpers.java
diff --git a/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java b/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
diff --git a/src/main/java/io/appium/java_client/remote/DirectConnect.java b/src/main/java/io/appium/java_client/remote/DirectConnect.java
diff --git a/src/main/java/io/appium/java_client/remote/SupportsContextSwitching.java b/src/main/java/io/appium/java_client/remote/SupportsContextSwitching.java
diff --git a/src/main/java/io/appium/java_client/remote/options/BaseOptions.java b/src/main/java/io/appium/java_client/remote/options/BaseOptions.java
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java b/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java b/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java
diff --git a/src/main/java/io/appium/java_client/ws/StringWebSocketClient.java b/src/main/java/io/appium/java_client/ws/StringWebSocketClient.java
diff --git a/src/test/java/io/appium/java_client/TestUtils.java b/src/test/java/io/appium/java_client/TestUtils.java

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`id 'maven-publish'`
`8`	`8`	`id 'jacoco'`
`9`	`9`	`id 'signing'`
`10`		`- id 'org.owasp.dependencycheck' version '12.1.0'`
	`10`	`+ id 'org.owasp.dependencycheck' version '12.1.1'`
`11`	`11`	`id 'com.gradleup.shadow' version '8.3.6'`
`12`	`12`	`}`
`13`	`13`
`@@ -38,8 +38,8 @@ ext {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`dependencies {`
`41`		`- compileOnly 'org.projectlombok:lombok:1.18.36'`
`42`		`- annotationProcessor 'org.projectlombok:lombok:1.18.36'`
	`41`	`+ compileOnly 'org.projectlombok:lombok:1.18.38'`
	`42`	`+ annotationProcessor 'org.projectlombok:lombok:1.18.38'`
`43`	`43`
`44`	`44`	`if (project.hasProperty("isCI")) {`
`45`	`45`	`api "org.seleniumhq.selenium:selenium-api:${seleniumVersion}"`
`@@ -65,8 +65,9 @@ dependencies {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
`68`		`- implementation 'com.google.code.gson:gson:2.12.1'`
	`68`	`+ implementation 'com.google.code.gson:gson:2.13.0'`
`69`	`69`	`implementation "org.slf4j:slf4j-api:${slf4jVersion}"`
	`70`	`+ implementation 'org.jspecify:jspecify:1.0.0'`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`dependencyCheck {`
`@@ -195,7 +196,7 @@ testing {`
`195`	`196`	`configureEach {`
`196`	`197`	`useJUnitJupiter()`
`197`	`198`	`dependencies {`
`198`		`- implementation 'org.junit.jupiter:junit-jupiter:5.12.0'`
	`199`	`+ implementation 'org.junit.jupiter:junit-jupiter:5.12.2'`
`199`	`200`	`runtimeOnly 'org.junit.platform:junit-platform-launcher'`
`200`	`201`	`implementation 'org.hamcrest:hamcrest:3.0'`
`201`	`202`	`runtimeOnly "org.slf4j:slf4j-simple:${slf4jVersion}"`
`@@ -213,7 +214,7 @@ testing {`
`213`	`214`	`test {`
`214`	`215`	`dependencies {`
`215`	`216`	`implementation "org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}"`
`216`		`- implementation('io.github.bonigarcia:webdrivermanager:5.9.3') {`
	`217`	`+ implementation('io.github.bonigarcia:webdrivermanager:6.0.1') {`
`217`	`218`	`exclude group: 'org.seleniumhq.selenium'`
`218`	`219`	`}`
`219`	`220`	`}`
`@@ -257,7 +258,7 @@ testing {`
`257`	`258`	`dependencies {`
`258`	`259`	`implementation project()`
`259`	`260`	`implementation(sourceSets.test.output)`
`260`		`- implementation('io.github.bonigarcia:webdrivermanager:5.9.3') {`
	`261`	`+ implementation('io.github.bonigarcia:webdrivermanager:6.0.1') {`
`261`	`262`	`exclude group: 'org.seleniumhq.selenium'`
`262`	`263`	`}`
`263`	`264`	`}`