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;
 
@@ -665,7 +664,6 @@ public GrpcCallContext withRequestParamsDynamicHeaderOption(String requestParams
 
   /** {@inheritDoc} */
   @Override
-  @Nonnull
   public ApiTracer getTracer() {
     ApiTracer tracer = callOptions.getOption(TRACER_KEY);
     if (tracer == null) {
@@ -676,7 +674,7 @@ public ApiTracer getTracer() {
 
   /** {@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/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;
 
@@ -588,7 +587,6 @@ public HttpJsonCallContext withDeadline(org.threeten.bp.Instant newDeadline) {
     return withCallOptions(builder.setDeadline(newDeadline).build());
   }
 
-  @Nonnull
   @Override
   public ApiTracer getTracer() {
     if (tracer == null) {
@@ -599,7 +597,7 @@ public ApiTracer getTracer() {
 
   /** {@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/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;
 
@@ -503,7 +502,7 @@ void add(
       totalThrottledTimeMs += throttledTimeMs;
     }
 
-    void setResponseFuture(@Nonnull ApiFuture<ResponseT> responseFuture) {
+    void setResponseFuture(ApiFuture<ResponseT> responseFuture) {
       Preconditions.checkNotNull(responseFuture);
       this.responseFuture = responseFuture;
     }

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

@@ -36,7 +36,6 @@
 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;
 
 /**
@@ -50,7 +49,6 @@ public static RetryingContext create() {
   }
 
   /** {@inheritDoc} */
-  @Nonnull
   @Override
   public ApiTracer getTracer() {
     return BaseApiTracer.getInstance();

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

@@ -33,7 +33,6 @@
 import com.google.api.gax.rpc.StatusCode;
 import com.google.api.gax.tracing.ApiTracer;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -46,7 +45,6 @@
 @BetaApi("The surface for passing per operation state is not yet stable")
 public interface RetryingContext {
   /** Returns the {@link ApiTracer} associated with the current operation. */
-  @Nonnull
   ApiTracer getTracer();
 
   /**

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

@@ -32,7 +32,6 @@
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalExtensionOnly;
 import java.util.concurrent.Callable;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -46,6 +45,5 @@
 @BetaApi("The surface for per invocation state is unstable and will probably change in the future")
 @InternalExtensionOnly
 public interface RetryingExecutorWithContext<ResponseT> extends RetryingExecutor<ResponseT> {
-  RetryingFuture<ResponseT> createFuture(
-      @Nonnull Callable<ResponseT> callable, @Nonnull RetryingContext context);
+  RetryingFuture<ResponseT> createFuture(Callable<ResponseT> callable, RetryingContext context);
 }

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

@@ -29,7 +29,6 @@
  */
 package com.google.api.gax.retrying;
 
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -43,7 +42,6 @@
 public interface StreamResumptionStrategy<RequestT, ResponseT> {
 
   /** Creates a new instance of this StreamResumptionStrategy without accumulated state */
-  @Nonnull
   StreamResumptionStrategy<RequestT, ResponseT> createNew();
 
   /**
@@ -60,7 +58,6 @@ public interface StreamResumptionStrategy<RequestT, ResponseT> {
    *       through this method.
    * </ol>
    */
-  @Nonnull
   ResponseT processResponse(ResponseT response);
 
   /**

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ApiCallContext.java

@@ -41,7 +41,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -175,7 +174,6 @@ public interface ApiCallContext extends RetryingContext {
    * events like retries.
    */
   @BetaApi("The surface for tracing is not stable yet and may change in the future")
-  @Nonnull
   ApiTracer getTracer();
 
   /**
@@ -187,7 +185,7 @@ public interface ApiCallContext extends RetryingContext {
    * @param tracer the {@link ApiTracer} to set.
    */
   @BetaApi("The surface for tracing is not stable yet and may change in the future")
-  ApiCallContext withTracer(@Nonnull ApiTracer tracer);
+  ApiCallContext withTracer(ApiTracer tracer);
 
   /**
    * Returns a new ApiCallContext with the given {@link RetrySettings} set.

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java

@@ -64,7 +64,6 @@
 import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -106,13 +105,11 @@ public abstract class ClientContext {
   public abstract @Nullable Watchdog getStreamWatchdog();
 
   /** This method is obsolete. Use {@link #getStreamWatchdogCheckIntervalDuration()} instead. */
-  @Nonnull
   @ObsoleteApi("Use getStreamWatchdogCheckIntervalDuration() instead")
   public final org.threeten.bp.Duration getStreamWatchdogCheckInterval() {
     return toThreetenDuration(getStreamWatchdogCheckIntervalDuration());
   }
 
-  @Nonnull
   public abstract java.time.Duration getStreamWatchdogCheckIntervalDuration();
 
   public abstract @Nullable String getUniverseDomain();
@@ -126,7 +123,6 @@ public final org.threeten.bp.Duration getStreamWatchdogCheckInterval() {
 
   /** Gets the {@link ApiTracerFactory} that will be used to generate traces for operations. */
   @BetaApi("The surface for tracing is not stable yet and may change in the future.")
-  @Nonnull
   public abstract ApiTracerFactory getTracerFactory();
 
   /**

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java

@@ -39,7 +39,6 @@
 import com.google.common.base.MoreObjects;
 import java.io.IOException;
 import java.util.concurrent.Executor;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -121,13 +120,11 @@
   }
 
   /** This method is obsolete. Use {@link #getWatchdogCheckIntervalDuration()} instead. */
-  @Nonnull
   @ObsoleteApi("Use getWatchdogCheckIntervalDuration() instead")
   public final org.threeten.bp.Duration getWatchdogCheckInterval() {
     return stubSettings.getStreamWatchdogCheckInterval();
   }
 
-  @Nonnull
   public final java.time.Duration getWatchdogCheckIntervalDuration() {
     return stubSettings.getStreamWatchdogCheckIntervalDuration();
   }
@@ -296,7 +293,7 @@
     }
 
     public B setWatchdogCheckIntervalDuration(java.time.@Nullable Duration checkInterval) {
       stubSettings.setStreamWatchdogCheckIntervalDuration(checkInterval);
       return self();
     }
 

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java

@@ -34,7 +34,6 @@
 import com.google.api.core.ObsoleteApi;
 import java.time.Duration;
 import java.util.concurrent.ScheduledExecutorService;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -64,7 +63,7 @@ public boolean needsClock() {
   }
 
   @Override
-  public WatchdogProvider withClock(@Nonnull ApiClock clock) {
+  public WatchdogProvider withClock(ApiClock clock) {
     throw new UnsupportedOperationException("FixedWatchdogProvider doesn't need a clock");
   }
 

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java

@@ -36,7 +36,6 @@
 import com.google.api.core.ObsoleteApi;
 import com.google.common.base.Preconditions;
 import java.util.concurrent.ScheduledExecutorService;
-import javax.annotation.Nonnull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -72,7 +71,7 @@
   }
 
   @Override
-  public WatchdogProvider withClock(@Nonnull ApiClock clock) {
+  public WatchdogProvider withClock(ApiClock clock) {
     return new InstantiatingWatchdogProvider(
         Preconditions.checkNotNull(clock), executor, checkInterval);
   }
@@ -87,12 +86,12 @@
    */
   @Override
   @ObsoleteApi("Use withCheckIntervalDuration(java.time.Duration) instead")
-  public WatchdogProvider withCheckInterval(@Nonnull org.threeten.bp.Duration checkInterval) {
+  public WatchdogProvider withCheckInterval(org.threeten.bp.Duration checkInterval) {
     return withCheckIntervalDuration(toJavaTimeDuration(checkInterval));
   }
 
   @Override
-  public WatchdogProvider withCheckIntervalDuration(@Nonnull java.time.Duration checkInterval) {
+  public WatchdogProvider withCheckIntervalDuration(java.time.Duration checkInterval) {
     return new InstantiatingWatchdogProvider(
         clock, executor, Preconditions.checkNotNull(checkInterval));
   }