diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/Main.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/Main.java index 027eedaf811f..444f6333d00b 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/Main.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/Main.java @@ -21,7 +21,9 @@ import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import java.io.IOException; +import org.jspecify.annotations.NullMarked; +@NullMarked public class Main { public static void main(String[] args) throws IOException { ExtensionRegistry registry = ExtensionRegistry.newInstance(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/ProtoRegistry.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/ProtoRegistry.java index ae9c8cc76e70..dcaf6bdd5b46 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/ProtoRegistry.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/ProtoRegistry.java @@ -23,7 +23,9 @@ import com.google.cloud.ExtendedOperationsProto; import com.google.longrunning.OperationsProto; import com.google.protobuf.ExtensionRegistry; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ProtoRegistry { /** Register all extensions needed to process API protofiles. */ public static void registerAllExtensions(ExtensionRegistry extensionRegistry) { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestDumper.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestDumper.java index ef75a6a65291..12442bfbe8fa 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestDumper.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestDumper.java @@ -19,12 +19,14 @@ import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import java.io.IOException; +import org.jspecify.annotations.NullMarked; // Request dumper class, which dumps the CodeGeneratorRequest to a file on disk which will be // identical to the one passed to the Main class during normal execution. The dumped file then can // be used to run this gapic-generator directly (instead of relying on protoc to start the process), // which would give much greater flexibility in terms of debugging features, like attaching a // debugger, easier work with stdout and stderr etc. +@NullMarked public class CodeGeneratorRequestDumper { public static void main(String[] args) throws IOException { ExtensionRegistry registry = ExtensionRegistry.newInstance(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestFileToGapicMain.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestFileToGapicMain.java index 5cbbb0560869..ee06fd64b2a1 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestFileToGapicMain.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/debug/CodeGeneratorRequestFileToGapicMain.java @@ -24,9 +24,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.jspecify.annotations.NullMarked; // A generator entry point class, similar to Main but reads the CodeGeneratorRequest directly from a // file instead of relying on protoc to pipe it in. +@NullMarked public class CodeGeneratorRequestFileToGapicMain { public static void main(String[] args) throws IOException { ExtensionRegistry registry = ExtensionRegistry.newInstance(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnnotationNode.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnnotationNode.java index 7cb0f5ec37fa..c3a1ca504ee8 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnnotationNode.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnnotationNode.java @@ -19,8 +19,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class AnnotationNode implements AstNode { public static AnnotationNode OVERRIDE = @@ -34,8 +36,7 @@ private static TypeNode annotationType(Class clazz) { public abstract TypeNode type(); - @Nullable - public abstract List descriptionExprs(); + public abstract @Nullable List descriptionExprs(); @Override public void accept(AstNodeVisitor visitor) { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnonymousClassExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnonymousClassExpr.java index ac0723c5e7b5..7d0ca355b0f0 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnonymousClassExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AnonymousClassExpr.java @@ -20,7 +20,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class AnonymousClassExpr implements Expr { @Override diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ArithmeticOperationExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ArithmeticOperationExpr.java index 886ec56ad477..6f285b13faf7 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ArithmeticOperationExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ArithmeticOperationExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class ArithmeticOperationExpr implements OperationExpr { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ArrayExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ArrayExpr.java index 92d79246a146..267336432a37 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ArrayExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ArrayExpr.java @@ -19,7 +19,9 @@ import com.google.common.collect.ImmutableList; import java.util.Arrays; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class ArrayExpr implements Expr { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AssignmentExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AssignmentExpr.java index 1314505d1f8d..d1bc0f16aa69 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AssignmentExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AssignmentExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class AssignmentExpr implements Expr { public abstract VariableExpr variableExpr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AssignmentOperationExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AssignmentOperationExpr.java index 4c2cfeec2e9b..fad867081d88 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AssignmentOperationExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AssignmentOperationExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class AssignmentOperationExpr implements OperationExpr { public abstract VariableExpr variableExpr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AstNode.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AstNode.java index aa9b8c107173..40bcacad02cf 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AstNode.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AstNode.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public interface AstNode { /** Writes the syntatically-correct Java code representation of this node. */ public void accept(AstNodeVisitor visitor); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AstNodeVisitor.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AstNodeVisitor.java index 8680e94fcb19..383ff2d8b9ff 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AstNodeVisitor.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/AstNodeVisitor.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public interface AstNodeVisitor { /** Writes the syntatically-correct Java code representation of this node. */ public void visit(IdentifierNode identifier); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BlockComment.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BlockComment.java index 9a9bc0d0cc52..88ae4858fbb1 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BlockComment.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BlockComment.java @@ -15,7 +15,9 @@ package com.google.api.generator.engine.ast; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class BlockComment implements Comment { @Override diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BlockStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BlockStatement.java index b5ff9373fd27..dc3207abf7a2 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BlockStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BlockStatement.java @@ -17,7 +17,9 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class BlockStatement implements Statement { // TODO(unsupported): Named blocks. diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BreakStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BreakStatement.java index e6119b30af22..0b2716dc51f6 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BreakStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/BreakStatement.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public class BreakStatement implements Statement { private BreakStatement() {} diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/CastExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/CastExpr.java index a8c4125140a7..2c33c6c728a3 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/CastExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/CastExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class CastExpr implements Expr { @Override diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ClassDefinition.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ClassDefinition.java index 1e09e39f4089..df5fc76af298 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ClassDefinition.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ClassDefinition.java @@ -21,16 +21,17 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class ClassDefinition implements AstNode { // Optional. public abstract ImmutableList fileHeader(); // Required for samples classes. - @Nullable - public abstract RegionTag regionTag(); + public abstract @Nullable RegionTag regionTag(); // Required. public abstract ScopeNode scope(); @@ -39,8 +40,7 @@ public abstract class ClassDefinition implements AstNode { public abstract IdentifierNode classIdentifier(); // Required for outer classes. - @Nullable - public abstract String packageString(); + public abstract @Nullable String packageString(); public abstract boolean isNested(); @@ -52,8 +52,7 @@ public abstract class ClassDefinition implements AstNode { // Using a list helps with determinism in unit tests. public abstract ImmutableList implementsTypes(); - @Nullable - public abstract TypeNode extendsType(); + public abstract @Nullable TypeNode extendsType(); public abstract boolean isStatic(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Comment.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Comment.java index 97036e1cd964..0b2db6734d1a 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Comment.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Comment.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public interface Comment { public String comment(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/CommentStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/CommentStatement.java index 2a03bb0ffb7e..32d372ea8796 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/CommentStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/CommentStatement.java @@ -15,7 +15,9 @@ package com.google.api.generator.engine.ast; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class CommentStatement implements Statement { public abstract Comment comment(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ConcreteReference.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ConcreteReference.java index b768d5b2ff4f..da97852bf299 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ConcreteReference.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ConcreteReference.java @@ -19,8 +19,10 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class ConcreteReference implements Reference { private static final String EXTENDS = "extends"; @@ -176,7 +178,7 @@ public boolean isWildcard() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof ConcreteReference)) { return false; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/EmptyLineStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/EmptyLineStatement.java index f2688a2b9ecd..0589811afc7d 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/EmptyLineStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/EmptyLineStatement.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public class EmptyLineStatement implements Statement { private EmptyLineStatement() {} diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/EnumRefExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/EnumRefExpr.java index 8dcf18679ba8..fcaf20ee2034 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/EnumRefExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/EnumRefExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class EnumRefExpr implements Expr { public abstract IdentifierNode identifier(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Expr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Expr.java index 134d2464d800..6be062958523 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Expr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Expr.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public interface Expr extends AstNode { TypeNode type(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ExprStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ExprStatement.java index 341b57192f42..5c3a6df18543 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ExprStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ExprStatement.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class ExprStatement implements Statement { public abstract Expr expression(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ForStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ForStatement.java index b1216b6210be..2030bb1b7f21 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ForStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ForStatement.java @@ -18,7 +18,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class ForStatement implements Statement { public abstract VariableExpr localVariableExpr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/GeneralForStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/GeneralForStatement.java index ac32c09bfc74..512802da6788 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/GeneralForStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/GeneralForStatement.java @@ -19,7 +19,9 @@ import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class GeneralForStatement implements Statement { public abstract Expr initializationExpr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/IdentifierNode.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/IdentifierNode.java index 5719c9bc0e68..252ef4e7e4fb 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/IdentifierNode.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/IdentifierNode.java @@ -22,7 +22,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; import java.util.regex.Pattern; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class IdentifierNode implements AstNode { static class InvalidIdentifierException extends RuntimeException { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/IfStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/IfStatement.java index 6451ab38ee1a..71d1e8caca0e 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/IfStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/IfStatement.java @@ -20,7 +20,9 @@ import com.google.common.collect.ImmutableMap; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class IfStatement implements Statement { public abstract Expr conditionExpr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/InstanceofExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/InstanceofExpr.java index 0562ff890abd..626dedd5ac52 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/InstanceofExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/InstanceofExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class InstanceofExpr implements Expr { public abstract Expr expr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/JavaDocComment.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/JavaDocComment.java index 7184044598c2..a5873499ecd9 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/JavaDocComment.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/JavaDocComment.java @@ -23,7 +23,10 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class JavaDocComment implements Comment { @Override @@ -48,11 +51,11 @@ public abstract static class Builder { static final String PARAM_INDENT = " "; // The lack of a getter for these local variables in the external class is WAI. - String throwsType = null; - String throwsDescription = null; - String deprecated = null; - String internalOnly = null; - String returnDescription = null; + @Nullable String throwsType = null; + @Nullable String throwsDescription = null; + @Nullable String deprecated = null; + @Nullable String internalOnly = null; + @Nullable String returnDescription = null; List paramsList = new ArrayList<>(); List componentsList = new ArrayList<>(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LambdaExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LambdaExpr.java index 2b8c1b6f448d..65dbf3a6022b 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LambdaExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LambdaExpr.java @@ -22,7 +22,9 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class LambdaExpr implements Expr { @Override diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LineComment.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LineComment.java index 426038f3ed88..0c8002b80d46 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LineComment.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LineComment.java @@ -16,7 +16,9 @@ import com.google.api.generator.engine.escaper.MetacharEscaper; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class LineComment implements Comment { @Override diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LogicalOperationExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LogicalOperationExpr.java index 9210ec3593c4..45dbd37a98e8 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LogicalOperationExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/LogicalOperationExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class LogicalOperationExpr implements OperationExpr { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodDefinition.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodDefinition.java index 6bd3bca9c532..13e84b9f2031 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodDefinition.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodDefinition.java @@ -23,8 +23,10 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class MethodDefinition implements AstNode { static final Reference RUNTIME_EXCEPTION_REFERENCE = @@ -68,8 +70,7 @@ public abstract class MethodDefinition implements AstNode { abstract ImmutableList returnTemplateNames(); - @Nullable - public abstract ReturnExpr returnExpr(); + public abstract @Nullable ReturnExpr returnExpr(); abstract boolean isOverride(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodInvocationExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodInvocationExpr.java index 2a0c2a45c48f..97acb6a44e87 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodInvocationExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/MethodInvocationExpr.java @@ -19,19 +19,19 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class MethodInvocationExpr implements Expr { public abstract IdentifierNode methodIdentifier(); public abstract TypeNode returnType(); - @Nullable - public abstract Expr exprReferenceExpr(); + public abstract @Nullable Expr exprReferenceExpr(); - @Nullable - public abstract TypeNode staticReferenceType(); + public abstract @Nullable TypeNode staticReferenceType(); public abstract List arguments(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NewObjectExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NewObjectExpr.java index bbba011dfff3..46b24d92b9a2 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NewObjectExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NewObjectExpr.java @@ -20,7 +20,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class NewObjectExpr implements Expr { @Override diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NodeValidator.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NodeValidator.java index b6eb9c6915e8..f4925f77a9b9 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NodeValidator.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NodeValidator.java @@ -18,7 +18,9 @@ import java.util.Collection; import java.util.Map; import java.util.Objects; +import org.jspecify.annotations.NullMarked; +@NullMarked public class NodeValidator { public static void checkNoNullElements( Collection collection, String fieldTypeName, String nodeContextInfo) { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NullObjectValue.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NullObjectValue.java index fd5d150ca42b..62aba0ed589c 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NullObjectValue.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/NullObjectValue.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public class NullObjectValue implements ObjectValue { private static final String NULL_VALUE = "null"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ObjectValue.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ObjectValue.java index 3cde72c4e9f5..7cd0ca6aff8c 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ObjectValue.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ObjectValue.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public interface ObjectValue extends Value { @Override TypeNode type(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/OperationExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/OperationExpr.java index 36473e6e977f..ab2439f3ab66 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/OperationExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/OperationExpr.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public interface OperationExpr extends Expr { OperatorKind operatorKind(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/OperatorKind.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/OperatorKind.java index 1c11a77fc3d5..689f377cbbb7 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/OperatorKind.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/OperatorKind.java @@ -15,7 +15,9 @@ package com.google.api.generator.engine.ast; import java.util.EnumSet; +import org.jspecify.annotations.NullMarked; +@NullMarked public enum OperatorKind { ARITHMETIC_ADDITION, LOGICAL_AND, diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/PackageInfoDefinition.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/PackageInfoDefinition.java index 5d009fe0fe5e..2eb6180c32de 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/PackageInfoDefinition.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/PackageInfoDefinition.java @@ -19,7 +19,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class PackageInfoDefinition implements AstNode { public abstract String pakkage(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/PrimitiveValue.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/PrimitiveValue.java index e726d8d5012b..2a8b19f674a3 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/PrimitiveValue.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/PrimitiveValue.java @@ -16,7 +16,9 @@ import com.google.api.generator.engine.lexicon.Literal; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class PrimitiveValue implements Value { @Override diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Reference.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Reference.java index 4432c68616aa..92732a90de9a 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Reference.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Reference.java @@ -16,8 +16,10 @@ import com.google.common.collect.ImmutableList; import java.util.List; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked public interface Reference extends AstNode { @Override void accept(AstNodeVisitor visitor); @@ -38,11 +40,9 @@ public interface Reference extends AstNode { // The nested types in left-to-right order, if any. // Example: com.google.Foo.Bar.Car.ThisType will have the outer types listed in the order // [Foo, Bar, Car]. - @Nullable - ImmutableList enclosingClassNames(); + @Nullable ImmutableList enclosingClassNames(); - @Nullable - Reference wildcardUpperBound(); + @Nullable Reference wildcardUpperBound(); Reference copyAndSetGenerics(List generics); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReferenceConstructorExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReferenceConstructorExpr.java index b68ff61dedbd..ad43ccf113e4 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReferenceConstructorExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReferenceConstructorExpr.java @@ -20,7 +20,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class ReferenceConstructorExpr implements Expr { public enum KeywordKind { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReferenceWildcard.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReferenceWildcard.java index c6db17464412..5c1beb453da4 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReferenceWildcard.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReferenceWildcard.java @@ -14,4 +14,7 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public class ReferenceWildcard {} diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/RelationalOperationExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/RelationalOperationExpr.java index d143abad5ea9..f8cdb2368e78 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/RelationalOperationExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/RelationalOperationExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class RelationalOperationExpr implements OperationExpr { public abstract Expr lhsExpr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReturnExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReturnExpr.java index 4ec350c9f6fd..9791da2426e3 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReturnExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ReturnExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class ReturnExpr implements Expr { public abstract Expr expr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ScopeNode.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ScopeNode.java index cf4c5326dc21..801c491718b7 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ScopeNode.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ScopeNode.java @@ -14,6 +14,10 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; + +@NullMarked public class ScopeNode implements AstNode { private enum ScopeKind { LOCAL, // Placeholder for local scopes. @@ -54,7 +58,7 @@ public void accept(AstNodeVisitor visitor) { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof ScopeNode)) { return false; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Statement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Statement.java index 954b279fd752..8b8de3097f51 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Statement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Statement.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public interface Statement extends AstNode { @Override void accept(AstNodeVisitor visitor); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/StringObjectValue.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/StringObjectValue.java index 602c0dbf82eb..4dbe127f9ef9 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/StringObjectValue.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/StringObjectValue.java @@ -17,7 +17,9 @@ import com.google.auto.value.AutoValue; import com.google.common.escape.Escaper; import com.google.common.escape.Escapers; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class StringObjectValue implements ObjectValue { @Override diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/SuperObjectValue.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/SuperObjectValue.java index 973f6c1d910f..baa6c7cb5702 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/SuperObjectValue.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/SuperObjectValue.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class SuperObjectValue implements ObjectValue { private static final String SUPER_VALUE = "super"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/SynchronizedStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/SynchronizedStatement.java index 5bd58d8d1359..62f514e968c8 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/SynchronizedStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/SynchronizedStatement.java @@ -19,7 +19,9 @@ import com.google.common.collect.ImmutableList; import java.util.Arrays; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class SynchronizedStatement implements Statement { public abstract Expr lock(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TernaryExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TernaryExpr.java index 0819c5c169bd..78bf05974fbf 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TernaryExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TernaryExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class TernaryExpr implements Expr { public abstract Expr conditionExpr(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThisObjectValue.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThisObjectValue.java index e72f291936a4..3f47d5845abc 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThisObjectValue.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThisObjectValue.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class ThisObjectValue implements ObjectValue { private static final String THIS_VALUE = "this"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThrowExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThrowExpr.java index 5e4808d28aa9..48ad8b800710 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThrowExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ThrowExpr.java @@ -16,23 +16,22 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class ThrowExpr implements Expr { // TODO(miraleung): Refactor with StringObjectValue and possibly with NewObjectExpr. - @Nullable - public abstract Expr throwExpr(); + public abstract @Nullable Expr throwExpr(); @Override public abstract TypeNode type(); - @Nullable - public abstract Expr messageExpr(); + public abstract @Nullable Expr messageExpr(); - @Nullable - public abstract Expr causeExpr(); + public abstract @Nullable Expr causeExpr(); @Override public void accept(AstNodeVisitor visitor) { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TryCatchStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TryCatchStatement.java index 77cd964aed49..7641ec2caa61 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TryCatchStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TryCatchStatement.java @@ -21,8 +21,10 @@ import java.util.Collections; import java.util.List; import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class TryCatchStatement implements Statement { @@ -36,8 +38,7 @@ public abstract class TryCatchStatement implements Statement { public abstract List> catchBlocks(); // Optional. - @Nullable - public abstract AssignmentExpr tryResourceExpr(); + public abstract @Nullable AssignmentExpr tryResourceExpr(); public abstract boolean isSampleCode(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeMismatchException.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeMismatchException.java index 178e0040c3be..0349316259ea 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeMismatchException.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeMismatchException.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public class TypeMismatchException extends RuntimeException { public TypeMismatchException(String errorMessage) { super(errorMessage); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeNode.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeNode.java index 12236842fccd..4c030ad192cb 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeNode.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/TypeNode.java @@ -21,8 +21,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class TypeNode implements AstNode, Comparable { static final Reference EXCEPTION_REFERENCE = ConcreteReference.withClazz(Exception.class); @@ -129,8 +131,7 @@ public static TypeNode createElementTypeFromArrayType(TypeNode type) { .build(); } - @Nullable - public abstract Reference reference(); + public abstract @Nullable Reference reference(); @Override public int compareTo(TypeNode other) { @@ -254,7 +255,7 @@ public void accept(AstNodeVisitor visitor) { // Java overrides. @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof TypeNode)) { return false; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/UnaryOperationExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/UnaryOperationExpr.java index 3a968b92e0f0..18216750bb22 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/UnaryOperationExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/UnaryOperationExpr.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class UnaryOperationExpr implements OperationExpr { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Value.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Value.java index 4083fe5db8e1..39a00560005c 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Value.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Value.java @@ -14,6 +14,9 @@ package com.google.api.generator.engine.ast; +import org.jspecify.annotations.NullMarked; + +@NullMarked public interface Value { TypeNode type(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ValueExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ValueExpr.java index 9ade6a5d6385..1e20390de964 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ValueExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ValueExpr.java @@ -15,7 +15,9 @@ package com.google.api.generator.engine.ast; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class ValueExpr implements Expr { public abstract Value value(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VaporReference.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VaporReference.java index 0c5b976a180c..6cbeae189afa 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VaporReference.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VaporReference.java @@ -20,8 +20,10 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class VaporReference implements Reference { private static final String DOT = "."; @@ -53,8 +55,7 @@ public void accept(AstNodeVisitor visitor) { @Override public abstract ImmutableList enclosingClassNames(); - @Nullable - public abstract Reference supertypeReference(); + public abstract @Nullable Reference supertypeReference(); @Nullable @Override @@ -109,7 +110,7 @@ public boolean isWildcard() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof VaporReference)) { return false; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Variable.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Variable.java index 9549390f5be7..c6d8a37c1a81 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Variable.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/Variable.java @@ -16,7 +16,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class Variable { public abstract IdentifierNode identifier(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VariableExpr.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VariableExpr.java index f882c97e8d3b..3945afbe91da 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VariableExpr.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/VariableExpr.java @@ -22,17 +22,17 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class VariableExpr implements Expr { public abstract Variable variable(); - @Nullable - public abstract Expr exprReferenceExpr(); + public abstract @Nullable Expr exprReferenceExpr(); - @Nullable - public abstract TypeNode staticReferenceType(); + public abstract @Nullable TypeNode staticReferenceType(); /** Variable declaration fields. */ public abstract boolean isDecl(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/WhileStatement.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/WhileStatement.java index b0807ee24732..46b96bec33c0 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/WhileStatement.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/WhileStatement.java @@ -18,7 +18,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class WhileStatement implements Statement { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java index 6b5ab7996889..51c4af2d927f 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java @@ -16,7 +16,9 @@ import com.google.common.escape.Escaper; import com.google.common.escape.Escapers; +import org.jspecify.annotations.NullMarked; +@NullMarked public class HtmlEscaper extends Escaper { private static final HtmlEscaper SINGLETON = new HtmlEscaper(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/escaper/MetacharEscaper.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/escaper/MetacharEscaper.java index 3b4a1943fb9d..a36b5f346c08 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/escaper/MetacharEscaper.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/escaper/MetacharEscaper.java @@ -16,7 +16,9 @@ import com.google.common.escape.Escaper; import com.google.common.escape.Escapers; +import org.jspecify.annotations.NullMarked; +@NullMarked public class MetacharEscaper extends Escaper { private static final MetacharEscaper SINGLETON = new MetacharEscaper(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/InvalidSymbol.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/InvalidSymbol.java index 1c0d3f4cd4a1..6a72389f0792 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/InvalidSymbol.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/InvalidSymbol.java @@ -15,7 +15,9 @@ package com.google.api.generator.engine.lexicon; import java.util.regex.Pattern; +import org.jspecify.annotations.NullMarked; +@NullMarked public class InvalidSymbol { private static final Pattern INVALID_SYMBOL_PATTERN = Pattern.compile("[#`~'\"\\\\,$]"); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Keyword.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Keyword.java index 9e40e54027fc..f85d7ec6f418 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Keyword.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Keyword.java @@ -16,7 +16,9 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; +import org.jspecify.annotations.NullMarked; +@NullMarked public class Keyword { // This is a valid field for all objects, so handle particular keyword differently. private static final String CLASS_KEYWORD = "class"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Literal.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Literal.java index 85201636cd67..4fe2a7042523 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Literal.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Literal.java @@ -15,7 +15,9 @@ package com.google.api.generator.engine.lexicon; import java.util.regex.Pattern; +import org.jspecify.annotations.NullMarked; +@NullMarked public class Literal { private static final String BOOLEAN_TRUE = "true"; private static final String BOOLEAN_FALSE = "false"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Operator.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Operator.java index 578ef1d39b1d..e1641c5adf6d 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Operator.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Operator.java @@ -15,9 +15,11 @@ package com.google.api.generator.engine.lexicon; import java.util.regex.Pattern; +import org.jspecify.annotations.NullMarked; // TODO(miraleung): Add logical representations for each operator so we can use them in expression // parsing. +@NullMarked public class Operator { private static final Pattern OPERATOR_PATTERN = Pattern.compile("[\\+\\-\\*\\/%\\=\\!\\&\\|<>\\?\\:\\^]"); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Separator.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Separator.java index fcc7f9d77f4e..32acf7cccdd1 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Separator.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/lexicon/Separator.java @@ -15,7 +15,9 @@ package com.google.api.generator.engine.lexicon; import java.util.regex.Pattern; +import org.jspecify.annotations.NullMarked; +@NullMarked public class Separator { private static final Pattern SEPARATOR_PATTERN = Pattern.compile("[\\[\\]\\{\\}\\(\\)\\.;]"); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java index 1d834043c863..5fb7799d1a36 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java @@ -70,8 +70,10 @@ import java.util.TreeSet; import java.util.stream.Collectors; import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked public class ImportWriterVisitor implements AstNodeVisitor { private static final String DOT = "."; private static final String PKG_JAVA_LANG = "java.lang"; @@ -83,7 +85,7 @@ public class ImportWriterVisitor implements AstNodeVisitor { private final Set importShortNames = new TreeSet<>(); private String currentPackage; - @Nullable private String currentClassName; + private @Nullable String currentClassName; public void clear() { staticImports.clear(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/JavaFormatter.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/JavaFormatter.java index 6989623758e1..df28c87b10f5 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/JavaFormatter.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/JavaFormatter.java @@ -17,7 +17,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.googlejavaformat.java.Formatter; import com.google.googlejavaformat.java.FormatterException; +import org.jspecify.annotations.NullMarked; +@NullMarked public final class JavaFormatter { private static final Formatter FORMATTER = new Formatter(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/JavaWriterVisitor.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/JavaWriterVisitor.java index 12175b66092b..dc243eec8898 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/JavaWriterVisitor.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/engine/writer/JavaWriterVisitor.java @@ -71,7 +71,9 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.jspecify.annotations.NullMarked; +@NullMarked public class JavaWriterVisitor implements AstNodeVisitor { private static final String SPACE = " "; private static final String NEWLINE = "\n"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/Generator.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/Generator.java index b005a16ceb33..e06e400f15a0 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/Generator.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/Generator.java @@ -24,7 +24,9 @@ import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest; import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class Generator { public static CodeGeneratorResponse generateGapic(CodeGeneratorRequest request) { GapicContext context = Parser.parse(request); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java index 5bd24bdbd0f0..ff5abc234842 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java @@ -32,7 +32,10 @@ import com.google.common.base.Strings; import java.util.logging.Logger; import javax.annotation.Generated; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked public class ClientLibraryPackageInfoComposer { private static final Logger LOGGER = @@ -47,7 +50,7 @@ public class ClientLibraryPackageInfoComposer { private static final String SAMPLE_CODE_HEADER_PATTERN = "Sample for %s:"; private static final String SERVICE_DESCRIPTION_HEADER_PATTERN = "Service Description: %s"; - public static GapicPackageInfo generatePackageInfo(GapicContext context) { + public static @Nullable GapicPackageInfo generatePackageInfo(GapicContext context) { if (!context.containsServices()) { LOGGER.warning("Generating empty package info since no services were found"); return null; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryReflectConfigComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryReflectConfigComposer.java index 14909ef897cd..d65a205a12c5 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryReflectConfigComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryReflectConfigComposer.java @@ -23,7 +23,9 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ClientLibraryReflectConfigComposer { private ClientLibraryReflectConfigComposer() {} // Disallow instance creation diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/Composer.java index 288b02e713f0..edb180676c82 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/Composer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/Composer.java @@ -43,7 +43,10 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked public class Composer { public static List composeServiceClasses(GapicContext context) { List clazzes = new ArrayList<>(); @@ -53,7 +56,7 @@ public static List composeServiceClasses(GapicContext context) { return addApacheLicense(prepareExecutableSamples(clazzes)); } - public static GapicPackageInfo composePackageInfo(GapicContext context) { + public static @Nullable GapicPackageInfo composePackageInfo(GapicContext context) { if (!context.containsServices()) { return null; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/LibraryVersionClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/LibraryVersionClassComposer.java index a450526ac6e7..0c297d02566a 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/LibraryVersionClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/LibraryVersionClassComposer.java @@ -31,7 +31,9 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.Service; import java.util.Arrays; +import org.jspecify.annotations.NullMarked; +@NullMarked public class LibraryVersionClassComposer { private static final LibraryVersionClassComposer INSTANCE = new LibraryVersionClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/CommentComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/CommentComposer.java index 498320731fa9..67001a16679f 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/CommentComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/CommentComposer.java @@ -22,7 +22,9 @@ import java.util.Arrays; import java.util.Calendar; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class CommentComposer { private static final String APACHE_LICENSE_STRING = String.format( diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/ServiceClientCommentComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/ServiceClientCommentComposer.java index 64ea4adf7cc5..54e3086371f8 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/ServiceClientCommentComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/ServiceClientCommentComposer.java @@ -32,7 +32,9 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientCommentComposer { // Tokens. private static final String EMPTY_STRING = ""; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/SettingsCommentComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/SettingsCommentComposer.java index 8dd115883e90..fee47355b40e 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/SettingsCommentComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/SettingsCommentComposer.java @@ -23,7 +23,9 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class SettingsCommentComposer { private static final String COLON = ":"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/StubCommentComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/StubCommentComposer.java index 8ce682188f0b..be0c8bef14d4 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/StubCommentComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/StubCommentComposer.java @@ -18,7 +18,9 @@ import com.google.api.generator.engine.ast.JavaDocComment; import java.util.Arrays; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class StubCommentComposer { private static final String STUB_CLASS_HEADER_SUMMARY_PATTERN = "Base stub class for the %s service API."; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java index 175d45bc41a7..b6666e1707c8 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java @@ -75,6 +75,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Generated; +import org.jspecify.annotations.NullMarked; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -82,6 +83,7 @@ import org.junit.BeforeClass; import org.junit.Test; +@NullMarked public abstract class AbstractServiceClientTestClassComposer implements ClassComposer { protected static final Statement EMPTY_LINE_STATEMENT = EmptyLineStatement.create(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java index 22cf6b0dfc61..d713a5e1b891 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java @@ -123,8 +123,8 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Generated; -import javax.annotation.Nullable; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; public abstract class AbstractServiceStubSettingsClassComposer implements ClassComposer { private static final Statement EMPTY_LINE_STATEMENT = EmptyLineStatement.create(); @@ -1900,7 +1900,7 @@ protected MethodDefinition createNestedClassCreateDefaultMethod( TypeStore typeStore, String methodName, String defaultTransportChannelProvider, - String defaultTransportChannelProviderBuilder, + @Nullable String defaultTransportChannelProviderBuilder, String defaultApiClientHeaderProviderBuilder) { List bodyStatements = new ArrayList<>(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java index 6cdf49e38d4c..b3f45f38d301 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java @@ -99,8 +99,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.annotation.Generated; -import javax.annotation.Nullable; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; public abstract class AbstractTransportServiceStubClassComposer implements ClassComposer { private static final List AIP_STANDARDS_METHODS = @@ -912,8 +912,7 @@ protected List createLongRunningClient(Service service, TypeStore typ return ImmutableList.of(); } - @Nullable - protected VariableExpr declareLongRunningClient() { + protected @Nullable VariableExpr declareLongRunningClient() { return null; } @@ -1537,8 +1536,7 @@ private static Predicate shouldAutoPopulate(Message methodRequestMessage * The Resource Name Extractor should only be generated if the request contains a field that has * resource reference (see {@link Field#hasResourceReference()}) */ - @Nullable - protected LambdaExpr createResourceNameExtractorClassInstance( + protected @Nullable LambdaExpr createResourceNameExtractorClassInstance( Service service, Method method, ImmutableMap messageTypes, @@ -1679,7 +1677,7 @@ protected LambdaExpr createResourceNameExtractorClassInstance( } // Find the first field that has resource reference in a request message - private static Field getDestinationResourceIdField( + private static @Nullable Field getDestinationResourceIdField( Method method, ImmutableMap messageTypes) { if (method.inputType().reference() == null || method.inputType().reference().fullName() == null) { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/BatchingDescriptorComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/BatchingDescriptorComposer.java index dc96c7bc437a..c11d4efac3cf 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/BatchingDescriptorComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/BatchingDescriptorComposer.java @@ -52,7 +52,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class BatchingDescriptorComposer { private static final String BATCHING_DESC_PATTERN = "%s_BATCHING_DESC"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/ClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/ClassComposer.java index d8d87eadc140..b7d462ae925a 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/ClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/ClassComposer.java @@ -17,7 +17,9 @@ import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.Service; +import org.jspecify.annotations.NullMarked; +@NullMarked public interface ClassComposer { GapicClass generate(GapicContext context, Service serivce); } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java index 6690c57674d6..98784fc8818f 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java @@ -59,7 +59,9 @@ import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class RetrySettingsComposer { private static final TypeStore FIXED_TYPESTORE = createStaticTypes(); private static final TypeNode STATUS_CODE_CODE_TYPE = diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java index ab98a86b18b5..309dc32f41be 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java @@ -20,8 +20,10 @@ 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.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class TransportContext { @@ -32,14 +34,11 @@ public abstract class TransportContext { public abstract List transportNames(); - @Nullable - public abstract Class callSettingsClass(); + public abstract @Nullable Class callSettingsClass(); - @Nullable - public abstract TypeNode stubCallableFactoryType(); + public abstract @Nullable TypeNode stubCallableFactoryType(); - @Nullable - public abstract Class methodDescriptorClass(); + public abstract @Nullable Class methodDescriptorClass(); public abstract List transportOperationsStubTypes(); @@ -60,16 +59,13 @@ public abstract class TransportContext { public abstract List transportGetterNames(); // For AbstractServiceCallableFactoryClassComposer - @Nullable - public abstract TypeNode transportCallSettingsType(); + public abstract @Nullable TypeNode transportCallSettingsType(); - @Nullable - public abstract TypeNode transportCallableFactoryType(); + public abstract @Nullable TypeNode transportCallableFactoryType(); public abstract List operationsStubTypes(); - @Nullable - public abstract String transportCallSettingsName(); + public abstract @Nullable String transportCallSettingsName(); // For RetrySettingsComposer public abstract TypeNode operationResponseTransformerType(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java index 3669e9f77e99..9832e1cea6ea 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposer.java @@ -54,7 +54,10 @@ import java.util.Optional; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked public class DefaultValueComposer { private static final TypeNode OPERATION_TYPE = TypeNode.withReference(ConcreteReference.withClazz(Operation.class)); @@ -120,7 +123,7 @@ public static Expr createValue( Map resourceNames, Map messageTypes, Map valuePatterns, - HttpBindings bindings) { + @Nullable HttpBindings bindings) { if (field.isRepeated()) { ConcreteReference.Builder refBuilder = ConcreteReference.builder().setClazz(field.isMap() ? HashMap.class : ArrayList.class); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcContext.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcContext.java index 8874e128e9b3..31340abaa970 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcContext.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcContext.java @@ -28,7 +28,9 @@ import com.google.longrunning.stub.GrpcOperationsStub; import com.google.longrunning.stub.OperationsStub; import io.grpc.MethodDescriptor; +import org.jspecify.annotations.NullMarked; +@NullMarked public abstract class GrpcContext extends TransportContext { private static final TransportContext INSTANCE = GrpcContext.builder() diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposer.java index b7fc7c7de1ae..4d401ef1c3b9 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceCallableFactoryClassComposer.java @@ -25,7 +25,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class GrpcServiceCallableFactoryClassComposer extends AbstractServiceCallableFactoryClassComposer { private static final GrpcServiceCallableFactoryClassComposer INSTANCE = diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java index 455c507e0b7b..5cbff693c162 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java @@ -44,7 +44,9 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function; +import org.jspecify.annotations.NullMarked; +@NullMarked public class GrpcServiceStubClassComposer extends AbstractTransportServiceStubClassComposer { private static final GrpcServiceStubClassComposer INSTANCE = new GrpcServiceStubClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java index 7227b4fe4aae..cb50fb13e606 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java @@ -41,7 +41,9 @@ import java.util.Arrays; import java.util.List; import javax.annotation.Generated; +import org.jspecify.annotations.NullMarked; +@NullMarked public class MockServiceClassComposer implements ClassComposer { private static final MockServiceClassComposer INSTANCE = new MockServiceClassComposer(); private static final String SERVICE_IMPL_VAR_NAME = "serviceImpl"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java index d6573f026dae..ae09a6c86a05 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java @@ -62,7 +62,10 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Generated; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked public class MockServiceImplClassComposer implements ClassComposer { private static final MockServiceImplClassComposer INSTANCE = new MockServiceImplClassComposer(); private static final String IMPL_BASE_PATTERN = "%sImplBase"; @@ -464,7 +467,7 @@ private static MethodDefinition createOnCompletedJavaMethod( private static Statement createHandleObjectStatement( Method protoMethod, - VariableExpr requestArgVarExpr, + @Nullable VariableExpr requestArgVarExpr, VariableExpr responseObserverVarExpr, VariableExpr localResponseVarExpr) { List ifBodyExprs = new ArrayList<>(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposer.java index 9b95e9c280ec..87cbbc526056 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposer.java @@ -16,7 +16,9 @@ package com.google.api.generator.gapic.composer.grpc; import com.google.api.generator.gapic.composer.common.AbstractServiceClientClassComposer; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientClassComposer extends AbstractServiceClientClassComposer { private static final ServiceClientClassComposer INSTANCE = new ServiceClientClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java index b6d1ff3bc35e..bc92d53a3ca6 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java @@ -64,7 +64,9 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientTestClassComposer extends AbstractServiceClientTestClassComposer { private static final String SERVICE_HELPER_VAR_NAME = "mockServiceHelper"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposer.java index ff0e4ed23f36..c35d54f19aa4 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposer.java @@ -15,7 +15,9 @@ package com.google.api.generator.gapic.composer.grpc; import com.google.api.generator.gapic.composer.common.AbstractServiceSettingsClassComposer; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceSettingsClassComposer extends AbstractServiceSettingsClassComposer { private static final ServiceSettingsClassComposer INSTANCE = new ServiceSettingsClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposer.java index 1e11c5087d6d..3e4f6c9aa858 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposer.java @@ -16,7 +16,9 @@ package com.google.api.generator.gapic.composer.grpc; import com.google.api.generator.gapic.composer.common.AbstractServiceStubClassComposer; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceStubClassComposer extends AbstractServiceStubClassComposer { private static final ServiceStubClassComposer INSTANCE = new ServiceStubClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposer.java index 5ace1ea0eab3..a3e24fdbe551 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposer.java @@ -30,7 +30,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceStubSettingsClassComposer extends AbstractServiceStubSettingsClassComposer { private static final ServiceStubSettingsClassComposer INSTANCE = new ServiceStubSettingsClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestContext.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestContext.java index f383fa7d1b88..2b56bbaec391 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestContext.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestContext.java @@ -27,7 +27,9 @@ import com.google.longrunning.OperationsClient; import com.google.longrunning.stub.GrpcOperationsStub; import com.google.longrunning.stub.OperationsStub; +import org.jspecify.annotations.NullMarked; +@NullMarked public abstract class GrpcRestContext extends TransportContext { private static final TransportContext INSTANCE = GrpcRestContext.builder() diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/HttpJsonServiceClientTestClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/HttpJsonServiceClientTestClassComposer.java index 9f9bbafc0558..75402c1bbee9 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/HttpJsonServiceClientTestClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/HttpJsonServiceClientTestClassComposer.java @@ -23,7 +23,9 @@ import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.Service; import java.util.Map; +import org.jspecify.annotations.NullMarked; +@NullMarked public class HttpJsonServiceClientTestClassComposer extends ServiceClientTestClassComposer { private static final HttpJsonServiceClientTestClassComposer INSTANCE = new HttpJsonServiceClientTestClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/HttpJsonServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/HttpJsonServiceStubClassComposer.java index 6d46c07792db..3cd12c61713c 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/HttpJsonServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/HttpJsonServiceStubClassComposer.java @@ -18,7 +18,9 @@ import com.google.api.generator.gapic.composer.store.TypeStore; import com.google.api.generator.gapic.model.Service; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class HttpJsonServiceStubClassComposer extends com.google.api.generator.gapic.composer.rest.HttpJsonServiceStubClassComposer { private static final HttpJsonServiceStubClassComposer INSTANCE = diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java index 3710f6949221..17921dd60b9e 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java @@ -30,7 +30,9 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientClassComposer extends AbstractServiceClientClassComposer { private static final ServiceClientClassComposer INSTANCE = new ServiceClientClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java index c5a735acadfc..5a28161f8828 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java @@ -26,7 +26,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceSettingsClassComposer extends AbstractServiceSettingsClassComposer { private static final ServiceSettingsClassComposer INSTANCE = new ServiceSettingsClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubClassComposer.java index b22629d9e9b7..7a0aa76d6a23 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubClassComposer.java @@ -22,7 +22,9 @@ import com.google.api.generator.engine.ast.ValueExpr; import com.google.api.generator.gapic.composer.common.AbstractServiceStubClassComposer; import com.google.api.generator.gapic.composer.store.TypeStore; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceStubClassComposer extends AbstractServiceStubClassComposer { private static final ServiceStubClassComposer INSTANCE = new ServiceStubClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposer.java index b79c74ed991d..a6d7e8de8bfb 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposer.java @@ -38,7 +38,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceStubSettingsClassComposer extends AbstractServiceStubSettingsClassComposer { private static final ServiceStubSettingsClassComposer INSTANCE = new ServiceStubSettingsClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizer.java index 4a72abeac600..942ca75c100b 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameTokenizer.java @@ -21,7 +21,9 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ResourceNameTokenizer { private static final String LEFT_BRACE = "{"; private static final String RIGHT_BRACE = "}"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java index 00a4185df7a6..2baed2465fa3 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java @@ -38,7 +38,9 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class HttpJsonServiceCallableFactoryClassComposer extends AbstractServiceCallableFactoryClassComposer { private static final HttpJsonServiceCallableFactoryClassComposer INSTANCE = diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java index cf228010fc9e..f3ca00f9db0f 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java @@ -78,7 +78,9 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class HttpJsonServiceStubClassComposer extends AbstractTransportServiceStubClassComposer { private static final HttpJsonServiceStubClassComposer INSTANCE = new HttpJsonServiceStubClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/RestContext.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/RestContext.java index f4a844c3380c..fbe651673186 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/RestContext.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/RestContext.java @@ -28,7 +28,9 @@ import com.google.api.generator.gapic.composer.utils.ClassNames; import com.google.api.generator.gapic.model.Transport; import com.google.common.collect.ImmutableList; +import org.jspecify.annotations.NullMarked; +@NullMarked public abstract class RestContext extends TransportContext { private static final TransportContext INSTANCE = RestContext.builder() diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceClientClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceClientClassComposer.java index 9b5f996db725..0ac8acdf0641 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceClientClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceClientClassComposer.java @@ -16,7 +16,9 @@ package com.google.api.generator.gapic.composer.rest; import com.google.api.generator.gapic.composer.common.AbstractServiceClientClassComposer; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientClassComposer extends AbstractServiceClientClassComposer { private static final ServiceClientClassComposer INSTANCE = new ServiceClientClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceClientTestClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceClientTestClassComposer.java index d9fc2843cdb1..19a344ae79c1 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceClientTestClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceClientTestClassComposer.java @@ -58,7 +58,9 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientTestClassComposer extends AbstractServiceClientTestClassComposer { private static final String MOCK_SERVICE_VAR_NAME = "mockService"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceSettingsClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceSettingsClassComposer.java index 637dea043f80..bfda2f777907 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceSettingsClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceSettingsClassComposer.java @@ -15,7 +15,9 @@ package com.google.api.generator.gapic.composer.rest; import com.google.api.generator.gapic.composer.common.AbstractServiceSettingsClassComposer; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceSettingsClassComposer extends AbstractServiceSettingsClassComposer { private static final ServiceSettingsClassComposer INSTANCE = new ServiceSettingsClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceStubClassComposer.java index 704fac96b64a..c81621ad6b67 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceStubClassComposer.java @@ -16,7 +16,9 @@ package com.google.api.generator.gapic.composer.rest; import com.google.api.generator.gapic.composer.common.AbstractServiceStubClassComposer; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceStubClassComposer extends AbstractServiceStubClassComposer { private static final ServiceStubClassComposer INSTANCE = new ServiceStubClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceStubSettingsClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceStubSettingsClassComposer.java index 654337fb8768..912e59555750 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceStubSettingsClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/ServiceStubSettingsClassComposer.java @@ -27,7 +27,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceStubSettingsClassComposer extends AbstractServiceStubSettingsClassComposer { private static final ServiceStubSettingsClassComposer INSTANCE = new ServiceStubSettingsClassComposer(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleBodyJavaFormatter.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleBodyJavaFormatter.java index 9562e88c191a..bb872207c445 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleBodyJavaFormatter.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleBodyJavaFormatter.java @@ -19,7 +19,9 @@ import com.google.googlejavaformat.java.FormatterException; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.jspecify.annotations.NullMarked; +@NullMarked public final class SampleBodyJavaFormatter { private SampleBodyJavaFormatter() {} diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriter.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriter.java index 8a12e14a97cd..9b9e803d534b 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriter.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriter.java @@ -23,7 +23,9 @@ import com.google.common.annotations.VisibleForTesting; import java.util.Arrays; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked public final class SampleCodeWriter { public static String writeInlineSample(List statements) { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposer.java index 86eb187fd17b..8d19c6cd48da 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposer.java @@ -35,7 +35,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class SampleComposer { static List composeInlineSample(List sampleBody) { return bodyWithComment(CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT, sampleBody); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerUtil.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerUtil.java index 11c6df35a4cf..255399ad9d3f 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerUtil.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposerUtil.java @@ -25,7 +25,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class SampleComposerUtil { // Assign client variable expr with create client. // e.g EchoClient echoClient = EchoClient.create() diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java index 342fab52ad16..bde75f09cedb 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java @@ -58,7 +58,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientCallableMethodSampleComposer { private static Sample composeUnaryOrLroCallableSample( Method method, VariableExpr clientVarExpr, VariableExpr requestVarExpr, Service service) { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java index c4e38e24a388..8a99010ff102 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java @@ -45,7 +45,9 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientHeaderSampleComposer { public static Sample composeClassHeaderSample( Service service, diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java index 311ebab5ac30..998813c6b7a8 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java @@ -41,7 +41,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class ServiceClientMethodSampleComposer { // Creates an example for an empty service (no API methods), which is a corner case but can // happen. Generated example will only show how to instantiate the client class but will not call diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java index 57d396847e34..d8c796c83be3 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java @@ -33,7 +33,9 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public final class SettingsSampleComposer { public static Optional composeSettingsSample( diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/store/TypeStore.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/store/TypeStore.java index 4113c3446b78..102814963ea6 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/store/TypeStore.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/store/TypeStore.java @@ -22,7 +22,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class TypeStore { private final Map store = new HashMap<>(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java index 1228e5d1669e..c1d9b1d3f63b 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/ClassNames.java @@ -18,8 +18,10 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; /** Provides Gapic class names. */ +@NullMarked public class ClassNames { // Using constants since many of these class names are used often. private static final String MOCK_SERVICE_CLASS_NAME_PATTERN = "Mock%s"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/CommentFormatter.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/CommentFormatter.java index b0fc4871620a..ea27b55792d2 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/CommentFormatter.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/CommentFormatter.java @@ -19,7 +19,9 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.jspecify.annotations.NullMarked; +@NullMarked public class CommentFormatter { private CommentFormatter() {} diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/CommonStrings.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/CommonStrings.java index 201e50e8e783..e2a16422d653 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/CommonStrings.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/CommonStrings.java @@ -14,7 +14,10 @@ package com.google.api.generator.gapic.composer.utils; +import org.jspecify.annotations.NullMarked; + /** Provides Gapic common strings. */ +@NullMarked public class CommonStrings { public static final String PAGED_RESPONSE_TYPE_NAME_PATTERN = "%sPagedResponse"; public static final String INTERNAL_API_WARNING = diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/PackageChecker.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/PackageChecker.java index 7911430eb029..6551f653c2d6 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/PackageChecker.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/utils/PackageChecker.java @@ -18,7 +18,9 @@ import com.google.common.base.Strings; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.jspecify.annotations.NullMarked; +@NullMarked public class PackageChecker { // Nothing to initialize. diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Field.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Field.java index ca2a98b56d27..c255999cb215 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Field.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Field.java @@ -19,8 +19,10 @@ import com.google.auto.value.AutoValue; import java.util.Objects; import java.util.Optional; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class Field { // The field's canonical name, potentially post-processed by conflict resolution logic. @@ -31,8 +33,7 @@ public abstract class Field { // resolution behavior. For more context, please see the invocation site of the setter method. public abstract String originalName(); - @Nullable - public abstract String jsonName(); + public abstract @Nullable String jsonName(); public abstract TypeNode type(); @@ -42,8 +43,7 @@ public abstract class Field { // *not* be autopopulated. public abstract boolean isRequired(); - @Nullable - public abstract Format fieldInfoFormat(); + public abstract @Nullable Format fieldInfoFormat(); public abstract boolean isMessage(); @@ -57,11 +57,9 @@ public abstract class Field { public abstract boolean isProto3Optional(); - @Nullable - public abstract ResourceReference resourceReference(); + public abstract @Nullable ResourceReference resourceReference(); - @Nullable - public abstract String description(); + public abstract @Nullable String description(); public boolean hasFieldNameConflict() { return !name().equals(originalName()); @@ -87,7 +85,7 @@ public boolean canBeAutoPopulated() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof Field)) { return false; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicBatchingSettings.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicBatchingSettings.java index 2f7d4de00d84..1d0bd357dde6 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicBatchingSettings.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicBatchingSettings.java @@ -17,8 +17,10 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import java.util.List; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class GapicBatchingSettings { public enum FlowControlLimitExceededBehavior { @@ -40,11 +42,9 @@ public enum FlowControlLimitExceededBehavior { public abstract long delayThresholdMillis(); - @Nullable - public abstract Integer flowControlElementLimit(); + public abstract @Nullable Integer flowControlElementLimit(); - @Nullable - public abstract Integer flowControlByteLimit(); + public abstract @Nullable Integer flowControlByteLimit(); public abstract FlowControlLimitExceededBehavior flowControlLimitExceededBehavior(); @@ -53,8 +53,7 @@ public enum FlowControlLimitExceededBehavior { public abstract ImmutableList discriminatorFieldNames(); - @Nullable - public abstract String subresponseFieldName(); + public abstract @Nullable String subresponseFieldName(); public boolean matches(Service service, Method method) { return protoPakkage().equals(service.protoPakkage()) diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicClass.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicClass.java index 1fd06a8dfedf..ff22d4f12691 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicClass.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicClass.java @@ -19,7 +19,9 @@ import com.google.auto.value.AutoValue; import java.util.Collections; import java.util.List; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class GapicClass { // TODO(miraleung): Add enum for resource name classes. diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicContext.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicContext.java index 680573bfdb50..1608ab0c8aa5 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicContext.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicContext.java @@ -25,8 +25,10 @@ import java.util.Set; import java.util.TreeMap; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class GapicContext { // Keep a non-AutoValue reference to GapicMetadata, since we need to update @@ -66,17 +68,13 @@ public GapicMetadata gapicMetadata() { return gapicMetadata; } - @Nullable - public abstract GapicServiceConfig serviceConfig(); + public abstract @Nullable GapicServiceConfig serviceConfig(); - @Nullable - public abstract com.google.api.Service serviceYamlProto(); + public abstract com.google.api.@Nullable Service serviceYamlProto(); - @Nullable - public abstract String repo(); + public abstract @Nullable String repo(); - @Nullable - public abstract String artifact(); + public abstract @Nullable String artifact(); public boolean containsServices() { return !services().isEmpty(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicLanguageSettings.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicLanguageSettings.java index 4ec7ea1c3626..e103912d4542 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicLanguageSettings.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicLanguageSettings.java @@ -18,8 +18,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Collections; import java.util.Map; +import org.jspecify.annotations.NullMarked; /** Represents the LRO retry settings in a gapic.yaml file. */ +@NullMarked @AutoValue public abstract class GapicLanguageSettings { // The Java package mapping. diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicLroRetrySettings.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicLroRetrySettings.java index 4fd7518916b2..3ebba9be538d 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicLroRetrySettings.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicLroRetrySettings.java @@ -15,8 +15,10 @@ package com.google.api.generator.gapic.model; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; /** Represents the LRO retry settings in a gapic.yaml file. */ +@NullMarked @AutoValue public abstract class GapicLroRetrySettings { public abstract String protoPakkage(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicPackageInfo.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicPackageInfo.java index 5c6ac6c3a7c5..91fcce338d10 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicPackageInfo.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicPackageInfo.java @@ -16,8 +16,10 @@ import com.google.api.generator.engine.ast.PackageInfoDefinition; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; /** A thin wrapper around PackageInfoDefinition to maintain a clean separation of concerns. */ +@NullMarked @AutoValue public abstract class GapicPackageInfo { public abstract PackageInfoDefinition packageInfo(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicRetrySettings.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicRetrySettings.java index c6539b20883a..d5c1b9339c82 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicRetrySettings.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicRetrySettings.java @@ -17,7 +17,9 @@ import com.google.auto.value.AutoValue; import com.google.protobuf.Duration; import io.grpc.serviceconfig.MethodConfig.RetryPolicy; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class GapicRetrySettings { public enum Kind { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicServiceConfig.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicServiceConfig.java index a707d109a557..bf5f376a2238 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicServiceConfig.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicServiceConfig.java @@ -26,7 +26,9 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +@NullMarked public class GapicServiceConfig { public static final RetryPolicy EMPTY_RETRY_POLICY = RetryPolicy.newBuilder().build(); public static final Duration EMPTY_TIMEOUT = Duration.newBuilder().setSeconds(5).build(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java index ae9194eeb2b7..2cfedd936141 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java @@ -23,8 +23,10 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class HttpBindings { public enum HttpVerb { @@ -45,12 +47,10 @@ public abstract static class HttpBinding implements Comparable { // The dot-separated json_name of the field. // e.g. parent.iceberg-catalog-id - @Nullable - public abstract String jsonName(); + public abstract @Nullable String jsonName(); // An object that contains all info of the leaf level field - @Nullable - public abstract Field field(); + public abstract @Nullable Field field(); public boolean isOptional() { return field() != null && field().isProto3Optional(); @@ -64,8 +64,7 @@ public boolean isEnum() { return field() != null && field().isEnum(); } - @Nullable - public abstract String valuePattern(); + public abstract @Nullable String valuePattern(); public static HttpBindings.HttpBinding.Builder builder() { return new AutoValue_HttpBindings_HttpBinding.Builder(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/LongrunningOperation.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/LongrunningOperation.java index e23e8a6ee3f8..52073bd7e999 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/LongrunningOperation.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/LongrunningOperation.java @@ -16,16 +16,17 @@ import com.google.api.generator.engine.ast.TypeNode; import com.google.auto.value.AutoValue; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class LongrunningOperation { public abstract TypeNode responseType(); public abstract TypeNode metadataType(); - @Nullable - public abstract TypeNode operationServiceStubType(); + public abstract @Nullable TypeNode operationServiceStubType(); public static Builder builder() { return new AutoValue_LongrunningOperation.Builder(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Message.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Message.java index 2866e8462410..2abbe4a2d912 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Message.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Message.java @@ -31,8 +31,10 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class Message { @@ -62,8 +64,7 @@ public abstract class Message { public abstract ImmutableMap fieldMap(); - @Nullable - public abstract OperationResponse operationResponse(); + public abstract @Nullable OperationResponse operationResponse(); public abstract Map operationRequestFields(); @@ -71,8 +72,7 @@ public abstract class Message { // The resource name annotation (and definition) in this message. Optional. // Expected dto be empty for messages that have no such definition. - @Nullable - public abstract ResourceName resource(); + public abstract @Nullable ResourceName resource(); // The nested types in left-to-right order, if any. // Example: com.google.Foo.Bar.Car.ThisType will have the outer types listed in the order @@ -143,8 +143,7 @@ public void validateField(String fieldName, Map messageTypes, T } /** Returns the first list repeated field in a message, unwrapped from its list type. */ - @Nullable - public Field findAndUnwrapPaginatedRepeatedField() { + public @Nullable Field findAndUnwrapPaginatedRepeatedField() { for (Field field : fields()) { if (field.isMap()) { List repeatedGenericMapRefs = field.type().reference().generics(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Method.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Method.java index 66acd065a3f8..784977a5e843 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Method.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Method.java @@ -19,8 +19,10 @@ import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class Method { public enum Stream { @@ -46,27 +48,21 @@ public boolean isPaged() { return pageSizeFieldName() != null; } - @Nullable - public abstract String pageSizeFieldName(); + public abstract @Nullable String pageSizeFieldName(); public abstract boolean isDeprecated(); - @Nullable - public abstract LongrunningOperation lro(); + public abstract @Nullable LongrunningOperation lro(); - @Nullable - public abstract String description(); + public abstract @Nullable String description(); // Example: google.iam.v1.IAMPolicy. - @Nullable - public abstract String mixedInApiName(); + public abstract @Nullable String mixedInApiName(); // HttpBinding pending dotted reference support. - @Nullable - public abstract HttpBindings httpBindings(); + public abstract @Nullable HttpBindings httpBindings(); - @Nullable - public abstract RoutingHeaderRule routingHeaderRule(); + public abstract @Nullable RoutingHeaderRule routingHeaderRule(); // Example from Expand in echo.proto: Thet TypeNodes that map to // [["content", "error"], ["content", "error", "info"]]. diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/MethodArgument.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/MethodArgument.java index e13deda713c8..013078adea9f 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/MethodArgument.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/MethodArgument.java @@ -18,7 +18,10 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import java.util.List; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class MethodArgument implements Comparable { // The method argument name. @@ -47,7 +50,7 @@ public int compareTo(MethodArgument other) { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof MethodArgument)) { return false; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/OperationResponse.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/OperationResponse.java index 9ad5ac385f48..08f2b9922827 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/OperationResponse.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/OperationResponse.java @@ -16,7 +16,9 @@ package com.google.api.generator.gapic.model; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class OperationResponse { public abstract String nameFieldName(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ReflectConfig.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ReflectConfig.java index 05f7220756c3..d1757bd6ae9b 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ReflectConfig.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ReflectConfig.java @@ -14,6 +14,9 @@ package com.google.api.generator.gapic.model; +import org.jspecify.annotations.NullMarked; + +@NullMarked public class ReflectConfig { String name; boolean queryAllDeclaredConstructors = true; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RegionTag.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RegionTag.java index e4643de654bd..972efee67676 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RegionTag.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RegionTag.java @@ -19,12 +19,14 @@ import com.google.api.generator.gapic.utils.JavaStyle; import com.google.auto.value.AutoValue; import com.google.common.base.Preconditions; +import org.jspecify.annotations.NullMarked; // TODO: alicejli edit RegionTag to match other languages /** * This model represents a code sample region tag. Matching region start and end region tag comments * are used to determine the boundaries of code snippets to be used in documentation. */ +@NullMarked @AutoValue public abstract class RegionTag { public abstract String apiShortName(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceName.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceName.java index 9a01bf6dba08..baec73da0f58 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceName.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceName.java @@ -26,8 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Objects; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class ResourceName { static final String SLASH = "/"; @@ -57,8 +59,7 @@ public abstract class ResourceName { public abstract boolean isOnlyWildcard(); - @Nullable - public String getMatchingPattern(HttpBindings bindings) { + public @Nullable String getMatchingPattern(HttpBindings bindings) { List bindingPatterns = ImmutableList.builder() .add(bindings.pattern()) @@ -91,11 +92,9 @@ public String getMatchingPattern(HttpBindings bindings) { // The message in which this resource was defined. Optional. // This is expected to be empty for file-level definitions. - @Nullable - public abstract String parentMessageName(); + public abstract @Nullable String parentMessageName(); - @Nullable - public abstract String description(); + public abstract @Nullable String description(); public boolean hasParentMessageName() { return parentMessageName() != null; @@ -128,7 +127,7 @@ public static ResourceName createWildcard(String resourceTypeString, String pakk } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof ResourceName)) { return false; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceReference.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceReference.java index 8140a8c2318d..f319b8f6f264 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceReference.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/ResourceReference.java @@ -16,7 +16,10 @@ import com.google.api.generator.gapic.utils.ResourceNameConstants; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class ResourceReference { @@ -29,7 +32,7 @@ public boolean isOnlyWildcard() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (!(o instanceof ResourceReference)) { return false; } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RetrySettings.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RetrySettings.java index acb85487f3b8..8f83b8ef7e8a 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RetrySettings.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RetrySettings.java @@ -17,7 +17,9 @@ import com.google.auto.value.AutoValue; import com.google.protobuf.Duration; import io.grpc.serviceconfig.MethodConfig.RetryPolicy; +import org.jspecify.annotations.NullMarked; +@NullMarked @AutoValue public abstract class RetrySettings { public abstract Duration timeout(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RoutingHeaderRule.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RoutingHeaderRule.java index ff6cf4de284d..ff6f11dfa662 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RoutingHeaderRule.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/RoutingHeaderRule.java @@ -18,12 +18,14 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import java.util.List; +import org.jspecify.annotations.NullMarked; /** * This model represents routing rules configured in rpc services. It will be used for generating * the logic to match-and-extract field values from request, the extracted values will be * concatenated to a request header that is used for routing purposes. */ +@NullMarked @AutoValue public abstract class RoutingHeaderRule { diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Sample.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Sample.java index 27a999853add..966e45de03e0 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Sample.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Sample.java @@ -20,11 +20,13 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import java.util.List; +import org.jspecify.annotations.NullMarked; /** * This model represents a generated code sample. It contains the information needed to generate a * sample file. */ +@NullMarked @AutoValue public abstract class Sample { public abstract List body(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Service.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Service.java index 656bf6bbd3af..835f086ed5e8 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Service.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Service.java @@ -21,14 +21,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import java.util.List; -import javax.annotation.Nullable; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked @AutoValue public abstract class Service { public abstract String name(); - @Nullable - public abstract String apiVersion(); + public abstract @Nullable String apiVersion(); public abstract String defaultHost(); @@ -48,8 +49,7 @@ public abstract class Service { public abstract ImmutableList methods(); - @Nullable - public abstract String description(); + public abstract @Nullable String description(); public boolean hasDescription() { return !Strings.isNullOrEmpty(description()); @@ -79,7 +79,7 @@ public String packageVersion() { return ""; } - public Method operationPollingMethod() { + public @Nullable Method operationPollingMethod() { for (Method method : methods()) { if (method.isOperationPollingMethod()) { return method; @@ -88,7 +88,7 @@ public Method operationPollingMethod() { return null; } - public TypeNode operationServiceStubType() { + public @Nullable TypeNode operationServiceStubType() { for (Method method : methods()) { if (method.hasLro() && method.lro().operationServiceStubType() != null) { // All methods within the same service must have the same operationServiceTypeName if @@ -99,7 +99,7 @@ public TypeNode operationServiceStubType() { return null; } - public TypeNode operationType() { + public @Nullable TypeNode operationType() { for (Method method : methods()) { if (method.hasLro() && method.lro().operationServiceStubType() != null) { return method.outputType(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/SourceCodeInfoLocation.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/SourceCodeInfoLocation.java index f39cb3953066..2fff60c11929 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/SourceCodeInfoLocation.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/SourceCodeInfoLocation.java @@ -16,11 +16,13 @@ import com.google.protobuf.DescriptorProtos.SourceCodeInfo.Location; import javax.annotation.Nonnull; +import org.jspecify.annotations.NullMarked; /** * A light wrapper around SourceCodeInfo.Location to provide cleaner protobuf comments. Please see * additional documentation on descriptor.proto. */ +@NullMarked public class SourceCodeInfoLocation { @Nonnull private final Location location; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Transport.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Transport.java index 87d49820bf83..61fd21b2e3da 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Transport.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Transport.java @@ -14,6 +14,9 @@ package com.google.api.generator.gapic.model; +import org.jspecify.annotations.NullMarked; + +@NullMarked public enum Transport { REST, GRPC, diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/BatchingSettingsConfigParser.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/BatchingSettingsConfigParser.java index e7a88a27a7a4..1fce3ba8ea21 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/BatchingSettingsConfigParser.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/BatchingSettingsConfigParser.java @@ -27,10 +27,12 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import org.jspecify.annotations.NullMarked; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; +@NullMarked public class BatchingSettingsConfigParser { private static String LIMIT_EXCEEDED_BEHAVIOR_THROW_EXCEPTION_YAML_VALUE = "THROW_EXCEPTION"; private static String LIMIT_EXCEEDED_BEHAVIOR_BLOCK_YAML_VALUE = "BLOCK"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/GapicLanguageSettingsParser.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/GapicLanguageSettingsParser.java index 1f957cb23a0f..bad2de8d2ab4 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/GapicLanguageSettingsParser.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/GapicLanguageSettingsParser.java @@ -24,10 +24,12 @@ import java.nio.file.Paths; import java.util.Map; import java.util.Optional; +import org.jspecify.annotations.NullMarked; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; +@NullMarked public class GapicLanguageSettingsParser { private static final String YAML_KEY_LANGUAGE_SETTINGS = "language_settings"; private static final String YAML_KEY_JAVA = "java"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/GapicLroRetrySettingsParser.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/GapicLroRetrySettingsParser.java index 263d227b227e..40aac8854fc2 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/GapicLroRetrySettingsParser.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/GapicLroRetrySettingsParser.java @@ -26,10 +26,12 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import org.jspecify.annotations.NullMarked; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; +@NullMarked public class GapicLroRetrySettingsParser { private static final String YAML_KEY_INTERFACES = "interfaces"; private static final String YAML_KEY_NAME = "name"; diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java index 0ea1c5aa456e..9bd6f14ac2f7 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/protoparser/HttpRuleParser.java @@ -40,13 +40,16 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; +@NullMarked public class HttpRuleParser { private static final String ASTERISK = "*"; private static final Pattern TEMPLATE_VALS_PATTERN = Pattern.compile("\\{(?[\\w.]*)=(?