cleanup(gax-java): remove javax.annotation.Nonnull usage

sdk-platform-java/gax-java/gax-grpc/pom.xml

@@ -81,11 +81,7 @@
       <artifactId>grpc-googleapis</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <scope>provided</scope>
-    </dependency>
+
     <dependency>
       <groupId>org.graalvm.sdk</groupId>
       <artifactId>nativeimage</artifactId>

sdk-platform-java/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java

@@ -64,7 +64,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -413,7 +412,7 @@
   }
 
   @Override
-  public RetrySettings getRetrySettings() {
+  public @Nullable RetrySettings getRetrySettings() {
     return retrySettings;
   }
 
@@ -436,7 +435,7 @@
   }
 
   @Override
-  public Set<StatusCode.Code> getRetryableCodes() {
+  public @Nullable Set<StatusCode.Code> getRetryableCodes() {
     return retryableCodes;
   }
 
@@ -665,7 +664,6 @@
 
   /** {@inheritDoc} */
   @Override
-  @Nonnull
   public ApiTracer getTracer() {
     ApiTracer tracer = callOptions.getOption(TRACER_KEY);
     if (tracer == null) {
@@ -676,7 +674,7 @@
 
   /** {@inheritDoc} */
   @Override
-  public GrpcCallContext withTracer(@Nonnull ApiTracer tracer) {
+  public GrpcCallContext withTracer(ApiTracer tracer) {
     Preconditions.checkNotNull(tracer);
     return withCallOptions(callOptions.withOption(TRACER_KEY, tracer));
   }

sdk-platform-java/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallableFactory.java

@@ -60,7 +60,6 @@
 import com.google.longrunning.Operation;
 import com.google.longrunning.stub.OperationsStub;
 import io.grpc.MethodDescriptor;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 
 /** Class with utility methods to create grpc-based direct callables. */
@@ -330,7 +329,7 @@ ClientStreamingCallable<RequestT, ResponseT> createClientStreamingCallable(
   }
 
   @VisibleForTesting
-  static ApiTracerContext getApiTracerContext(@Nonnull MethodDescriptor<?, ?> methodDescriptor) {
+  static ApiTracerContext getApiTracerContext(MethodDescriptor<?, ?> methodDescriptor) {
     return ApiTracerContext.newBuilder()
         .setFullMethodName(methodDescriptor.getFullMethodName())
         .setTransport(ApiTracerContext.Transport.GRPC)

sdk-platform-java/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java

@@ -266,9 +266,8 @@ public boolean needsExecutor() {
     return executor == null;
   }
 
-  @Nullable
   @Override
-  public Executor getExecutor() {
+  public @Nullable Executor getExecutor() {
     return executor;
   }
 
@@ -541,9 +540,9 @@ boolean canUseDirectPathWithUniverseDomain() {
     return endpoint.contains(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
-  @Nullable
   @VisibleForTesting
-  ChannelCredentials createMtlsChannelCredentials() throws IOException, GeneralSecurityException {
+  @Nullable ChannelCredentials createMtlsChannelCredentials()
+      throws IOException, GeneralSecurityException {
     if (mtlsProvider == null) {
       return null;
     }
@@ -609,9 +608,8 @@ ChannelCredentials createMtlsChannelCredentials() throws IOException, GeneralSec
    * @return {@link ChannelCredentials} to use to create an mtls connection between client and S2A
    * @throws IOException on error
    */
-  @Nullable
   @VisibleForTesting
-  ChannelCredentials createMtlsToS2AChannelCredentials(
+  @Nullable ChannelCredentials createMtlsToS2AChannelCredentials(
       File trustBundle, File privateKey, File certChain) throws IOException {
     if (trustBundle == null || privateKey == null || certChain == null) {
       return null;

sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/GrpcDirectStreamControllerTest.java

@@ -52,8 +52,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
@@ -68,21 +67,19 @@ void testRetryNoRaceCondition() throws Exception {
         ManagedChannelBuilder.forAddress("localhost", 1234).usePlaintext().build();
     StreamResumptionStrategy<Color, Money> resumptionStrategy =
         new StreamResumptionStrategy<Color, Money>() {
-          @Nonnull
+
           @Override
           public StreamResumptionStrategy<Color, Money> createNew() {
             return this;
           }
 
-          @Nonnull
           @Override
           public Money processResponse(Money response) {
             return response;
           }
 
-          @Nullable
           @Override
-          public Color getResumeRequest(Color originalRequest) {
+          public @Nullable Color getResumeRequest(Color originalRequest) {
             return originalRequest;
           }
 

sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java

@@ -81,7 +81,7 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -560,8 +560,7 @@ void testWithDefaultDirectPathServiceConfig() {
     assertThat(lbConfig.keySet()).containsExactly("pick_first");
   }
 
-  @Nullable
-  private static Map<String, ?> getAsObject(Map<String, ?> json, String key) {
+  private static @Nullable Map<String, ?> getAsObject(Map<String, ?> json, String key) {
     Object mapObject = json.get(key);
     if (mapObject == null) {
       return null;

sdk-platform-java/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockClientCall.java

@@ -32,7 +32,7 @@
 import io.grpc.ClientCall;
 import io.grpc.Metadata;
 import io.grpc.Status;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class MockClientCall<RequestT, ResponseT> extends ClientCall<RequestT, ResponseT> {
 

sdk-platform-java/gax-java/gax-httpjson/pom.xml

@@ -72,11 +72,7 @@
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <scope>provided</scope>
-    </dependency>
+
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>

sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java

@@ -55,7 +55,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -510,7 +509,7 @@
   }
 
   @Override
-  public RetrySettings getRetrySettings() {
+  public @Nullable RetrySettings getRetrySettings() {
     return retrySettings;
   }
 
@@ -531,7 +530,7 @@
   }
 
   @Override
-  public Set<StatusCode.Code> getRetryableCodes() {
+  public @Nullable Set<StatusCode.Code> getRetryableCodes() {
     return retryableCodes;
   }
 
@@ -588,7 +587,6 @@
     return withCallOptions(builder.setDeadline(newDeadline).build());
   }
 
-  @Nonnull
   @Override
   public ApiTracer getTracer() {
     if (tracer == null) {
@@ -599,7 +597,7 @@
 
   /** {@inheritDoc} */
   @Override
-  public HttpJsonCallContext withTracer(@Nonnull ApiTracer newTracer) {
+  public HttpJsonCallContext withTracer(ApiTracer newTracer) {
     Preconditions.checkNotNull(newTracer);
     HttpJsonCallOptions newCallOptions = callOptions.toBuilder().setTracer(newTracer).build();
 

sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java

@@ -45,7 +45,6 @@
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.api.gax.tracing.ApiTracerContext;
 import com.google.api.gax.tracing.TracedUnaryCallable;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 
 /** Class with utility methods to create http/json-based direct callables. */
@@ -222,7 +221,7 @@ ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
     return callable.withDefaultCallContext(clientContext.getDefaultCallContext());
   }
 
-  static ApiTracerContext getApiTracerContext(@Nonnull ApiMethodDescriptor<?, ?> methodDescriptor) {
+  static ApiTracerContext getApiTracerContext(ApiMethodDescriptor<?, ?> methodDescriptor) {
     return ApiTracerContext.newBuilder()
         .setFullMethodName(methodDescriptor.getFullMethodName())
         .setHttpMethod(methodDescriptor.getHttpMethod())

sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestRunnable.java

@@ -291,13 +291,11 @@ interface ResultListener {
 
   @AutoValue
   abstract static class RunnableResult {
-    @Nullable
-    abstract HttpJsonMetadata getResponseHeaders();
+    abstract @Nullable HttpJsonMetadata getResponseHeaders();
 
     abstract int getStatusCode();
 
-    @Nullable
-    abstract InputStream getResponseContent();
+    abstract @Nullable InputStream getResponseContent();
 
     abstract HttpJsonMetadata getTrailers();
 

sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/InstantiatingHttpJsonChannelProvider.java

@@ -110,9 +110,8 @@ public boolean needsExecutor() {
     return executor == null;
   }
 
-  @Nullable
   @Override
-  public Executor getExecutor() {
+  public @Nullable Executor getExecutor() {
     return executor;
   }
 

sdk-platform-java/gax-java/gax/pom.xml

@@ -61,11 +61,7 @@
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <scope>provided</scope>
-    </dependency>
+
     <dependency>
       <groupId>org.graalvm.sdk</groupId>
       <artifactId>nativeimage</artifactId>

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java

@@ -64,7 +64,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -98,10 +97,10 @@
   private final Object flushLock = new Object();
   private final Object elementLock = new Object();
   private final Future<?> scheduledFuture;
-  private SettableApiFuture<Void> closeFuture;
+  private @Nullable SettableApiFuture<Void> closeFuture;
   private final BatcherStats batcherStats = new BatcherStats();
   private final FlowController flowController;
-  private final ApiCallContext callContext;
+  private final @Nullable ApiCallContext callContext;
 
   // If element threshold or bytes threshold is 0, it means that it'll always flush every element
   // without batching
@@ -479,7 +478,7 @@
     private long totalThrottledTimeMs = 0;
     private BatchResource resource;
 
-    private volatile ApiFuture<ResponseT> responseFuture;
+    private volatile @Nullable ApiFuture<ResponseT> responseFuture;
 
     private Batch(
         RequestT prototype,
@@ -503,7 +502,7 @@
       totalThrottledTimeMs += throttledTimeMs;
     }
 
-    void setResponseFuture(@Nonnull ApiFuture<ResponseT> responseFuture) {
+    void setResponseFuture(ApiFuture<ResponseT> responseFuture) {
       Preconditions.checkNotNull(responseFuture);
       this.responseFuture = responseFuture;
     }
@@ -562,7 +561,7 @@
   static class PushCurrentBatchRunnable<ElementT, ElementResultT, RequestT, ResponseT>
       implements Runnable {
 
-    private Future<?> scheduledFuture;
+    private @Nullable Future<?> scheduledFuture;
     private final WeakReference<BatcherImpl<ElementT, ElementResultT, RequestT, ResponseT>>
         batcherReferent;
 

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/batching/BatcherStats.java

@@ -135,8 +135,7 @@ synchronized <T extends BatchEntry> void recordBatchElementsCompletion(
   }
 
   /** Calculates and formats the message with request and entry failure count. */
-  @Nullable
-  synchronized BatchingException asException() {
+  synchronized @Nullable BatchingException asException() {
     if (requestExceptionCounts.isEmpty() && requestPartialFailureCount == 0) {
       return null;
     }

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/batching/BatchingException.java

@@ -30,12 +30,13 @@
 package com.google.api.gax.batching;
 
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /** Represents exception occurred during batching. */
 @NullMarked
 public final class BatchingException extends RuntimeException {
 
-  BatchingException(String message) {
+  BatchingException(@Nullable String message) {
     super(message);
   }
 }

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/core/GoogleCredentialsProvider.java

@@ -62,8 +62,7 @@ public abstract class GoogleCredentialsProvider implements CredentialsProvider {
   public abstract boolean getUseJwtAccessWithScope();
 
   @VisibleForTesting
-  @Nullable
-  abstract GoogleCredentials getOAuth2Credentials();
+  abstract @Nullable GoogleCredentials getOAuth2Credentials();
 
   @Override
   public Credentials getCredentials() throws IOException {

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/retrying/NoopRetryingContext.java

@@ -36,8 +36,8 @@
 import com.google.api.gax.tracing.ApiTracer;
 import com.google.api.gax.tracing.BaseApiTracer;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Backwards compatibility class to aid in transition to adding operation state to {@link
@@ -50,19 +50,18 @@
   }
 
   /** {@inheritDoc} */
-  @Nonnull
   @Override
   public ApiTracer getTracer() {
     return BaseApiTracer.getInstance();
   }
 
   @Override
-  public RetrySettings getRetrySettings() {
+  public @Nullable RetrySettings getRetrySettings() {
     return null;
   }
 
   @Override
-  public Set<Code> getRetryableCodes() {
+  public @Nullable Set<Code> getRetryableCodes() {
     return null;
   }
 }