[not for review yet] deps: changing jsr305 to jspecify

api-common-java/pom.xml

@@ -51,9 +51,9 @@
             <version>${auto-value.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>

api-common-java/src/main/java/com/google/api/core/AbstractApiFuture.java

@@ -35,7 +35,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /** Abstract implementation of ApiFuture that mirrors {@code AbstractFuture} in Guava. */
 public abstract class AbstractApiFuture<V> implements ApiFuture<V> {

api-common-java/src/main/java/com/google/api/core/ApiFutures.java

@@ -39,7 +39,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import java.util.concurrent.Executor;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /** Static utility methods for the {@link ApiFuture} interface. */
 public final class ApiFutures {

api-common-java/src/main/java/com/google/api/pathtemplate/PathTemplate.java

@@ -47,7 +47,7 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents a path template.

api-common-java/src/main/java/com/google/api/pathtemplate/TemplatedResourceName.java

@@ -37,7 +37,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Class for representing and working with resource names.

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnnotationNode.java

@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class AnnotationNode implements AstNode {

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ClassDefinition.java

@@ -21,7 +21,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class ClassDefinition implements AstNode {

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ConcreteReference.java

@@ -19,7 +19,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class ConcreteReference implements Reference {

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodDefinition.java

@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class MethodDefinition implements AstNode {

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodInvocationExpr.java

@@ -19,7 +19,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class MethodInvocationExpr implements Expr {

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Reference.java

@@ -16,7 +16,7 @@
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public interface Reference extends AstNode {
   @Override

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThrowExpr.java

@@ -16,7 +16,7 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class ThrowExpr implements Expr {

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TryCatchStatement.java

@@ -20,8 +20,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class TryCatchStatement implements Statement {
@@ -60,7 +60,7 @@ public abstract static class Builder {
 
     public abstract Builder setIsSampleCode(boolean isSampleCode);
 
-    public Builder addCatch(@Nonnull VariableExpr variableExpr, List<Statement> body) {
+    public Builder addCatch(@NonNull VariableExpr variableExpr, List<Statement> body) {
       List<VariableExpr> catchVarExprs = new ArrayList<>(catchVariableExprs());
       catchVarExprs.add(variableExpr);
       setCatchVariableExprs(catchVarExprs);

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeNode.java

@@ -21,7 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class TypeNode implements AstNode, Comparable<TypeNode> {

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VaporReference.java

@@ -20,7 +20,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class VaporReference implements Reference {

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VariableExpr.java

@@ -22,7 +22,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class VariableExpr implements Expr {

gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java

@@ -69,8 +69,8 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
 public class ImportWriterVisitor implements AstNodeVisitor {
   private static final String DOT = ".";
@@ -91,12 +91,12 @@ public void clear() {
     importShortNames.clear();
   }
 
-  public void initialize(@Nonnull String currentPackage) {
+  public void initialize(@NonNull String currentPackage) {
     this.currentPackage = currentPackage;
     currentClassName = null;
   }
 
-  public void initialize(@Nonnull String currentPackage, @Nonnull String currentClassName) {
+  public void initialize(@NonNull String currentPackage, @NonNull String currentClassName) {
     this.currentPackage = currentPackage;
     this.currentClassName = currentClassName;
   }

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java

@@ -119,7 +119,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Generated;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.threeten.bp.Duration;
 
 public abstract class AbstractServiceStubSettingsClassComposer implements ClassComposer {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java

@@ -95,7 +95,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import javax.annotation.Generated;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public abstract class AbstractTransportServiceStubClassComposer implements ClassComposer {
   private static final Statement EMPTY_LINE_STATEMENT = EmptyLineStatement.create();

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java

@@ -20,7 +20,7 @@
 import com.google.api.generator.gapic.model.Transport;
 import com.google.auto.value.AutoValue;
 import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class TransportContext {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Field.java

@@ -19,7 +19,7 @@
 import com.google.auto.value.AutoValue;
 import java.util.Objects;
 import java.util.Optional;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class Field {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicBatchingSettings.java

@@ -17,7 +17,7 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class GapicBatchingSettings {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicContext.java

@@ -25,7 +25,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class GapicContext {
@@ -67,8 +67,7 @@ public GapicMetadata gapicMetadata() {
   @Nullable
   public abstract GapicServiceConfig serviceConfig();
 
-  @Nullable
-  public abstract com.google.api.Service serviceYamlProto();
+  public abstract com.google.api.@Nullable Service serviceYamlProto();
 
   public boolean containsServices() {
     return !services().isEmpty();

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java

@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class HttpBindings {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/LongrunningOperation.java

@@ -16,7 +16,7 @@
 
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.auto.value.AutoValue;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class LongrunningOperation {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Message.java

@@ -31,7 +31,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class Message {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Method.java

@@ -19,7 +19,7 @@
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class Method {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceName.java

@@ -26,7 +26,7 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class ResourceName {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Service.java

@@ -21,7 +21,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import java.util.List;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @AutoValue
 public abstract class Service {

gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/SourceCodeInfoLocation.java

@@ -15,20 +15,20 @@
 package com.google.api.generator.gapic.model;
 
 import com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location;
-import javax.annotation.Nonnull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * A light wrapper around SourceCodeInfo.Location to provide cleaner protobuf comments. Please see
  * additional documentation on descriptor.proto.
  */
 public class SourceCodeInfoLocation {
-  @Nonnull private final Location location;
+  @NonNull private final Location location;
 
   private SourceCodeInfoLocation(Location location) {
     this.location = location;
   }
 
-  public static SourceCodeInfoLocation create(@Nonnull Location location) {
+  public static SourceCodeInfoLocation create(@NonNull Location location) {
     return new SourceCodeInfoLocation(location);
   }
 

gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/ResourceReferenceParser.java

@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public class ResourceReferenceParser {
   private static final String EMPTY_STRING = "";

gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/SourceCodeInfoParser.java

@@ -35,7 +35,7 @@
 import com.google.protobuf.Descriptors.OneofDescriptor;
 import com.google.protobuf.Descriptors.ServiceDescriptor;
 import java.util.Map;
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A helper class which provides protocol buffer source info for descriptors.

gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/TypeParser.java

@@ -34,7 +34,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
+import org.jspecify.annotations.NonNull;
 
 public class TypeParser {
   private static Reference REFERENCE_BYTE_STRING = ConcreteReference.withClazz(ByteString.class);
@@ -62,7 +62,7 @@ public class TypeParser {
           .put(JavaType.BYTE_STRING, REFERENCE_BYTE_STRING)
           .build();
 
-  public static TypeNode parseType(@Nonnull FieldDescriptor field) {
+  public static TypeNode parseType(@NonNull FieldDescriptor field) {
     if (field.isMapField()) {
       return createMapType(field);
     }
@@ -83,11 +83,11 @@ public static TypeNode parseType(@Nonnull FieldDescriptor field) {
     return TypeNode.withReference(parseFieldReference(field));
   }
 
-  public static TypeNode parseType(@Nonnull Descriptor messageDescriptor) {
+  public static TypeNode parseType(@NonNull Descriptor messageDescriptor) {
     return TypeNode.withReference(parseMessageReference(messageDescriptor));
   }
 
-  public static TypeNode parseType(@Nonnull EnumDescriptor enumDescriptor) {
+  public static TypeNode parseType(@NonNull EnumDescriptor enumDescriptor) {
     return TypeNode.withReference(parseEnumReference(enumDescriptor));
   }
 
@@ -119,7 +119,7 @@ static Reference parseFieldReference(FieldDescriptor field) {
   }
 
   @VisibleForTesting
-  static Reference parseMessageReference(@Nonnull Descriptor messageDescriptor) {
+  static Reference parseMessageReference(@NonNull Descriptor messageDescriptor) {
     List<String> outerNestedTypeNames = new ArrayList<>();
     FileOptions fileOptions = messageDescriptor.getFile().getOptions();
     String javaOuterClassname =
@@ -179,7 +179,7 @@ static Reference parseMessageReference(@Nonnull Descriptor messageDescriptor) {
   }
 
   @VisibleForTesting
-  static Reference parseEnumReference(@Nonnull EnumDescriptor enumDescriptor) {
+  static Reference parseEnumReference(@NonNull EnumDescriptor enumDescriptor) {
     // This is similar to parseMessageReference, but we make it a separate method because
     // EnumDescriptor and Descriptor are sibling types.
     FileOptions fileOptions = enumDescriptor.getFile().getOptions();