From dc13ef770ce58e53a0a0a0d1436681148eca587b Mon Sep 17 00:00:00 2001 From: Nicole Lee Date: Thu, 25 Jun 2026 15:03:57 +0000 Subject: [PATCH 1/4] feat(gapic-generator): Add Nullable annotation to generated classes --- .../showcase/v1beta1/ComplianceClient.java | 4 +- .../google/showcase/v1beta1/EchoClient.java | 4 +- .../showcase/v1beta1/IdentityClient.java | 4 +- .../showcase/v1beta1/MessagingClient.java | 8 ++-- .../v1beta1/SequenceServiceClient.java | 4 +- .../showcase/v1beta1/TestingClient.java | 4 +- .../showcase/v1beta1/stub/EchoStub.java | 3 ++ .../showcase/v1beta1/stub/MessagingStub.java | 3 ++ .../google/showcase/v1beta1/BlurbName.java | 6 ++- .../google/showcase/v1beta1/ProfileName.java | 6 ++- .../com/google/showcase/v1beta1/RoomName.java | 6 ++- .../google/showcase/v1beta1/SequenceName.java | 6 ++- .../showcase/v1beta1/SequenceReportName.java | 6 ++- .../google/showcase/v1beta1/SessionName.java | 6 ++- .../v1beta1/StreamingSequenceName.java | 6 ++- .../v1beta1/StreamingSequenceReportName.java | 6 ++- .../com/google/showcase/v1beta1/TestName.java | 6 ++- .../com/google/showcase/v1beta1/UserName.java | 6 ++- .../javac.20260624_193339.args | 1 + .../javac.20260624_193425.args | 1 + .../gapic-generator-java/pom.xml | 3 ++ .../AbstractServiceClientClassComposer.java | 46 +++++++++++++------ .../AbstractServiceStubClassComposer.java | 2 + .../grpcrest/ServiceStubClassComposer.java | 6 +++ .../ResourceNameHelperClassComposer.java | 30 ++++++++++-- ...cServiceClientWithNestedClassImport.golden | 4 +- .../grpc/goldens/BookshopClient.golden | 4 +- .../goldens/DeprecatedServiceClient.golden | 4 +- .../composer/grpc/goldens/EchoClient.golden | 4 +- .../EchoServiceSelectiveGapicClient.golden | 4 +- .../grpc/goldens/IdentityClient.golden | 4 +- .../grpc/goldens/MessagingClient.golden | 4 +- .../grpcrest/goldens/EchoClient.golden | 4 +- .../grpcrest/goldens/WickedClient.golden | 4 +- .../resourcename/goldens/AgentName.golden | 6 ++- .../goldens/BillingAccountLocationName.golden | 6 ++- .../goldens/CollisionResourceName.golden | 6 ++- .../resourcename/goldens/FoobarName.golden | 6 ++- .../resourcename/goldens/SessionName.golden | 6 ++- .../resourcename/goldens/TestName.golden | 6 ++- .../v1/ConnectionServiceClient.java | 4 +- .../cloud/apigeeconnect/v1/EndpointName.java | 6 ++- .../cloud/apigeeconnect/v1/TetherClient.java | 4 +- .../cloud/asset/v1/AssetServiceClient.java | 4 +- .../com/google/cloud/asset/v1/FeedName.java | 6 ++- .../com/google/cloud/asset/v1/FolderName.java | 6 ++- .../cloud/asset/v1/OrganizationName.java | 6 ++- .../google/cloud/asset/v1/ProjectName.java | 6 ++- .../google/cloud/asset/v1/SavedQueryName.java | 6 ++- .../cloud/asset/v1/stub/AssetServiceStub.java | 3 ++ .../com/google/bigtable/v2/InstanceName.java | 6 ++- .../src/com/google/bigtable/v2/TableName.java | 6 ++- .../data/v2/BaseBigtableDataClient.java | 4 +- .../compute/v1small/AddressesClient.java | 4 +- .../v1small/RegionOperationsClient.java | 4 +- .../credentials/v1/IamCredentialsClient.java | 4 +- .../credentials/v1/ServiceAccountName.java | 6 ++- .../com/google/iam/v1/IAMPolicyClient.java | 4 +- .../google/cloud/kms/v1/CryptoKeyName.java | 6 ++- .../cloud/kms/v1/CryptoKeyVersionName.java | 6 ++- .../google/cloud/kms/v1/ImportJobName.java | 6 ++- .../kms/v1/KeyManagementServiceClient.java | 4 +- .../com/google/cloud/kms/v1/KeyRingName.java | 6 ++- .../com/google/cloud/kms/v1/LocationName.java | 6 ++- .../library/v1/LibraryServiceClient.java | 4 +- .../google/example/library/v1/BookName.java | 6 ++- .../google/example/library/v1/ShelfName.java | 6 ++- .../google/cloud/logging/v2/ConfigClient.java | 4 +- .../cloud/logging/v2/LoggingClient.java | 6 ++- .../cloud/logging/v2/MetricsClient.java | 4 +- .../v2/BillingAccountLocationName.java | 6 ++- .../google/logging/v2/BillingAccountName.java | 6 ++- .../google/logging/v2/CmekSettingsName.java | 6 ++- .../google/logging/v2/FolderLocationName.java | 6 ++- .../src/com/google/logging/v2/FolderName.java | 6 ++- .../com/google/logging/v2/LocationName.java | 6 ++- .../com/google/logging/v2/LogBucketName.java | 6 ++- .../google/logging/v2/LogExclusionName.java | 6 ++- .../com/google/logging/v2/LogMetricName.java | 6 ++- .../src/com/google/logging/v2/LogName.java | 6 ++- .../com/google/logging/v2/LogSinkName.java | 6 ++- .../com/google/logging/v2/LogViewName.java | 6 ++- .../logging/v2/OrganizationLocationName.java | 6 ++- .../google/logging/v2/OrganizationName.java | 6 ++- .../com/google/logging/v2/ProjectName.java | 6 ++- .../com/google/logging/v2/SettingsName.java | 6 ++- .../cloud/pubsub/v1/SchemaServiceClient.java | 4 +- .../pubsub/v1/SubscriptionAdminClient.java | 4 +- .../cloud/pubsub/v1/TopicAdminClient.java | 4 +- .../src/com/google/pubsub/v1/ProjectName.java | 6 ++- .../src/com/google/pubsub/v1/SchemaName.java | 6 ++- .../com/google/pubsub/v1/SnapshotName.java | 6 ++- .../google/pubsub/v1/SubscriptionName.java | 6 ++- .../src/com/google/pubsub/v1/TopicName.java | 6 ++- .../cloud/redis/v1beta1/CloudRedisClient.java | 4 +- .../cloud/redis/v1beta1/InstanceName.java | 6 ++- .../cloud/redis/v1beta1/LocationName.java | 6 ++- .../redis/v1beta1/stub/CloudRedisStub.java | 3 ++ .../src/com/google/storage/v2/BucketName.java | 6 ++- .../com/google/storage/v2/CryptoKeyName.java | 6 ++- .../google/storage/v2/NotificationName.java | 6 ++- .../com/google/storage/v2/ProjectName.java | 6 ++- .../com/google/storage/v2/StorageClient.java | 4 +- 103 files changed, 422 insertions(+), 171 deletions(-) create mode 100644 sdk-platform-java/gapic-generator-java/javac.20260624_193339.args create mode 100644 sdk-platform-java/gapic-generator-java/javac.20260624_193425.args diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceClient.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceClient.java index 7dfdbc833e6f..03049948a375 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceClient.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceClient.java @@ -42,6 +42,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -360,7 +361,7 @@ @BetaApi @Generated("by gapic-generator-java") public class ComplianceClient implements BackgroundResource { - private final ComplianceSettings settings; + @Nullable private final ComplianceSettings settings; private final ComplianceStub stub; /** Constructs an instance of ComplianceClient with default settings. */ @@ -398,6 +399,7 @@ protected ComplianceClient(ComplianceStub stub) { this.stub = stub; } + @Nullable public final ComplianceSettings getSettings() { return settings; } diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java index 951b15c1a69c..abbaf7dd8f1a 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoClient.java @@ -50,6 +50,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -369,7 +370,7 @@ @BetaApi @Generated("by gapic-generator-java") public class EchoClient implements BackgroundResource { - private final EchoSettings settings; + @Nullable private final EchoSettings settings; private final EchoStub stub; private final OperationsClient httpJsonOperationsClient; private final com.google.longrunning.OperationsClient operationsClient; @@ -415,6 +416,7 @@ protected EchoClient(EchoStub stub) { this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub()); } + @Nullable public final EchoSettings getSettings() { return settings; } diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentityClient.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentityClient.java index 2a08bf0f7598..4134b2d2707c 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentityClient.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentityClient.java @@ -43,6 +43,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -291,7 +292,7 @@ @BetaApi @Generated("by gapic-generator-java") public class IdentityClient implements BackgroundResource { - private final IdentitySettings settings; + @Nullable private final IdentitySettings settings; private final IdentityStub stub; /** Constructs an instance of IdentityClient with default settings. */ @@ -329,6 +330,7 @@ protected IdentityClient(IdentityStub stub) { this.stub = stub; } + @Nullable public final IdentitySettings getSettings() { return settings; } diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingClient.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingClient.java index 4f2f1f868ca1..cd2b13d79bf3 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingClient.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingClient.java @@ -51,6 +51,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -454,7 +455,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MessagingClient implements BackgroundResource { - private final MessagingSettings settings; + @Nullable private final MessagingSettings settings; private final MessagingStub stub; private final OperationsClient httpJsonOperationsClient; private final com.google.longrunning.OperationsClient operationsClient; @@ -500,6 +501,7 @@ protected MessagingClient(MessagingStub stub) { this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub()); } + @Nullable public final MessagingSettings getSettings() { return settings; } @@ -1976,7 +1978,7 @@ public final UnaryCallable listBlurbsCall * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final OperationFuture searchBlurbsAsync( - ProfileName parent, String query) { + @Nullable ProfileName parent, String query) { SearchBlurbsRequest request = SearchBlurbsRequest.newBuilder() .setParent(parent == null ? null : parent.toString()) @@ -2013,7 +2015,7 @@ public final OperationFuture searchB * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final OperationFuture searchBlurbsAsync( - RoomName parent, String query) { + @Nullable RoomName parent, String query) { SearchBlurbsRequest request = SearchBlurbsRequest.newBuilder() .setParent(parent == null ? null : parent.toString()) diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceClient.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceClient.java index f3e48827b712..98103e5fe47b 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceClient.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceClient.java @@ -44,6 +44,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -314,7 +315,7 @@ @BetaApi @Generated("by gapic-generator-java") public class SequenceServiceClient implements BackgroundResource { - private final SequenceServiceSettings settings; + @Nullable private final SequenceServiceSettings settings; private final SequenceServiceStub stub; /** Constructs an instance of SequenceServiceClient with default settings. */ @@ -354,6 +355,7 @@ protected SequenceServiceClient(SequenceServiceStub stub) { this.stub = stub; } + @Nullable public final SequenceServiceSettings getSettings() { return settings; } diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingClient.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingClient.java index aea75b7a86e3..6f606629ecd7 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingClient.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingClient.java @@ -43,6 +43,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -323,7 +324,7 @@ @BetaApi @Generated("by gapic-generator-java") public class TestingClient implements BackgroundResource { - private final TestingSettings settings; + @Nullable private final TestingSettings settings; private final TestingStub stub; /** Constructs an instance of TestingClient with default settings. */ @@ -361,6 +362,7 @@ protected TestingClient(TestingStub stub) { this.stub = stub; } + @Nullable public final TestingSettings getSettings() { return settings; } diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStub.java index cd41c825e38a..ab557c80561e 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStub.java @@ -56,6 +56,7 @@ import com.google.showcase.v1beta1.WaitResponse; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -68,10 +69,12 @@ @Generated("by gapic-generator-java") public abstract class EchoStub implements BackgroundResource { + @Nullable public OperationsStub getOperationsStub() { return null; } + @Nullable public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() { return null; } diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStub.java index 370965e9c472..effe36ed498c 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStub.java @@ -62,6 +62,7 @@ import com.google.showcase.v1beta1.UpdateRoomRequest; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -74,10 +75,12 @@ @Generated("by gapic-generator-java") public abstract class MessagingStub implements BackgroundResource { + @Nullable public OperationsStub getOperationsStub() { return null; } + @Nullable public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() { return null; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java index 2e44117605ba..f81a82356e4a 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -188,6 +189,7 @@ public static String formatRoomLegacyRoomBlurbName(String room, String legacyRoo .toString(); } + @Nullable public static BlurbName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -218,7 +220,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable BlurbName> values) { List list = new ArrayList<>(values.size()); for (BlurbName value : values) { if (value == null) { @@ -275,7 +277,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ProfileName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ProfileName.java index ee06ebfc70ff..4853d557ee08 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ProfileName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ProfileName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String user) { return newBuilder().setUser(user).build().toString(); } + @Nullable public static ProfileName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ProfileName> values) { List list = new ArrayList<>(values.size()); for (ProfileName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomName.java index 1370b309df9a..c9a65bc2d448 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -64,6 +65,7 @@ public static String format(String room) { return newBuilder().setRoom(room).build().toString(); } + @Nullable public static RoomName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -81,7 +83,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable RoomName> values) { List list = new ArrayList<>(values.size()); for (RoomName value : values) { if (value == null) { @@ -123,7 +125,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceName.java index 81b4e7bd25d4..7510ed8fa380 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String sequence) { return newBuilder().setSequence(sequence).build().toString(); } + @Nullable public static SequenceName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SequenceName> values) { List list = new ArrayList<>(values.size()); for (SequenceName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportName.java index 16898ca82d83..4477f2ef6002 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String sequence) { return newBuilder().setSequence(sequence).build().toString(); } + @Nullable public static SequenceReportName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SequenceReportName> values) { List list = new ArrayList<>(values.size()); for (SequenceReportName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionName.java index 883685a36c55..dbebbded067c 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String session) { return newBuilder().setSession(session).build().toString(); } + @Nullable public static SessionName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SessionName> values) { List list = new ArrayList<>(values.size()); for (SessionName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceName.java index e87564212f17..69b59ae2d44b 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String streamingSequence) { return newBuilder().setStreamingSequence(streamingSequence).build().toString(); } + @Nullable public static StreamingSequenceName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedString return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable StreamingSequenceName> values) { List list = new ArrayList<>(values.size()); for (StreamingSequenceName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportName.java index ea6ae25d25b0..fd34ed49b8cc 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -66,6 +67,7 @@ public static String format(String streamingSequence) { return newBuilder().setStreamingSequence(streamingSequence).build().toString(); } + @Nullable public static StreamingSequenceReportName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -85,7 +87,7 @@ public static List parseList(List formatted return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable StreamingSequenceReportName> values) { List list = new ArrayList<>(values.size()); for (StreamingSequenceReportName value : values) { if (value == null) { @@ -127,7 +129,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestName.java index c8b6ed227aff..ff9faaca8be7 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String session, String test) { return newBuilder().setSession(session).setTest(test).build().toString(); } + @Nullable public static TestName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable TestName> values) { List list = new ArrayList<>(values.size()); for (TestName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserName.java b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserName.java index 7a9020f92bd9..b0e7894b1203 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserName.java +++ b/java-showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -64,6 +65,7 @@ public static String format(String user) { return newBuilder().setUser(user).build().toString(); } + @Nullable public static UserName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -81,7 +83,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable UserName> values) { List list = new ArrayList<>(values.size()); for (UserName value : values) { if (value == null) { @@ -123,7 +125,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/javac.20260624_193339.args b/sdk-platform-java/gapic-generator-java/javac.20260624_193339.args new file mode 100644 index 000000000000..ef9e996e7821 --- /dev/null +++ b/sdk-platform-java/gapic-generator-java/javac.20260624_193339.args @@ -0,0 +1 @@ +@/tmp/org.codehaus.plexus.compiler.javac.JavacCompiler832945198835244683arguments diff --git a/sdk-platform-java/gapic-generator-java/javac.20260624_193425.args b/sdk-platform-java/gapic-generator-java/javac.20260624_193425.args new file mode 100644 index 000000000000..1d52fbf906a0 --- /dev/null +++ b/sdk-platform-java/gapic-generator-java/javac.20260624_193425.args @@ -0,0 +1 @@ +@/tmp/org.codehaus.plexus.compiler.javac.JavacCompiler3879958095652267656arguments diff --git a/sdk-platform-java/gapic-generator-java/pom.xml b/sdk-platform-java/gapic-generator-java/pom.xml index ac9a2a948e24..6a3b03b0d47c 100644 --- a/sdk-platform-java/gapic-generator-java/pom.xml +++ b/sdk-platform-java/gapic-generator-java/pom.xml @@ -111,6 +111,9 @@ 8 8 + + com.google.auto.value.processor.AutoValueProcessor + com.google.auto.value diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index 42c7bd743fe4..39684ee8ed60 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -104,6 +104,7 @@ import java.util.stream.Collectors; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; public abstract class AbstractServiceClientClassComposer implements ClassComposer { private static final String CALLABLE_NAME_PATTERN = "%sCallable"; @@ -290,14 +291,19 @@ private List createFieldDeclarations( String varName = e.getKey(); TypeNode varType = e.getValue(); Variable variable = Variable.builder().setName(varName).setType(varType).build(); - VariableExpr varExpr = + VariableExpr.Builder varExprBuilder = VariableExpr.builder() .setVariable(variable) .setScope(ScopeNode.PRIVATE) .setIsFinal(true) - .setIsDecl(true) - .build(); - return ExprStatement.withExpr(varExpr); + .setIsDecl(true); + if (varName.equals("settings")) { + varExprBuilder = + varExprBuilder.setAnnotations( + Collections.singletonList( + AnnotationNode.withType(typeStore.get("Nullable")))); + } + return ExprStatement.withExpr(varExprBuilder.build()); }) .collect(Collectors.toList()); } @@ -577,6 +583,12 @@ private List createGetterMethods( ServiceClientCommentComposer.GET_OPERATIONS_CLIENT_METHOD_COMMENT); methodBuilder.setAnnotations(annotations); } + if (methodName.equals("getSettings")) { + methodBuilder = + methodBuilder.setAnnotations( + Collections.singletonList( + AnnotationNode.withType(typeStore.get("Nullable")))); + } return methodBuilder .setScope(ScopeNode.PUBLIC) .setName(methodName) @@ -750,15 +762,22 @@ private static List createMethodVariants( List arguments = signature.stream() .map( - methodArg -> - VariableExpr.builder() - .setVariable( - Variable.builder() - .setName(JavaStyle.toLowerCamelCase(methodArg.name())) - .setType(methodArg.type()) - .build()) - .setIsDecl(true) - .build()) + methodArg -> { + VariableExpr.Builder argBuilder = + VariableExpr.builder() + .setVariable( + Variable.builder() + .setName(JavaStyle.toLowerCamelCase(methodArg.name())) + .setType(methodArg.type()) + .build()) + .setIsDecl(true); + if (methodArg.isResourceNameHelper() && !methodArg.field().isRequired()) { + argBuilder.setAnnotations( + Collections.singletonList( + AnnotationNode.withType(typeStore.get("Nullable")))); + } + return argBuilder.build(); + }) .collect(Collectors.toList()); // Request proto builder. @@ -1789,6 +1808,7 @@ private static TypeStore createTypes(Service service, Map messa IOException.class, MoreExecutors.class, NullMarked.class, + Nullable.class, Objects.class, Operation.class, OperationFuture.class, diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java index 423a25eee11a..895d12f2406a 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java @@ -55,6 +55,7 @@ import java.util.stream.Collectors; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; public abstract class AbstractServiceStubClassComposer implements ClassComposer { @@ -273,6 +274,7 @@ private static TypeStore createTypes(Service service, Map messa ServerStreamingCallable.class, UnaryCallable.class, UnsupportedOperationException.class, + Nullable.class, NullMarked.class); TypeStore typeStore = new TypeStore(concreteClazzes); 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 6be0ef7ac204..89c041a64f76 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 @@ -15,6 +15,7 @@ */ package com.google.api.generator.gapic.composer.grpcrest; +import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.ReturnExpr; import com.google.api.generator.engine.ast.ScopeNode; @@ -22,6 +23,8 @@ 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 java.util.Collections; +import org.jspecify.annotations.Nullable; public class ServiceStubClassComposer extends AbstractServiceStubClassComposer { private static final ServiceStubClassComposer INSTANCE = new ServiceStubClassComposer(); @@ -39,6 +42,9 @@ protected MethodDefinition createOperationsStubGetterMethodDefinition( TypeNode returnType, String methodName, TypeStore typeStore) { return MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) + .setAnnotations( + Collections.singletonList( + AnnotationNode.withType(typeStore.get("Nullable")))) .setReturnType(returnType) .setName(methodName) .setReturnExpr(ReturnExpr.withExpr(ValueExpr.createNullExpr())) diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index 69f9ca96e0f9..25b8706300de 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -43,6 +43,7 @@ import com.google.api.generator.engine.ast.ThrowExpr; import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.engine.ast.ValueExpr; +import com.google.api.generator.engine.ast.VaporReference; import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.comment.CommentComposer; @@ -59,6 +60,7 @@ import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashSet; @@ -69,6 +71,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Generated; +import org.jspecify.annotations.Nullable; import org.jspecify.annotations.NullMarked; public class ResourceNameHelperClassComposer { @@ -792,6 +795,9 @@ private static MethodDefinition createParseMethod( return MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) .setIsStatic(true) + .setAnnotations( + Collections.singletonList( + AnnotationNode.withType(FIXED_TYPESTORE.get("Nullable")))) .setReturnType(thisClassType) .setName("parse") .setArguments(formattedStringArgDeclList) @@ -887,6 +893,9 @@ private static MethodDefinition createParseMethod( return MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) .setIsStatic(true) + .setAnnotations( + Collections.singletonList( + AnnotationNode.withType(FIXED_TYPESTORE.get("Nullable")))) .setReturnType(thisClassType) .setName("parse") .setArguments(formattedStringArgDeclList) @@ -970,7 +979,12 @@ private static MethodDefinition createToStringListMethod(TypeNode thisClassType) TypeNode.withReference( ConcreteReference.builder() .setClazz(List.class) - .setGenerics(Arrays.asList(thisClassType.reference())) + .setGenerics( + Arrays.asList( + VaporReference.builder() + .setName("@Nullable " + thisClassType.reference().name()) + .setPakkage(thisClassType.reference().pakkage()) + .build())) .build()); VariableExpr valuesVarExpr = VariableExpr.withVariable( @@ -1399,7 +1413,14 @@ private static MethodDefinition createEqualsMethod( return MethodDefinition.builder() .setIsOverride(true) .setScope(ScopeNode.PUBLIC) - .setArguments(argVarExpr.toBuilder().setIsDecl(true).build()) + .setArguments( + argVarExpr + .toBuilder() + .setIsDecl(true) + .setAnnotations( + Collections.singletonList( + AnnotationNode.withType(FIXED_TYPESTORE.get("Nullable")))) + .build()) .setReturnType(TypeNode.BOOLEAN) .setName("equals") .setReturnExpr(falseValueExpr) @@ -1702,12 +1723,13 @@ private static TypeStore createStaticTypes() { ImmutableMap.class, List.class, Map.class, + NullMarked.class, + Nullable.class, Objects.class, PathTemplate.class, Preconditions.class, com.google.api.resourcenames.ResourceName.class, - ValidationException.class, - NullMarked.class); + ValidationException.class); return new TypeStore(concreteClazzes); } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/engine/writer/goldens/GrpcServiceClientWithNestedClassImport.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/engine/writer/goldens/GrpcServiceClientWithNestedClassImport.golden index c5edba8acd9a..47b6909d6a0c 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/engine/writer/goldens/GrpcServiceClientWithNestedClassImport.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/engine/writer/goldens/GrpcServiceClientWithNestedClassImport.golden @@ -9,6 +9,7 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -99,7 +100,7 @@ import org.jspecify.annotations.NullMarked; @NullMarked @Generated("by gapic-generator-java") public class NestedMessageServiceClient implements BackgroundResource { - private final NestedMessageServiceSettings settings; + @Nullable private final NestedMessageServiceSettings settings; private final NestedMessageServiceStub stub; /** Constructs an instance of NestedMessageServiceClient with default settings. */ @@ -139,6 +140,7 @@ public class NestedMessageServiceClient implements BackgroundResource { this.stub = stub; } + @Nullable public final NestedMessageServiceSettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/BookshopClient.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/BookshopClient.golden index d093dec5b5a5..344f283d8839 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/BookshopClient.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/BookshopClient.golden @@ -10,6 +10,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -103,7 +104,7 @@ import org.jspecify.annotations.NullMarked; @BetaApi @Generated("by gapic-generator-java") public class BookshopClient implements BackgroundResource { - private final BookshopSettings settings; + @Nullable private final BookshopSettings settings; private final BookshopStub stub; /** Constructs an instance of BookshopClient with default settings. */ @@ -141,6 +142,7 @@ public class BookshopClient implements BackgroundResource { this.stub = stub; } + @Nullable public final BookshopSettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClient.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClient.golden index 5afedc72d093..097e22a67069 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClient.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClient.golden @@ -9,6 +9,7 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -115,7 +116,7 @@ import org.jspecify.annotations.NullMarked; @Deprecated @Generated("by gapic-generator-java") public class DeprecatedServiceClient implements BackgroundResource { - private final DeprecatedServiceSettings settings; + @Nullable private final DeprecatedServiceSettings settings; private final DeprecatedServiceStub stub; /** Constructs an instance of DeprecatedServiceClient with default settings. */ @@ -155,6 +156,7 @@ public class DeprecatedServiceClient implements BackgroundResource { this.stub = stub; } + @Nullable public final DeprecatedServiceSettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClient.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClient.golden index 153bc625a8c3..3abc1b8a84da 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClient.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClient.golden @@ -28,6 +28,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -265,7 +266,7 @@ import org.jspecify.annotations.NullMarked; @BetaApi @Generated("by gapic-generator-java") public class EchoClient implements BackgroundResource { - private final EchoSettings settings; + @Nullable private final EchoSettings settings; private final EchoStub stub; private final OperationsClient operationsClient; @@ -306,6 +307,7 @@ public class EchoClient implements BackgroundResource { this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } + @Nullable public final EchoSettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicClient.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicClient.golden index 7c2bf556b96d..e9434ef570f8 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicClient.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicClient.golden @@ -11,6 +11,7 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -160,7 +161,7 @@ import org.jspecify.annotations.NullMarked; @BetaApi @Generated("by gapic-generator-java") public class EchoServiceShouldGeneratePartialUsualClient implements BackgroundResource { - private final EchoServiceShouldGeneratePartialUsualSettings settings; + @Nullable private final EchoServiceShouldGeneratePartialUsualSettings settings; private final EchoServiceShouldGeneratePartialUsualStub stub; /** @@ -209,6 +210,7 @@ public class EchoServiceShouldGeneratePartialUsualClient implements BackgroundRe this.stub = stub; } + @Nullable public final EchoServiceShouldGeneratePartialUsualSettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/IdentityClient.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/IdentityClient.golden index 1f6390842460..969c9aecd202 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/IdentityClient.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/IdentityClient.golden @@ -18,6 +18,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -180,7 +181,7 @@ import org.jspecify.annotations.NullMarked; @BetaApi @Generated("by gapic-generator-java") public class IdentityClient implements BackgroundResource { - private final IdentitySettings settings; + @Nullable private final IdentitySettings settings; private final IdentityStub stub; /** Constructs an instance of IdentityClient with default settings. */ @@ -218,6 +219,7 @@ public class IdentityClient implements BackgroundResource { this.stub = stub; } + @Nullable public final IdentitySettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MessagingClient.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MessagingClient.golden index f53d16b8b749..74af089f3108 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MessagingClient.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MessagingClient.golden @@ -26,6 +26,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -330,7 +331,7 @@ import org.jspecify.annotations.NullMarked; @BetaApi @Generated("by gapic-generator-java") public class MessagingClient implements BackgroundResource { - private final MessagingSettings settings; + @Nullable private final MessagingSettings settings; private final MessagingStub stub; private final OperationsClient operationsClient; @@ -371,6 +372,7 @@ public class MessagingClient implements BackgroundResource { this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } + @Nullable public final MessagingSettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden index 35c02eda2d66..c7753a922c6a 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden @@ -28,6 +28,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -287,7 +288,7 @@ import org.jspecify.annotations.NullMarked; @BetaApi @Generated("by gapic-generator-java") public class EchoClient implements BackgroundResource { - private final EchoSettings settings; + @Nullable private final EchoSettings settings; private final EchoStub stub; private final OperationsClient httpJsonOperationsClient; private final com.google.longrunning.OperationsClient operationsClient; @@ -333,6 +334,7 @@ public class EchoClient implements BackgroundResource { this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub()); } + @Nullable public final EchoSettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedClient.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedClient.golden index fff1e0377a22..dc7a3584e0eb 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedClient.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedClient.golden @@ -11,6 +11,7 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -118,7 +119,7 @@ import org.jspecify.annotations.NullMarked; @BetaApi @Generated("by gapic-generator-java") public class WickedClient implements BackgroundResource { - private final WickedSettings settings; + @Nullable private final WickedSettings settings; private final WickedStub stub; /** Constructs an instance of WickedClient with default settings. */ @@ -156,6 +157,7 @@ public class WickedClient implements BackgroundResource { this.stub = stub; } + @Nullable public final WickedSettings getSettings() { return settings; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden index a35217c08a0a..85234ccb7b9f 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -92,6 +93,7 @@ public class AgentName implements ResourceName { return newProjectBuilder().setProject(project).build().toString(); } + @Nullable public static AgentName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -114,7 +116,7 @@ public class AgentName implements ResourceName { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable AgentName> values) { List list = new ArrayList<>(values.size()); for (AgentName value : values) { if (value == null) { @@ -159,7 +161,7 @@ public class AgentName implements ResourceName { } @Override - public boolean equals(java.lang.Object o) { + public boolean equals(@Nullable java.lang.Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden index bf9b58f73ed0..1b0b4382c95b 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden @@ -10,6 +10,7 @@ import java.util.Map; import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -57,6 +58,7 @@ public class BillingAccountLocationName implements ResourceName { return newBuilder().setBillingAccount(billingAccount).setLocation(location).build().toString(); } + @Nullable public static BillingAccountLocationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -76,7 +78,7 @@ public class BillingAccountLocationName implements ResourceName { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable BillingAccountLocationName> values) { List list = new ArrayList<>(values.size()); for (BillingAccountLocationName value : values) { if (value == null) { @@ -122,7 +124,7 @@ public class BillingAccountLocationName implements ResourceName { } @Override - public boolean equals(java.lang.Object o) { + public boolean equals(@Nullable java.lang.Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden index 515dc35aead2..cdc0273bab8e 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -92,6 +93,7 @@ public class ResourceName implements com.google.api.resourcenames.ResourceName { .toString(); } + @Nullable public static ResourceName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -115,7 +117,7 @@ public class ResourceName implements com.google.api.resourcenames.ResourceName { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ResourceName> values) { List list = new ArrayList<>(values.size()); for (ResourceName value : values) { if (value == null) { @@ -179,7 +181,7 @@ public class ResourceName implements com.google.api.resourcenames.ResourceName { } @Override - public boolean equals(java.lang.Object o) { + public boolean equals(@Nullable java.lang.Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden index c9e2d43c6959..b9a788599a7c 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -164,6 +165,7 @@ public class FoobarName implements ResourceName { return newBarFooFoobarBuilder().setBarFoo(barFoo).setFoobar(foobar).build().toString(); } + @Nullable public static FoobarName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -193,7 +195,7 @@ public class FoobarName implements ResourceName { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable FoobarName> values) { List list = new ArrayList<>(values.size()); for (FoobarName value : values) { if (value == null) { @@ -247,7 +249,7 @@ public class FoobarName implements ResourceName { } @Override - public boolean equals(java.lang.Object o) { + public boolean equals(@Nullable java.lang.Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/SessionName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/SessionName.golden index f5c711d82aa2..983988cf201c 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/SessionName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/SessionName.golden @@ -10,6 +10,7 @@ import java.util.Map; import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -49,6 +50,7 @@ public class SessionName implements ResourceName { return newBuilder().setSession(session).build().toString(); } + @Nullable public static SessionName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -67,7 +69,7 @@ public class SessionName implements ResourceName { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SessionName> values) { List list = new ArrayList<>(values.size()); for (SessionName value : values) { if (value == null) { @@ -109,7 +111,7 @@ public class SessionName implements ResourceName { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/TestName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/TestName.golden index 571aec00ec5f..8a6039f6b0c4 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/TestName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/TestName.golden @@ -10,6 +10,7 @@ import java.util.Map; import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -68,6 +69,7 @@ public class TestName implements ResourceName { .toString(); } + @Nullable public static TestName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -86,7 +88,7 @@ public class TestName implements ResourceName { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable TestName> values) { List list = new ArrayList<>(values.size()); for (TestName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public class TestName implements ResourceName { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceClient.java b/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceClient.java index 11a4a43a6524..38f6ada052e3 100644 --- a/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceClient.java +++ b/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceClient.java @@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -146,7 +147,7 @@ @NullMarked @Generated("by gapic-generator-java") public class ConnectionServiceClient implements BackgroundResource { - private final ConnectionServiceSettings settings; + @Nullable private final ConnectionServiceSettings settings; private final ConnectionServiceStub stub; /** Constructs an instance of ConnectionServiceClient with default settings. */ @@ -186,6 +187,7 @@ protected ConnectionServiceClient(ConnectionServiceStub stub) { this.stub = stub; } + @Nullable public final ConnectionServiceSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/EndpointName.java b/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/EndpointName.java index 9c8e5208230c..0d6db85437e2 100644 --- a/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/EndpointName.java +++ b/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/EndpointName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String endpoint) { return newBuilder().setProject(project).setEndpoint(endpoint).build().toString(); } + @Nullable public static EndpointName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable EndpointName> values) { List list = new ArrayList<>(values.size()); for (EndpointName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/TetherClient.java b/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/TetherClient.java index bd296833e614..2772ff99b6ea 100644 --- a/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/TetherClient.java +++ b/sdk-platform-java/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/TetherClient.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -122,7 +123,7 @@ @NullMarked @Generated("by gapic-generator-java") public class TetherClient implements BackgroundResource { - private final TetherSettings settings; + @Nullable private final TetherSettings settings; private final TetherStub stub; /** Constructs an instance of TetherClient with default settings. */ @@ -160,6 +161,7 @@ protected TetherClient(TetherStub stub) { this.stub = stub; } + @Nullable public final TetherSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClient.java b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClient.java index 9e2be2079cca..8f8fae56ab67 100644 --- a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClient.java +++ b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClient.java @@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -486,7 +487,7 @@ @NullMarked @Generated("by gapic-generator-java") public class AssetServiceClient implements BackgroundResource { - private final AssetServiceSettings settings; + @Nullable private final AssetServiceSettings settings; private final AssetServiceStub stub; private final OperationsClient httpJsonOperationsClient; private final com.google.longrunning.OperationsClient operationsClient; @@ -533,6 +534,7 @@ protected AssetServiceClient(AssetServiceStub stub) { this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub()); } + @Nullable public final AssetServiceSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java index ed33edd129ec..f8be0272cebe 100644 --- a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java +++ b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -150,6 +151,7 @@ public static String formatOrganizationFeedName(String organization, String feed .toString(); } + @Nullable public static FeedName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -175,7 +177,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable FeedName> values) { List list = new ArrayList<>(values.size()); for (FeedName value : values) { if (value == null) { @@ -228,7 +230,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FolderName.java b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FolderName.java index 29369cb83590..ddb7beeba993 100644 --- a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FolderName.java +++ b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FolderName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String folder) { return newBuilder().setFolder(folder).build().toString(); } + @Nullable public static FolderName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable FolderName> values) { List list = new ArrayList<>(values.size()); for (FolderName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/OrganizationName.java b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/OrganizationName.java index 0cadf25e6184..9610bc691334 100644 --- a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/OrganizationName.java +++ b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/OrganizationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String organization) { return newBuilder().setOrganization(organization).build().toString(); } + @Nullable public static OrganizationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable OrganizationName> values) { List list = new ArrayList<>(values.size()); for (OrganizationName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/ProjectName.java b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/ProjectName.java index e659b684f3f6..e3bbdc9422fa 100644 --- a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/ProjectName.java +++ b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/ProjectName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String project) { return newBuilder().setProject(project).build().toString(); } + @Nullable public static ProjectName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ProjectName> values) { List list = new ArrayList<>(values.size()); for (ProjectName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java index e565aefb9835..2b5c2671be2b 100644 --- a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java +++ b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -159,6 +160,7 @@ public static String formatOrganizationSavedQueryName(String organization, Strin .toString(); } + @Nullable public static SavedQueryName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -185,7 +187,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SavedQueryName> values) { List list = new ArrayList<>(values.size()); for (SavedQueryName value : values) { if (value == null) { @@ -238,7 +240,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStub.java b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStub.java index d38f4b4b7703..ed30a7d81b17 100644 --- a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStub.java +++ b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStub.java @@ -64,6 +64,7 @@ import com.google.protobuf.Empty; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -75,10 +76,12 @@ @Generated("by gapic-generator-java") public abstract class AssetServiceStub implements BackgroundResource { + @Nullable public OperationsStub getOperationsStub() { return null; } + @Nullable public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() { return null; } diff --git a/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/bigtable/v2/InstanceName.java b/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/bigtable/v2/InstanceName.java index 6e36641b3114..1e835fb48b36 100644 --- a/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/bigtable/v2/InstanceName.java +++ b/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/bigtable/v2/InstanceName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String instance) { return newBuilder().setProject(project).setInstance(instance).build().toString(); } + @Nullable public static InstanceName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable InstanceName> values) { List list = new ArrayList<>(values.size()); for (InstanceName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/bigtable/v2/TableName.java b/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/bigtable/v2/TableName.java index 200ca73023f9..54f645694594 100644 --- a/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/bigtable/v2/TableName.java +++ b/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/bigtable/v2/TableName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -85,6 +86,7 @@ public static String format(String project, String instance, String table) { .toString(); } + @Nullable public static TableName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -103,7 +105,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable TableName> values) { List list = new ArrayList<>(values.size()); for (TableName value : values) { if (value == null) { @@ -152,7 +154,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java b/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java index f4b922e30f27..01d1bd36cabd 100644 --- a/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java +++ b/sdk-platform-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java @@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -239,7 +240,7 @@ @NullMarked @Generated("by gapic-generator-java") public class BaseBigtableDataClient implements BackgroundResource { - private final BaseBigtableDataSettings settings; + @Nullable private final BaseBigtableDataSettings settings; private final BigtableStub stub; /** Constructs an instance of BaseBigtableDataClient with default settings. */ @@ -279,6 +280,7 @@ protected BaseBigtableDataClient(BigtableStub stub) { this.stub = stub; } + @Nullable public final BaseBigtableDataSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java b/sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java index 7ae225f7cdfb..1e652a18bd98 100644 --- a/sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java +++ b/sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java @@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -190,7 +191,7 @@ @NullMarked @Generated("by gapic-generator-java") public class AddressesClient implements BackgroundResource { - private final AddressesSettings settings; + @Nullable private final AddressesSettings settings; private final AddressesStub stub; /** Constructs an instance of AddressesClient with default settings. */ @@ -228,6 +229,7 @@ protected AddressesClient(AddressesStub stub) { this.stub = stub; } + @Nullable public final AddressesSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/RegionOperationsClient.java b/sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/RegionOperationsClient.java index 8531bab2388b..cf1e94a7f08e 100644 --- a/sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/RegionOperationsClient.java +++ b/sdk-platform-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/RegionOperationsClient.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -140,7 +141,7 @@ @NullMarked @Generated("by gapic-generator-java") public class RegionOperationsClient implements BackgroundResource { - private final RegionOperationsSettings settings; + @Nullable private final RegionOperationsSettings settings; private final RegionOperationsStub stub; /** Constructs an instance of RegionOperationsClient with default settings. */ @@ -180,6 +181,7 @@ protected RegionOperationsClient(RegionOperationsStub stub) { this.stub = stub; } + @Nullable public final RegionOperationsSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java b/sdk-platform-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java index 809d9f7bc606..19a4cf52e347 100644 --- a/sdk-platform-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java +++ b/sdk-platform-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -202,7 +203,7 @@ @NullMarked @Generated("by gapic-generator-java") public class IamCredentialsClient implements BackgroundResource { - private final IamCredentialsSettings settings; + @Nullable private final IamCredentialsSettings settings; private final IamCredentialsStub stub; /** Constructs an instance of IamCredentialsClient with default settings. */ @@ -242,6 +243,7 @@ protected IamCredentialsClient(IamCredentialsStub stub) { this.stub = stub; } + @Nullable public final IamCredentialsSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/ServiceAccountName.java b/sdk-platform-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/ServiceAccountName.java index 29071fff8871..f49a33025e1b 100644 --- a/sdk-platform-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/ServiceAccountName.java +++ b/sdk-platform-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/ServiceAccountName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String serviceAccount) { return newBuilder().setProject(project).setServiceAccount(serviceAccount).build().toString(); } + @Nullable public static ServiceAccountName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ServiceAccountName> values) { List list = new ArrayList<>(values.size()); for (ServiceAccountName value : values) { if (value == null) { @@ -136,7 +138,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClient.java b/sdk-platform-java/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClient.java index 0599d925334f..35705196cce2 100644 --- a/sdk-platform-java/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClient.java +++ b/sdk-platform-java/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClient.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -168,7 +169,7 @@ @NullMarked @Generated("by gapic-generator-java") public class IAMPolicyClient implements BackgroundResource { - private final IAMPolicySettings settings; + @Nullable private final IAMPolicySettings settings; private final IAMPolicyStub stub; /** Constructs an instance of IAMPolicyClient with default settings. */ @@ -206,6 +207,7 @@ protected IAMPolicyClient(IAMPolicyStub stub) { this.stub = stub; } + @Nullable public final IAMPolicySettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyName.java b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyName.java index 9926a26800fa..5a901f3d8b95 100644 --- a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyName.java +++ b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -99,6 +100,7 @@ public static String format(String project, String location, String keyRing, Str .toString(); } + @Nullable public static CryptoKeyName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -121,7 +123,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable CryptoKeyName> values) { List list = new ArrayList<>(values.size()); for (CryptoKeyName value : values) { if (value == null) { @@ -173,7 +175,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyVersionName.java b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyVersionName.java index c874db01eba9..41704d81d91d 100644 --- a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyVersionName.java +++ b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyVersionName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -109,6 +110,7 @@ public static String format( .toString(); } + @Nullable public static CryptoKeyVersionName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -132,7 +134,7 @@ public static List parseList(List formattedStrings return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable CryptoKeyVersionName> values) { List list = new ArrayList<>(values.size()); for (CryptoKeyVersionName value : values) { if (value == null) { @@ -196,7 +198,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/ImportJobName.java b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/ImportJobName.java index 11769b9fcaec..200f88d74b5e 100644 --- a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/ImportJobName.java +++ b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/ImportJobName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -99,6 +100,7 @@ public static String format(String project, String location, String keyRing, Str .toString(); } + @Nullable public static ImportJobName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -121,7 +123,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ImportJobName> values) { List list = new ArrayList<>(values.size()); for (ImportJobName value : values) { if (value == null) { @@ -173,7 +175,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClient.java b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClient.java index 2346dcd09a38..fa43e0a71d8c 100644 --- a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClient.java +++ b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClient.java @@ -43,6 +43,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -634,7 +635,7 @@ @NullMarked @Generated("by gapic-generator-java") public class KeyManagementServiceClient implements BackgroundResource { - private final KeyManagementServiceSettings settings; + @Nullable private final KeyManagementServiceSettings settings; private final KeyManagementServiceStub stub; /** Constructs an instance of KeyManagementServiceClient with default settings. */ @@ -674,6 +675,7 @@ protected KeyManagementServiceClient(KeyManagementServiceStub stub) { this.stub = stub; } + @Nullable public final KeyManagementServiceSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyRingName.java b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyRingName.java index b2faeab39438..e9679eacde0d 100644 --- a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyRingName.java +++ b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyRingName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -85,6 +86,7 @@ public static String format(String project, String location, String keyRing) { .toString(); } + @Nullable public static KeyRingName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -103,7 +105,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable KeyRingName> values) { List list = new ArrayList<>(values.size()); for (KeyRingName value : values) { if (value == null) { @@ -152,7 +154,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/LocationName.java b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/LocationName.java index 8d115370779b..dff995261ded 100644 --- a/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/LocationName.java +++ b/sdk-platform-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/LocationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String location) { return newBuilder().setProject(project).setLocation(location).build().toString(); } + @Nullable public static LocationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LocationName> values) { List list = new ArrayList<>(values.size()); for (LocationName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClient.java b/sdk-platform-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClient.java index 7146943da73b..716652497473 100644 --- a/sdk-platform-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClient.java +++ b/sdk-platform-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClient.java @@ -51,6 +51,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -355,7 +356,7 @@ @NullMarked @Generated("by gapic-generator-java") public class LibraryServiceClient implements BackgroundResource { - private final LibraryServiceSettings settings; + @Nullable private final LibraryServiceSettings settings; private final LibraryServiceStub stub; /** Constructs an instance of LibraryServiceClient with default settings. */ @@ -395,6 +396,7 @@ protected LibraryServiceClient(LibraryServiceStub stub) { this.stub = stub; } + @Nullable public final LibraryServiceSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/library/src/com/google/example/library/v1/BookName.java b/sdk-platform-java/test/integration/goldens/library/src/com/google/example/library/v1/BookName.java index a115d587e51d..fcc72db032b3 100644 --- a/sdk-platform-java/test/integration/goldens/library/src/com/google/example/library/v1/BookName.java +++ b/sdk-platform-java/test/integration/goldens/library/src/com/google/example/library/v1/BookName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String shelf, String book) { return newBuilder().setShelf(shelf).setBook(book).build().toString(); } + @Nullable public static BookName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable BookName> values) { List list = new ArrayList<>(values.size()); for (BookName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/library/src/com/google/example/library/v1/ShelfName.java b/sdk-platform-java/test/integration/goldens/library/src/com/google/example/library/v1/ShelfName.java index 172ce6f1d71c..73cb3a6ac6db 100644 --- a/sdk-platform-java/test/integration/goldens/library/src/com/google/example/library/v1/ShelfName.java +++ b/sdk-platform-java/test/integration/goldens/library/src/com/google/example/library/v1/ShelfName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String shelfId) { return newBuilder().setShelfId(shelfId).build().toString(); } + @Nullable public static ShelfName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ShelfName> values) { List list = new ArrayList<>(values.size()); for (ShelfName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClient.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClient.java index 3b949565cc9e..98e9cbc9ad75 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClient.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClient.java @@ -87,6 +87,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -634,7 +635,7 @@ @NullMarked @Generated("by gapic-generator-java") public class ConfigClient implements BackgroundResource { - private final ConfigSettings settings; + @Nullable private final ConfigSettings settings; private final ConfigServiceV2Stub stub; private final OperationsClient operationsClient; @@ -675,6 +676,7 @@ protected ConfigClient(ConfigServiceV2Stub stub) { this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } + @Nullable public final ConfigSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClient.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClient.java index 707c661a9e79..ae5d0fd700ab 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClient.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClient.java @@ -54,6 +54,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -232,7 +233,7 @@ @NullMarked @Generated("by gapic-generator-java") public class LoggingClient implements BackgroundResource { - private final LoggingSettings settings; + @Nullable private final LoggingSettings settings; private final LoggingServiceV2Stub stub; /** Constructs an instance of LoggingClient with default settings. */ @@ -270,6 +271,7 @@ protected LoggingClient(LoggingServiceV2Stub stub) { this.stub = stub; } + @Nullable public final LoggingSettings getSettings() { return settings; } @@ -488,7 +490,7 @@ public final UnaryCallable deleteLogCallable() { * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final WriteLogEntriesResponse writeLogEntries( - LogName logName, + @Nullable LogName logName, MonitoredResource resource, Map labels, List entries) { diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClient.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClient.java index 298de5923a4d..b2d61417a443 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClient.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClient.java @@ -42,6 +42,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -211,7 +212,7 @@ @NullMarked @Generated("by gapic-generator-java") public class MetricsClient implements BackgroundResource { - private final MetricsSettings settings; + @Nullable private final MetricsSettings settings; private final MetricsServiceV2Stub stub; /** Constructs an instance of MetricsClient with default settings. */ @@ -249,6 +250,7 @@ protected MetricsClient(MetricsServiceV2Stub stub) { this.stub = stub; } + @Nullable public final MetricsSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/BillingAccountLocationName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/BillingAccountLocationName.java index 178a8e99bf96..6f1d5d8d7394 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/BillingAccountLocationName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/BillingAccountLocationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -73,6 +74,7 @@ public static String format(String billingAccount, String location) { return newBuilder().setBillingAccount(billingAccount).setLocation(location).build().toString(); } + @Nullable public static BillingAccountLocationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -92,7 +94,7 @@ public static List parseList(List formattedS return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable BillingAccountLocationName> values) { List list = new ArrayList<>(values.size()); for (BillingAccountLocationName value : values) { if (value == null) { @@ -138,7 +140,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/BillingAccountName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/BillingAccountName.java index 7a0fcf839421..3ffdc395e966 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/BillingAccountName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/BillingAccountName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String billingAccount) { return newBuilder().setBillingAccount(billingAccount).build().toString(); } + @Nullable public static BillingAccountName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable BillingAccountName> values) { List list = new ArrayList<>(values.size()); for (BillingAccountName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java index 103c3a818915..2340bb389b6d 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -168,6 +169,7 @@ public static String formatBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build().toString(); } + @Nullable public static CmekSettingsName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -196,7 +198,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable CmekSettingsName> values) { List list = new ArrayList<>(values.size()); for (CmekSettingsName value : values) { if (value == null) { @@ -250,7 +252,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/FolderLocationName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/FolderLocationName.java index 4676ef17d701..6a8cb0d66381 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/FolderLocationName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/FolderLocationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String folder, String location) { return newBuilder().setFolder(folder).setLocation(location).build().toString(); } + @Nullable public static FolderLocationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable FolderLocationName> values) { List list = new ArrayList<>(values.size()); for (FolderLocationName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/FolderName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/FolderName.java index ad975e6564ff..a5bb03362667 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/FolderName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/FolderName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String folder) { return newBuilder().setFolder(folder).build().toString(); } + @Nullable public static FolderName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable FolderName> values) { List list = new ArrayList<>(values.size()); for (FolderName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LocationName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LocationName.java index e869cb57f633..29b5002ba954 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LocationName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LocationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String location) { return newBuilder().setProject(project).setLocation(location).build().toString(); } + @Nullable public static LocationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LocationName> values) { List list = new ArrayList<>(values.size()); for (LocationName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java index d5af1c62075b..8f3e4cd531a1 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -237,6 +238,7 @@ public static String formatBillingAccountLocationBucketName( .toString(); } + @Nullable public static LogBucketName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -269,7 +271,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LogBucketName> values) { List list = new ArrayList<>(values.size()); for (LogBucketName value : values) { if (value == null) { @@ -329,7 +331,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java index f5deda544cd4..78cdb03449c5 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -195,6 +196,7 @@ public static String formatBillingAccountExclusionName(String billingAccount, St .toString(); } + @Nullable public static LogExclusionName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -224,7 +226,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LogExclusionName> values) { List list = new ArrayList<>(values.size()); for (LogExclusionName value : values) { if (value == null) { @@ -281,7 +283,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogMetricName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogMetricName.java index 4ed25f0ecaf5..a1251454547f 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogMetricName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogMetricName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String metric) { return newBuilder().setProject(project).setMetric(metric).build().toString(); } + @Nullable public static LogMetricName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LogMetricName> values) { List list = new ArrayList<>(values.size()); for (LogMetricName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java index 3e7c291fb43c..cd30e16ee3c5 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -182,6 +183,7 @@ public static String formatBillingAccountLogName(String billingAccount, String l .toString(); } + @Nullable public static LogName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -210,7 +212,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LogName> values) { List list = new ArrayList<>(values.size()); for (LogName value : values) { if (value == null) { @@ -267,7 +269,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java index 9f8f86acccb5..8189d4830195 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -186,6 +187,7 @@ public static String formatBillingAccountSinkName(String billingAccount, String .toString(); } + @Nullable public static LogSinkName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -214,7 +216,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LogSinkName> values) { List list = new ArrayList<>(values.size()); for (LogSinkName value : values) { if (value == null) { @@ -271,7 +273,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java index 83f47d206990..5518b73a9e1b 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -266,6 +267,7 @@ public static String formatBillingAccountLocationBucketViewName( .toString(); } + @Nullable public static LogViewName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -310,7 +312,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LogViewName> values) { List list = new ArrayList<>(values.size()); for (LogViewName value : values) { if (value == null) { @@ -373,7 +375,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/OrganizationLocationName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/OrganizationLocationName.java index 63390df42c17..d2969e9383bf 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/OrganizationLocationName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/OrganizationLocationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String organization, String location) { return newBuilder().setOrganization(organization).setLocation(location).build().toString(); } + @Nullable public static OrganizationLocationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStr return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable OrganizationLocationName> values) { List list = new ArrayList<>(values.size()); for (OrganizationLocationName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/OrganizationName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/OrganizationName.java index d90f4ff73657..b7f1eef06b0c 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/OrganizationName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/OrganizationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String organization) { return newBuilder().setOrganization(organization).build().toString(); } + @Nullable public static OrganizationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable OrganizationName> values) { List list = new ArrayList<>(values.size()); for (OrganizationName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/ProjectName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/ProjectName.java index 2cc797351ff5..a1a5a7fc7b4a 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/ProjectName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/ProjectName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String project) { return newBuilder().setProject(project).build().toString(); } + @Nullable public static ProjectName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ProjectName> values) { List list = new ArrayList<>(values.size()); for (ProjectName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java index 4c3f9c69f7a6..ea574f3043eb 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -168,6 +169,7 @@ public static String formatBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build().toString(); } + @Nullable public static SettingsName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -196,7 +198,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SettingsName> values) { List list = new ArrayList<>(values.size()); for (SettingsName value : values) { if (value == null) { @@ -250,7 +252,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClient.java b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClient.java index 9ed9579c9353..7c073bfb2412 100644 --- a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClient.java +++ b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClient.java @@ -55,6 +55,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -362,7 +363,7 @@ @NullMarked @Generated("by gapic-generator-java") public class SchemaServiceClient implements BackgroundResource { - private final SchemaServiceSettings settings; + @Nullable private final SchemaServiceSettings settings; private final SchemaServiceStub stub; /** Constructs an instance of SchemaServiceClient with default settings. */ @@ -402,6 +403,7 @@ protected SchemaServiceClient(SchemaServiceStub stub) { this.stub = stub; } + @Nullable public final SchemaServiceSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java index 504c1ef5067e..14bd1818d7ed 100644 --- a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java +++ b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java @@ -66,6 +66,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -484,7 +485,7 @@ @NullMarked @Generated("by gapic-generator-java") public class SubscriptionAdminClient implements BackgroundResource { - private final SubscriptionAdminSettings settings; + @Nullable private final SubscriptionAdminSettings settings; private final SubscriberStub stub; /** Constructs an instance of SubscriptionAdminClient with default settings. */ @@ -524,6 +525,7 @@ protected SubscriptionAdminClient(SubscriberStub stub) { this.stub = stub; } + @Nullable public final SubscriptionAdminSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClient.java b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClient.java index 4017bf13db75..2024be35e9da 100644 --- a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClient.java +++ b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClient.java @@ -55,6 +55,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -338,7 +339,7 @@ @NullMarked @Generated("by gapic-generator-java") public class TopicAdminClient implements BackgroundResource { - private final TopicAdminSettings settings; + @Nullable private final TopicAdminSettings settings; private final PublisherStub stub; /** Constructs an instance of TopicAdminClient with default settings. */ @@ -376,6 +377,7 @@ protected TopicAdminClient(PublisherStub stub) { this.stub = stub; } + @Nullable public final TopicAdminSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/ProjectName.java b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/ProjectName.java index 2db74834b0de..bb2978c9c2c8 100644 --- a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/ProjectName.java +++ b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/ProjectName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String project) { return newBuilder().setProject(project).build().toString(); } + @Nullable public static ProjectName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ProjectName> values) { List list = new ArrayList<>(values.size()); for (ProjectName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SchemaName.java b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SchemaName.java index a7fcd22be396..b5442e7844c7 100644 --- a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SchemaName.java +++ b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SchemaName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String schema) { return newBuilder().setProject(project).setSchema(schema).build().toString(); } + @Nullable public static SchemaName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SchemaName> values) { List list = new ArrayList<>(values.size()); for (SchemaName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SnapshotName.java b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SnapshotName.java index bbeafc6c4ddb..4496e948c40a 100644 --- a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SnapshotName.java +++ b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SnapshotName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String snapshot) { return newBuilder().setProject(project).setSnapshot(snapshot).build().toString(); } + @Nullable public static SnapshotName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SnapshotName> values) { List list = new ArrayList<>(values.size()); for (SnapshotName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SubscriptionName.java b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SubscriptionName.java index 8ea245778aab..1160e969567e 100644 --- a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SubscriptionName.java +++ b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/SubscriptionName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String subscription) { return newBuilder().setProject(project).setSubscription(subscription).build().toString(); } + @Nullable public static SubscriptionName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable SubscriptionName> values) { List list = new ArrayList<>(values.size()); for (SubscriptionName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java index 5aa9b579ffbc..c6560044f0f5 100644 --- a/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java +++ b/sdk-platform-java/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java @@ -27,6 +27,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -104,6 +105,7 @@ public static String formatDeletedTopicName() { return "_deleted-topic_"; } + @Nullable public static TopicName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -125,7 +127,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable TopicName> values) { List list = new ArrayList<>(values.size()); for (TopicName value : values) { if (value == null) { @@ -170,7 +172,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClient.java b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClient.java index abbea298e8e9..1f72ce65e9d1 100644 --- a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClient.java +++ b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClient.java @@ -41,6 +41,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -376,7 +377,7 @@ @BetaApi @Generated("by gapic-generator-java") public class CloudRedisClient implements BackgroundResource { - private final CloudRedisSettings settings; + @Nullable private final CloudRedisSettings settings; private final CloudRedisStub stub; private final OperationsClient httpJsonOperationsClient; private final com.google.longrunning.OperationsClient operationsClient; @@ -422,6 +423,7 @@ protected CloudRedisClient(CloudRedisStub stub) { this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub()); } + @Nullable public final CloudRedisSettings getSettings() { return settings; } diff --git a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/InstanceName.java b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/InstanceName.java index 603b9f8ca7ef..ec160ede18c0 100644 --- a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/InstanceName.java +++ b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/InstanceName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -85,6 +86,7 @@ public static String format(String project, String location, String instance) { .toString(); } + @Nullable public static InstanceName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -103,7 +105,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable InstanceName> values) { List list = new ArrayList<>(values.size()); for (InstanceName value : values) { if (value == null) { @@ -152,7 +154,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/LocationName.java b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/LocationName.java index 6b5c2f14a01f..56e3f550dfcc 100644 --- a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/LocationName.java +++ b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/LocationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String location) { return newBuilder().setProject(project).setLocation(location).build().toString(); } + @Nullable public static LocationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable LocationName> values) { List list = new ArrayList<>(values.size()); for (LocationName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(Object o) { + public boolean equals(@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java index e68811a95d94..1773897de05a 100644 --- a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java +++ b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java @@ -42,6 +42,7 @@ import com.google.protobuf.Empty; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -54,10 +55,12 @@ @Generated("by gapic-generator-java") public abstract class CloudRedisStub implements BackgroundResource { + @Nullable public OperationsStub getOperationsStub() { return null; } + @Nullable public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() { return null; } diff --git a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/BucketName.java b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/BucketName.java index 64f36d73175a..968d32f00afa 100644 --- a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/BucketName.java +++ b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/BucketName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -72,6 +73,7 @@ public static String format(String project, String bucket) { return newBuilder().setProject(project).setBucket(bucket).build().toString(); } + @Nullable public static BucketName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -90,7 +92,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable BucketName> values) { List list = new ArrayList<>(values.size()); for (BucketName value : values) { if (value == null) { @@ -135,7 +137,7 @@ public String toString() { } @Override - public boolean equals(java.lang.Object o) { + public boolean equals(@Nullable java.lang.Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/CryptoKeyName.java b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/CryptoKeyName.java index b9ccbab4b6fa..6dc3320fe619 100644 --- a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/CryptoKeyName.java +++ b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/CryptoKeyName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -99,6 +100,7 @@ public static String format(String project, String location, String keyRing, Str .toString(); } + @Nullable public static CryptoKeyName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -121,7 +123,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable CryptoKeyName> values) { List list = new ArrayList<>(values.size()); for (CryptoKeyName value : values) { if (value == null) { @@ -173,7 +175,7 @@ public String toString() { } @Override - public boolean equals(java.lang.Object o) { + public boolean equals(@Nullable java.lang.Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/NotificationName.java b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/NotificationName.java index 5e33a2ad301e..2e56993eb018 100644 --- a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/NotificationName.java +++ b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/NotificationName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -85,6 +86,7 @@ public static String format(String project, String bucket, String notification) .toString(); } + @Nullable public static NotificationName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -103,7 +105,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable NotificationName> values) { List list = new ArrayList<>(values.size()); for (NotificationName value : values) { if (value == null) { @@ -152,7 +154,7 @@ public String toString() { } @Override - public boolean equals(java.lang.Object o) { + public boolean equals(@Nullable java.lang.Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/ProjectName.java b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/ProjectName.java index 790851e53aa8..a17437d81c1e 100644 --- a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/ProjectName.java +++ b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/ProjectName.java @@ -26,6 +26,7 @@ import java.util.Objects; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. @NullMarked @@ -65,6 +66,7 @@ public static String format(String project) { return newBuilder().setProject(project).build().toString(); } + @Nullable public static ProjectName parse(String formattedString) { if (formattedString.isEmpty()) { return null; @@ -83,7 +85,7 @@ public static List parseList(List formattedStrings) { return list; } - public static List toStringList(List values) { + public static List toStringList(List<@Nullable ProjectName> values) { List list = new ArrayList<>(values.size()); for (ProjectName value : values) { if (value == null) { @@ -125,7 +127,7 @@ public String toString() { } @Override - public boolean equals(java.lang.Object o) { + public boolean equals(@Nullable java.lang.Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/StorageClient.java b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/StorageClient.java index 38af59ac85e2..22872e619973 100644 --- a/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/StorageClient.java +++ b/sdk-platform-java/test/integration/goldens/storage/src/com/google/storage/v2/StorageClient.java @@ -42,6 +42,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -671,7 +672,7 @@ @NullMarked @Generated("by gapic-generator-java") public class StorageClient implements BackgroundResource { - private final StorageSettings settings; + @Nullable private final StorageSettings settings; private final StorageStub stub; /** Constructs an instance of StorageClient with default settings. */ @@ -709,6 +710,7 @@ protected StorageClient(StorageStub stub) { this.stub = stub; } + @Nullable public final StorageSettings getSettings() { return settings; } From 56bb725547544bc21d884ffd6a14e4400de221b8 Mon Sep 17 00:00:00 2001 From: Nicole Lee Date: Thu, 25 Jun 2026 17:16:32 +0000 Subject: [PATCH 2/4] feat: revert generator pom.xml and temp compiler dump files --- .../gapic-generator-java/javac.20260624_193339.args | 1 - .../gapic-generator-java/javac.20260624_193425.args | 1 - sdk-platform-java/gapic-generator-java/pom.xml | 3 --- 3 files changed, 5 deletions(-) delete mode 100644 sdk-platform-java/gapic-generator-java/javac.20260624_193339.args delete mode 100644 sdk-platform-java/gapic-generator-java/javac.20260624_193425.args diff --git a/sdk-platform-java/gapic-generator-java/javac.20260624_193339.args b/sdk-platform-java/gapic-generator-java/javac.20260624_193339.args deleted file mode 100644 index ef9e996e7821..000000000000 --- a/sdk-platform-java/gapic-generator-java/javac.20260624_193339.args +++ /dev/null @@ -1 +0,0 @@ -@/tmp/org.codehaus.plexus.compiler.javac.JavacCompiler832945198835244683arguments diff --git a/sdk-platform-java/gapic-generator-java/javac.20260624_193425.args b/sdk-platform-java/gapic-generator-java/javac.20260624_193425.args deleted file mode 100644 index 1d52fbf906a0..000000000000 --- a/sdk-platform-java/gapic-generator-java/javac.20260624_193425.args +++ /dev/null @@ -1 +0,0 @@ -@/tmp/org.codehaus.plexus.compiler.javac.JavacCompiler3879958095652267656arguments diff --git a/sdk-platform-java/gapic-generator-java/pom.xml b/sdk-platform-java/gapic-generator-java/pom.xml index 6a3b03b0d47c..ac9a2a948e24 100644 --- a/sdk-platform-java/gapic-generator-java/pom.xml +++ b/sdk-platform-java/gapic-generator-java/pom.xml @@ -111,9 +111,6 @@ 8 8 - - com.google.auto.value.processor.AutoValueProcessor - com.google.auto.value From 17b370cec3690403bf0ba0c740e8e4581a74a1b3 Mon Sep 17 00:00:00 2001 From: Nicole Lee Date: Thu, 25 Jun 2026 19:36:51 +0000 Subject: [PATCH 3/4] feat:update ast + glde --- .../showcase/v1beta1/stub/EchoStub.java | 7 +++---- .../showcase/v1beta1/stub/MessagingStub.java | 7 +++---- .../engine/ast/ConcreteReference.java | 13 +++++++++++- .../api/generator/engine/ast/Reference.java | 4 ++++ .../generator/engine/ast/VaporReference.java | 13 +++++++++++- .../engine/writer/ImportWriterVisitor.java | 3 +++ .../engine/writer/JavaWriterVisitor.java | 8 ++++++++ .../AbstractServiceStubClassComposer.java | 4 +++- .../grpcrest/ServiceStubClassComposer.java | 10 +++------- .../ResourceNameHelperClassComposer.java | 20 ++++++------------- .../composer/grpc/goldens/EchoStub.golden | 3 ++- 11 files changed, 59 insertions(+), 33 deletions(-) diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStub.java index ab557c80561e..12194648a474 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStub.java @@ -69,13 +69,12 @@ @Generated("by gapic-generator-java") public abstract class EchoStub implements BackgroundResource { - @Nullable - public OperationsStub getOperationsStub() { + public @Nullable OperationsStub getOperationsStub() { return null; } - @Nullable - public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() { + public com.google.api.gax.httpjson.longrunning.stub.@Nullable OperationsStub + getHttpJsonOperationsStub() { return null; } diff --git a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStub.java b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStub.java index effe36ed498c..213800424b60 100644 --- a/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStub.java +++ b/java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStub.java @@ -75,13 +75,12 @@ @Generated("by gapic-generator-java") public abstract class MessagingStub implements BackgroundResource { - @Nullable - public OperationsStub getOperationsStub() { + public @Nullable OperationsStub getOperationsStub() { return null; } - @Nullable - public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() { + public com.google.api.gax.httpjson.longrunning.stub.@Nullable OperationsStub + getHttpJsonOperationsStub() { return null; } 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 48288ab817a1..9a801d3575a2 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 @@ -52,6 +52,9 @@ public void accept(AstNodeVisitor visitor) { @Override public abstract boolean isStaticImport(); + @Override + public abstract boolean isNullable(); + @Override public String name() { StringBuilder sb = new StringBuilder(); @@ -199,6 +202,11 @@ public Reference copyAndSetGenerics(List generics) { return toBuilder().setGenerics(generics).build(); } + @Override + public Reference copyAndSetNullable(boolean isNullable) { + return toBuilder().setIsNullable(isNullable).build(); + } + public static ConcreteReference withClazz(Class clazz) { return builder().setClazz(clazz).build(); } @@ -215,7 +223,8 @@ public static Builder builder() { return new AutoValue_ConcreteReference.Builder() .setUseFullName(false) .setGenerics(ImmutableList.of()) - .setIsStaticImport(false); + .setIsStaticImport(false) + .setIsNullable(false); } // Private. @@ -237,6 +246,8 @@ public Builder setGenerics(Reference... references) { public abstract Builder setIsStaticImport(boolean isStaticImport); + public abstract Builder setIsNullable(boolean isNullable); + public abstract ConcreteReference autoBuild(); // Private. 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 4dce11783f49..4432c68616aa 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 @@ -46,6 +46,8 @@ public interface Reference extends AstNode { Reference copyAndSetGenerics(List generics); + Reference copyAndSetNullable(boolean isNullable); + // Valid only for nested classes. boolean isStaticImport(); @@ -59,4 +61,6 @@ public interface Reference extends AstNode { boolean isAssignableFrom(Reference other); boolean isWildcard(); + + boolean isNullable(); } 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 8c0cc858fa89..8da55dd2bba4 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 @@ -74,6 +74,9 @@ public String fullName() { @Override public abstract boolean isStaticImport(); + @Override + public abstract boolean isNullable(); + @Override public boolean hasEnclosingClass() { return !enclosingClassNames().isEmpty(); @@ -135,12 +138,18 @@ public Reference copyAndSetGenerics(List generics) { return toBuilder().setGenerics(generics).build(); } + @Override + public Reference copyAndSetNullable(boolean isNullable) { + return toBuilder().setIsNullable(isNullable).build(); + } + public static Builder builder() { return new AutoValue_VaporReference.Builder() .setUseFullName(false) .setGenerics(ImmutableList.of()) .setIsStaticImport(false) - .setEnclosingClassNames(Collections.emptyList()); + .setEnclosingClassNames(Collections.emptyList()) + .setIsNullable(false); } // Private. @@ -168,6 +177,8 @@ public Builder setEnclosingClassNames(String... enclosingClassNames) { public abstract Builder setIsStaticImport(boolean isStaticImport); + public abstract Builder setIsNullable(boolean isNullable); + public abstract Builder setSupertypeReference(Reference supertypeReference); // Private. 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 e19e168c3eb5..1d834043c863 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 @@ -479,6 +479,9 @@ private void variableExpressions(List expressions) { } private void handleReference(Reference reference) { + if (reference.isNullable()) { + addImport("org.jspecify.annotations.Nullable"); + } // Don't need to import this. if (reference.useFullName()) { return; 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 e956d8694992..cc9a11fbb57a 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 @@ -222,6 +222,10 @@ public void visit(ConcreteReference reference) { buffer.append(DOT); } + if (reference.isNullable()) { + buffer.append("@Nullable "); + } + buffer.append(reference.simpleName()); if (!reference.generics().isEmpty()) { @@ -255,6 +259,10 @@ public void visit(VaporReference reference) { } } + if (reference.isNullable()) { + buffer.append("@Nullable "); + } + // A null pointer exception will be thrown if reference is null, which is WAI. buffer.append(shortName); } diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java index 895d12f2406a..b886afac2788 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java @@ -315,9 +315,11 @@ protected MethodDefinition createCallableGetterMethodDefinition( protected MethodDefinition createOperationsStubGetterMethodDefinition( TypeNode returnType, String methodName, TypeStore typeStore) { + TypeNode annotatedReturnType = + TypeNode.withReference(returnType.reference().copyAndSetNullable(true)); return MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) - .setReturnType(returnType) + .setReturnType(annotatedReturnType) .setName(methodName) .setBody( Arrays.asList( 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 89c041a64f76..b22629d9e9b7 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 @@ -15,7 +15,6 @@ */ package com.google.api.generator.gapic.composer.grpcrest; -import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.ReturnExpr; import com.google.api.generator.engine.ast.ScopeNode; @@ -23,8 +22,6 @@ 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 java.util.Collections; -import org.jspecify.annotations.Nullable; public class ServiceStubClassComposer extends AbstractServiceStubClassComposer { private static final ServiceStubClassComposer INSTANCE = new ServiceStubClassComposer(); @@ -40,12 +37,11 @@ public static ServiceStubClassComposer instance() { @Override protected MethodDefinition createOperationsStubGetterMethodDefinition( TypeNode returnType, String methodName, TypeStore typeStore) { + TypeNode annotatedReturnType = + TypeNode.withReference(returnType.reference().copyAndSetNullable(true)); return MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) - .setAnnotations( - Collections.singletonList( - AnnotationNode.withType(typeStore.get("Nullable")))) - .setReturnType(returnType) + .setReturnType(annotatedReturnType) .setName(methodName) .setReturnExpr(ReturnExpr.withExpr(ValueExpr.createNullExpr())) .build(); diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index 25b8706300de..34acf6e9b271 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -43,7 +43,6 @@ import com.google.api.generator.engine.ast.ThrowExpr; import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.engine.ast.ValueExpr; -import com.google.api.generator.engine.ast.VaporReference; import com.google.api.generator.engine.ast.Variable; import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.composer.comment.CommentComposer; @@ -71,8 +70,8 @@ import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Generated; -import org.jspecify.annotations.Nullable; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; public class ResourceNameHelperClassComposer { private static final String CLASS_NAME_PATTERN = "%sName"; @@ -796,8 +795,7 @@ private static MethodDefinition createParseMethod( .setScope(ScopeNode.PUBLIC) .setIsStatic(true) .setAnnotations( - Collections.singletonList( - AnnotationNode.withType(FIXED_TYPESTORE.get("Nullable")))) + Collections.singletonList(AnnotationNode.withType(FIXED_TYPESTORE.get("Nullable")))) .setReturnType(thisClassType) .setName("parse") .setArguments(formattedStringArgDeclList) @@ -894,8 +892,7 @@ private static MethodDefinition createParseMethod( .setScope(ScopeNode.PUBLIC) .setIsStatic(true) .setAnnotations( - Collections.singletonList( - AnnotationNode.withType(FIXED_TYPESTORE.get("Nullable")))) + Collections.singletonList(AnnotationNode.withType(FIXED_TYPESTORE.get("Nullable")))) .setReturnType(thisClassType) .setName("parse") .setArguments(formattedStringArgDeclList) @@ -979,12 +976,7 @@ private static MethodDefinition createToStringListMethod(TypeNode thisClassType) TypeNode.withReference( ConcreteReference.builder() .setClazz(List.class) - .setGenerics( - Arrays.asList( - VaporReference.builder() - .setName("@Nullable " + thisClassType.reference().name()) - .setPakkage(thisClassType.reference().pakkage()) - .build())) + .setGenerics(Arrays.asList(thisClassType.reference().copyAndSetNullable(true))) .build()); VariableExpr valuesVarExpr = VariableExpr.withVariable( @@ -1414,8 +1406,7 @@ private static MethodDefinition createEqualsMethod( .setIsOverride(true) .setScope(ScopeNode.PUBLIC) .setArguments( - argVarExpr - .toBuilder() + argVarExpr.toBuilder() .setIsDecl(true) .setAnnotations( Collections.singletonList( @@ -1725,6 +1716,7 @@ private static TypeStore createStaticTypes() { Map.class, NullMarked.class, Nullable.class, + Object.class, Objects.class, PathTemplate.class, Preconditions.class, diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStub.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStub.golden index 8fed4fe54d48..722a5ff7d478 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStub.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStub.golden @@ -26,6 +26,7 @@ import com.google.showcase.v1beta1.WaitRequest; import com.google.showcase.v1beta1.WaitResponse; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -38,7 +39,7 @@ import org.jspecify.annotations.NullMarked; @Generated("by gapic-generator-java") public abstract class EchoStub implements BackgroundResource { - public OperationsStub getOperationsStub() { + public @Nullable OperationsStub getOperationsStub() { throw new UnsupportedOperationException("Not implemented: getOperationsStub()"); } From 22eb3e6450840570c6bc4cabb354cc2fa313d359 Mon Sep 17 00:00:00 2001 From: Nicole Lee Date: Thu, 25 Jun 2026 20:35:19 +0000 Subject: [PATCH 4/4] feat:fixed scoping construct errors --- .../resourcename/ResourceNameHelperClassComposer.java | 10 ++-------- .../composer/resourcename/goldens/AgentName.golden | 2 +- .../goldens/BillingAccountLocationName.golden | 2 +- .../resourcename/goldens/CollisionResourceName.golden | 2 +- .../composer/resourcename/goldens/FoobarName.golden | 2 +- .../google/cloud/asset/v1/stub/AssetServiceStub.java | 7 +++---- .../cloud/logging/v2/stub/ConfigServiceV2Stub.java | 3 ++- .../cloud/redis/v1beta1/stub/CloudRedisStub.java | 7 +++---- 8 files changed, 14 insertions(+), 21 deletions(-) diff --git a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index 34acf6e9b271..5d2eb5117b76 100644 --- a/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java +++ b/sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -1311,7 +1311,7 @@ private static MethodDefinition createEqualsMethod( // Create method definition variables. Variable oVariable = Variable.builder() - .setType(TypeNode.withReference(javaObjectReference)) + .setType(TypeNode.withReference(javaObjectReference.copyAndSetNullable(true))) .setName("o") .build(); VariableExpr argVarExpr = @@ -1405,13 +1405,7 @@ private static MethodDefinition createEqualsMethod( return MethodDefinition.builder() .setIsOverride(true) .setScope(ScopeNode.PUBLIC) - .setArguments( - argVarExpr.toBuilder() - .setIsDecl(true) - .setAnnotations( - Collections.singletonList( - AnnotationNode.withType(FIXED_TYPESTORE.get("Nullable")))) - .build()) + .setArguments(argVarExpr.toBuilder().setIsDecl(true).build()) .setReturnType(TypeNode.BOOLEAN) .setName("equals") .setReturnExpr(falseValueExpr) diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden index 85234ccb7b9f..0a6da96c45e6 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden @@ -161,7 +161,7 @@ public class AgentName implements ResourceName { } @Override - public boolean equals(@Nullable java.lang.Object o) { + public boolean equals(java.lang.@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden index 1b0b4382c95b..230c59eee271 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden @@ -124,7 +124,7 @@ public class BillingAccountLocationName implements ResourceName { } @Override - public boolean equals(@Nullable java.lang.Object o) { + public boolean equals(java.lang.@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden index cdc0273bab8e..3e12ba3d82a5 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden @@ -181,7 +181,7 @@ public class ResourceName implements com.google.api.resourcenames.ResourceName { } @Override - public boolean equals(@Nullable java.lang.Object o) { + public boolean equals(java.lang.@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden index b9a788599a7c..ce76ea616704 100644 --- a/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden +++ b/sdk-platform-java/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden @@ -249,7 +249,7 @@ public class FoobarName implements ResourceName { } @Override - public boolean equals(@Nullable java.lang.Object o) { + public boolean equals(java.lang.@Nullable Object o) { if (o == this) { return true; } diff --git a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStub.java b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStub.java index ed30a7d81b17..8b272b0a58e7 100644 --- a/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStub.java +++ b/sdk-platform-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStub.java @@ -76,13 +76,12 @@ @Generated("by gapic-generator-java") public abstract class AssetServiceStub implements BackgroundResource { - @Nullable - public OperationsStub getOperationsStub() { + public @Nullable OperationsStub getOperationsStub() { return null; } - @Nullable - public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() { + public com.google.api.gax.httpjson.longrunning.stub.@Nullable OperationsStub + getHttpJsonOperationsStub() { return null; } diff --git a/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java b/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java index 23c72df8c13f..2b02f58f200b 100644 --- a/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java +++ b/sdk-platform-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java @@ -67,6 +67,7 @@ import com.google.protobuf.Empty; import javax.annotation.Generated; import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -78,7 +79,7 @@ @Generated("by gapic-generator-java") public abstract class ConfigServiceV2Stub implements BackgroundResource { - public OperationsStub getOperationsStub() { + public @Nullable OperationsStub getOperationsStub() { throw new UnsupportedOperationException("Not implemented: getOperationsStub()"); } diff --git a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java index 1773897de05a..7bd0b3e49971 100644 --- a/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java +++ b/sdk-platform-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java @@ -55,13 +55,12 @@ @Generated("by gapic-generator-java") public abstract class CloudRedisStub implements BackgroundResource { - @Nullable - public OperationsStub getOperationsStub() { + public @Nullable OperationsStub getOperationsStub() { return null; } - @Nullable - public com.google.api.gax.httpjson.longrunning.stub.OperationsStub getHttpJsonOperationsStub() { + public com.google.api.gax.httpjson.longrunning.stub.@Nullable OperationsStub + getHttpJsonOperationsStub() { return null; }