Update to airlift 234

client/trino-cli/pom.xml

@@ -26,8 +26,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -68,6 +68,11 @@
             <artifactId>trino-parser</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>net.sf.opencsv</groupId>
             <artifactId>opencsv</artifactId>

client/trino-cli/src/main/java/io/trino/cli/Pager.java

@@ -14,8 +14,7 @@
 package io.trino.cli;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

client/trino-cli/src/main/java/io/trino/cli/ThreadInterruptor.java

@@ -13,7 +13,7 @@
  */
 package io.trino.cli;
 
-import javax.annotation.concurrent.GuardedBy;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 
 import java.io.Closeable;
 

client/trino-client/pom.xml

@@ -39,8 +39,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -71,6 +71,11 @@
             <version>1.7</version>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>

client/trino-client/src/main/java/io/trino/client/ClientTypeSignature.java

@@ -16,10 +16,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
+import com.google.errorprone.annotations.Immutable;
 import io.trino.client.ClientTypeSignatureParameter.ParameterKind;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;

client/trino-client/src/main/java/io/trino/client/ClientTypeSignatureParameter.java

@@ -21,8 +21,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.io.IOException;
 import java.util.Objects;

client/trino-client/src/main/java/io/trino/client/Column.java

@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import static java.util.Objects.requireNonNull;
 

client/trino-client/src/main/java/io/trino/client/ErrorLocation.java

@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;

client/trino-client/src/main/java/io/trino/client/FailureInfo.java

@@ -16,9 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.regex.Matcher;

client/trino-client/src/main/java/io/trino/client/JsonResponse.java

@@ -14,15 +14,14 @@
 package io.trino.client;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.annotation.Nullable;
 import okhttp3.Headers;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Optional;

client/trino-client/src/main/java/io/trino/client/NodeVersion.java

@@ -15,8 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.Objects;
 

client/trino-client/src/main/java/io/trino/client/QueryError.java

@@ -15,9 +15,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 

client/trino-client/src/main/java/io/trino/client/QueryResults.java

@@ -16,9 +16,8 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.net.URI;
 import java.util.List;

client/trino-client/src/main/java/io/trino/client/Row.java

@@ -14,8 +14,7 @@
 package io.trino.client;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;

client/trino-client/src/main/java/io/trino/client/RowField.java

@@ -13,7 +13,7 @@
  */
 package io.trino.client;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.Objects;
 import java.util.Optional;

client/trino-client/src/main/java/io/trino/client/ServerInfo.java

@@ -15,10 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.errorprone.annotations.Immutable;
 import io.airlift.units.Duration;
 
-import javax.annotation.concurrent.Immutable;
-
 import java.util.Objects;
 import java.util.Optional;
 

client/trino-client/src/main/java/io/trino/client/StageStats.java

@@ -16,8 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
 
 import java.util.List;
 

client/trino-client/src/main/java/io/trino/client/StatementClient.java

@@ -13,7 +13,7 @@
  */
 package io.trino.client;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
 import java.time.ZoneId;

client/trino-client/src/main/java/io/trino/client/StatementClientV1.java

@@ -18,17 +18,16 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.units.Duration;
+import jakarta.annotation.Nullable;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

client/trino-client/src/main/java/io/trino/client/StatementStats.java

@@ -15,9 +15,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import com.google.errorprone.annotations.Immutable;
+import jakarta.annotation.Nullable;
 
 import java.util.OptionalDouble;
 

client/trino-client/src/main/java/io/trino/client/auth/external/ExternalAuthenticator.java

@@ -15,15 +15,14 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.trino.client.ClientException;
+import jakarta.annotation.Nullable;
 import okhttp3.Authenticator;
 import okhttp3.Challenge;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.Route;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;

client/trino-client/src/main/java/io/trino/client/auth/external/LocalKnownToken.java

@@ -13,8 +13,6 @@
  */
 package io.trino.client.auth.external;
 
-import javax.annotation.concurrent.NotThreadSafe;
-
 import java.util.Optional;
 import java.util.function.Supplier;
 
@@ -24,7 +22,7 @@
  * LocalKnownToken class keeps the token on its field
  * and it's designed to use it in fully serialized manner.
  */
-@NotThreadSafe
+// This class is not considered thread-safe.
 class LocalKnownToken
         implements KnownToken
 {

client/trino-client/src/main/java/io/trino/client/auth/external/MemoryCachedKnownToken.java

@@ -13,7 +13,7 @@
  */
 package io.trino.client.auth.external;
 
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
 
 import java.util.Optional;
 import java.util.concurrent.locks.Lock;

client/trino-client/src/main/java/io/trino/client/auth/kerberos/LoginBasedSubjectProvider.java

@@ -14,10 +14,10 @@
 package io.trino.client.auth.kerberos;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import com.sun.security.auth.module.Krb5LoginModule;
 import org.ietf.jgss.GSSException;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.security.auth.Subject;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;

client/trino-client/src/main/java/io/trino/client/auth/kerberos/SpnegoHandler.java

@@ -14,6 +14,7 @@
 package io.trino.client.auth.kerberos;
 
 import com.google.common.base.Splitter;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.airlift.units.Duration;
 import io.trino.client.ClientException;
 import okhttp3.Authenticator;
@@ -27,7 +28,6 @@
 import org.ietf.jgss.GSSManager;
 import org.ietf.jgss.Oid;
 
-import javax.annotation.concurrent.GuardedBy;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
 

client/trino-jdbc/pom.xml

@@ -20,15 +20,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.google.errorprone</groupId>
                     <artifactId>error_prone_annotations</artifactId>
@@ -65,6 +69,11 @@
             <artifactId>trino-client</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -349,10 +358,6 @@
                                     <pattern>io.airlift</pattern>
                                     <shadedPattern>${shadeBase}.airlift</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>javax.annotation</pattern>
-                                    <shadedPattern>${shadeBase}.javax.annotation</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>jakarta.annotation</pattern>
                                     <shadedPattern>${shadeBase}.jakarta.annotation</shadedPattern>
@@ -390,6 +395,7 @@
                                     <excludes>
                                         <exclude>org/jetbrains/**</exclude>
                                         <exclude>org/intellij/**</exclude>
+                                        <exclude>com/google/errorprone/**</exclude>
                                         <exclude>META-INF/maven/**</exclude>
                                         <exclude>META-INF/services/com.fasterxml.**</exclude>
                                         <exclude>META-INF/proguard/**</exclude>

client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java

@@ -658,8 +658,8 @@ public Object getObject(int columnIndex)
         return column(columnIndex);
     }
 
-    @javax.annotation.Nullable
-    private static Object convertFromClientRepresentation(ClientTypeSignature columnType, @javax.annotation.Nullable Object value)
+    @jakarta.annotation.Nullable
+    private static Object convertFromClientRepresentation(ClientTypeSignature columnType, @jakarta.annotation.Nullable Object value)
             throws SQLException
     {
         requireNonNull(columnType, "columnType is null");

client/trino-jdbc/src/main/java/io/trino/jdbc/Row.java

@@ -14,8 +14,7 @@
 package io.trino.jdbc;
 
 import com.google.common.collect.ImmutableList;
-
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;