use jspecify annotations

client/pom.xml

@@ -48,6 +48,11 @@
 
     <dependencies>
         <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>

client/src/main/java/org/asynchttpclient/AsyncCompletionHandler.java

@@ -18,7 +18,7 @@
 
 import io.netty.handler.codec.http.HttpHeaders;
 import org.asynchttpclient.handler.ProgressAsyncHandler;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/org/asynchttpclient/AsyncCompletionHandlerBase.java

@@ -16,8 +16,7 @@
  */
 package org.asynchttpclient;
 
-
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Simple {@link AsyncHandler} of type {@link Response}

client/src/main/java/org/asynchttpclient/AsyncHandler.java

@@ -18,7 +18,7 @@
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.HttpHeaders;
 import org.asynchttpclient.netty.request.NettyRequest;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import javax.net.ssl.SSLSession;
 import java.net.InetSocketAddress;

client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

@@ -34,7 +34,7 @@
 import org.asynchttpclient.netty.channel.ConnectionSemaphoreFactory;
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.proxy.ProxyServerSelector;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -263,14 +263,12 @@ public interface AsyncHttpClientConfig {
     /**
      * @return the array of enabled protocols
      */
-    @Nullable
-    String[] getEnabledProtocols();
+    String @Nullable[] getEnabledProtocols();
 
     /**
      * @return the array of enabled cipher suites
      */
-    @Nullable
-    String[] getEnabledCipherSuites();
+    String @Nullable[] getEnabledCipherSuites();
 
     /**
      * @return if insecure cipher suites must be filtered out (only used when not explicitly passing enabled cipher suites)

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClient.java

@@ -30,7 +30,7 @@
 import org.asynchttpclient.handler.resumable.ResumableAsyncHandler;
 import org.asynchttpclient.netty.channel.ChannelManager;
 import org.asynchttpclient.netty.request.NettyRequestSender;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java

@@ -34,7 +34,7 @@
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.proxy.ProxyServerSelector;
 import org.asynchttpclient.util.ProxyUtils;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.time.Duration;
 import java.util.Collections;
@@ -158,8 +158,8 @@ public class DefaultAsyncHttpClientConfig implements AsyncHttpClientConfig {
     private final boolean useInsecureTrustManager;
     private final boolean disableHttpsEndpointIdentificationAlgorithm;
     private final int handshakeTimeout;
-    private final @Nullable String[] enabledProtocols;
-    private final @Nullable String[] enabledCipherSuites;
+    private final String @Nullable[] enabledProtocols;
+    private final String @Nullable[] enabledCipherSuites;
     private final boolean filterInsecureCipherSuites;
     private final int sslSessionCacheSize;
     private final int sslSessionTimeout;
@@ -244,8 +244,8 @@ private DefaultAsyncHttpClientConfig(// http
                                          boolean useInsecureTrustManager,
                                          boolean disableHttpsEndpointIdentificationAlgorithm,
                                          int handshakeTimeout,
-                                         @Nullable String[] enabledProtocols,
-                                         @Nullable String[] enabledCipherSuites,
+            String @Nullable[] enabledProtocols,
+            String @Nullable[] enabledCipherSuites,
                                          boolean filterInsecureCipherSuites,
                                          int sslSessionCacheSize,
                                          int sslSessionTimeout,
@@ -586,12 +586,12 @@ public int getHandshakeTimeout() {
     }
 
     @Override
-    public @Nullable String[] getEnabledProtocols() {
+    public String @Nullable[] getEnabledProtocols() {
         return enabledProtocols;
     }
 
     @Override
-    public @Nullable String[] getEnabledCipherSuites() {
+    public String @Nullable[] getEnabledCipherSuites() {
         return enabledCipherSuites;
     }
 
@@ -831,8 +831,8 @@ public static class Builder {
         private boolean useInsecureTrustManager = defaultUseInsecureTrustManager();
         private boolean disableHttpsEndpointIdentificationAlgorithm = defaultDisableHttpsEndpointIdentificationAlgorithm();
         private int handshakeTimeout = defaultHandshakeTimeout();
-        private @Nullable String[] enabledProtocols = defaultEnabledProtocols();
-        private @Nullable String[] enabledCipherSuites = defaultEnabledCipherSuites();
+        private String @Nullable[] enabledProtocols = defaultEnabledProtocols();
+        private String @Nullable[] enabledCipherSuites = defaultEnabledCipherSuites();
         private boolean filterInsecureCipherSuites = defaultFilterInsecureCipherSuites();
         private int sslSessionCacheSize = defaultSslSessionCacheSize();
         private int sslSessionTimeout = defaultSslSessionTimeout();

client/src/main/java/org/asynchttpclient/DefaultRequest.java

@@ -24,7 +24,7 @@
 import org.asynchttpclient.request.body.generator.BodyGenerator;
 import org.asynchttpclient.request.body.multipart.Part;
 import org.asynchttpclient.uri.Uri;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.File;
 import java.io.InputStream;

client/src/main/java/org/asynchttpclient/Param.java

@@ -15,7 +15,7 @@
  */
 package org.asynchttpclient;
 
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;

client/src/main/java/org/asynchttpclient/Realm.java

@@ -20,7 +20,7 @@
 import org.asynchttpclient.util.AuthenticatorUtils;
 import org.asynchttpclient.util.StringBuilderPool;
 import org.asynchttpclient.util.StringUtils;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.nio.charset.Charset;
 import java.security.MessageDigest;

client/src/main/java/org/asynchttpclient/Request.java

@@ -25,7 +25,7 @@
 import org.asynchttpclient.request.body.generator.BodyGenerator;
 import org.asynchttpclient.request.body.multipart.Part;
 import org.asynchttpclient.uri.Uri;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.File;
 import java.io.InputStream;

client/src/main/java/org/asynchttpclient/RequestBuilderBase.java

@@ -29,7 +29,7 @@
 import org.asynchttpclient.uri.Uri;
 import org.asynchttpclient.util.EnsuresNonNull;
 import org.asynchttpclient.util.UriEncoder;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/org/asynchttpclient/Response.java

@@ -21,7 +21,7 @@
 import io.netty.handler.codec.http.cookie.Cookie;
 import org.asynchttpclient.netty.NettyResponse;
 import org.asynchttpclient.uri.Uri;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.InputStream;
 import java.net.SocketAddress;

client/src/main/java/org/asynchttpclient/channel/ChannelPool.java

@@ -16,7 +16,7 @@
 package org.asynchttpclient.channel;
 
 import io.netty.channel.Channel;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.function.Predicate;

client/src/main/java/org/asynchttpclient/channel/ChannelPoolPartitioning.java

@@ -18,7 +18,7 @@
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.proxy.ProxyType;
 import org.asynchttpclient.uri.Uri;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 

client/src/main/java/org/asynchttpclient/channel/NoopChannelPool.java

@@ -16,7 +16,7 @@
 package org.asynchttpclient.channel;
 
 import io.netty.channel.Channel;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.Map;

client/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigDefaults.java

@@ -15,7 +15,7 @@
  */
 package org.asynchttpclient.config;
 
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -159,11 +159,11 @@ public static String defaultUserAgent() {
         return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getString(ASYNC_CLIENT_CONFIG_ROOT + USER_AGENT_CONFIG);
     }
 
-    public static @Nullable String[] defaultEnabledProtocols() {
+    public static String @Nullable[] defaultEnabledProtocols() {
         return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getStringArray(ASYNC_CLIENT_CONFIG_ROOT + ENABLED_PROTOCOLS_CONFIG);
     }
 
-    public static @Nullable String[] defaultEnabledCipherSuites() {
+    public static String @Nullable[] defaultEnabledCipherSuites() {
         return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getStringArray(ASYNC_CLIENT_CONFIG_ROOT + ENABLED_CIPHER_SUITES_CONFIG);
     }
 

client/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigHelper.java

@@ -15,7 +15,7 @@
  */
 package org.asynchttpclient.config;
 
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -105,8 +105,8 @@ public String getString(String key) {
             });
         }
 
-        @Nullable
-        public String[] getStringArray(String key) {
+
+        public String @Nullable[] getStringArray(String key) {
             String s = getString(key);
             s = s.trim();
             if (s.isEmpty()) {

client/src/main/java/org/asynchttpclient/cookie/ThreadSafeCookieStore.java

@@ -18,8 +18,8 @@
 import io.netty.handler.codec.http.cookie.Cookie;
 import org.asynchttpclient.uri.Uri;
 import org.asynchttpclient.util.MiscUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -246,7 +246,7 @@ private static class CookieKey implements Comparable<CookieKey> {
         }
 
         @Override
-        public int compareTo(@NotNull CookieKey cookieKey) {
+        public int compareTo(@NonNull CookieKey cookieKey) {
             requireNonNull(cookieKey, "Parameter can't be null");
 
             int result;

client/src/main/java/org/asynchttpclient/filter/FilterContext.java

@@ -17,7 +17,7 @@
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.HttpResponseStatus;
 import org.asynchttpclient.Request;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 

client/src/main/java/org/asynchttpclient/handler/BodyDeferringAsyncHandler.java

@@ -17,7 +17,7 @@
 import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.HttpResponseStatus;
 import org.asynchttpclient.Response;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

client/src/main/java/org/asynchttpclient/handler/TransferCompletionHandler.java

@@ -17,7 +17,7 @@
 import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.Response;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/org/asynchttpclient/handler/resumable/ResumableAsyncHandler.java

@@ -21,7 +21,7 @@
 import org.asynchttpclient.Response;
 import org.asynchttpclient.Response.ResponseBuilder;
 import org.asynchttpclient.handler.TransferCompletionHandler;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/org/asynchttpclient/ntlm/NtlmEngine.java

@@ -28,7 +28,7 @@
 package org.asynchttpclient.ntlm;
 
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;

client/src/main/java/org/asynchttpclient/ntlm/NtlmEngineException.java

@@ -25,8 +25,7 @@
  */
 package org.asynchttpclient.ntlm;
 
-
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Signals NTLM protocol failure.

client/src/main/java/org/asynchttpclient/proxy/ProxyServer.java

@@ -19,7 +19,7 @@
 import io.netty.handler.codec.http.HttpHeaders;
 import org.asynchttpclient.Realm;
 import org.asynchttpclient.Request;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;

client/src/main/java/org/asynchttpclient/proxy/ProxyServerSelector.java

@@ -16,7 +16,7 @@
 package org.asynchttpclient.proxy;
 
 import org.asynchttpclient.uri.Uri;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Selector for a proxy server

client/src/main/java/org/asynchttpclient/spnego/NamePasswordCallbackHandler.java

@@ -15,7 +15,7 @@
  */
 package org.asynchttpclient.spnego;
 
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/org/asynchttpclient/spnego/SpnegoEngine.java

@@ -42,7 +42,7 @@
 import org.ietf.jgss.GSSManager;
 import org.ietf.jgss.GSSName;
 import org.ietf.jgss.Oid;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

client/src/main/java/org/asynchttpclient/spnego/SpnegoEngineException.java

@@ -15,7 +15,7 @@
  */
 package org.asynchttpclient.spnego;
 
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Signals SPNEGO protocol failure.

client/src/main/java/org/asynchttpclient/uri/Uri.java

@@ -16,7 +16,7 @@
 package org.asynchttpclient.uri;
 
 import org.asynchttpclient.util.StringBuilderPool;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.net.URI;
 import java.net.URISyntaxException;

client/src/main/java/org/asynchttpclient/uri/UriParser.java

@@ -15,7 +15,7 @@
  */
 package org.asynchttpclient.uri;
 
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;