From 7da92b1b9726a57e78c92772071b642d677b4529 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Thu, 15 Feb 2024 20:40:32 +0000 Subject: [PATCH] chore: remove beta httpjson (#2358) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #2101 ☕️ --- .../grpcrest/ServiceSettingsClassComposer.java | 15 ++------------- .../rest/HttpJsonServiceStubClassComposer.java | 13 ------------- .../composer/grpcrest/goldens/EchoSettings.golden | 2 -- .../HttpJsonAutoPopulateFieldTestingStub.golden | 2 -- .../goldens/HttpJsonRoutingHeadersStub.golden | 2 -- .../showcase/v1beta1/ComplianceSettings.java | 2 -- .../com/google/showcase/v1beta1/EchoSettings.java | 2 -- .../google/showcase/v1beta1/IdentitySettings.java | 2 -- .../showcase/v1beta1/MessagingSettings.java | 2 -- .../showcase/v1beta1/SequenceServiceSettings.java | 2 -- .../google/showcase/v1beta1/TestingSettings.java | 2 -- .../v1/ConnectionServiceSettings.java | 2 -- .../v1/stub/HttpJsonConnectionServiceStub.java | 2 -- .../cloud/asset/v1/AssetServiceSettings.java | 2 -- .../asset/v1/stub/HttpJsonAssetServiceStub.java | 2 -- .../v1small/stub/HttpJsonAddressesStub.java | 2 -- .../stub/HttpJsonRegionOperationsStub.java | 2 -- .../credentials/v1/IamCredentialsSettings.java | 2 -- .../v1/stub/HttpJsonIamCredentialsStub.java | 2 -- .../library/v1/LibraryServiceSettings.java | 2 -- .../v1/stub/HttpJsonLibraryServiceStub.java | 2 -- .../cloud/redis/v1beta1/CloudRedisSettings.java | 2 -- 22 files changed, 2 insertions(+), 66 deletions(-) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java index c597be4c8a..c5a735acad 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java @@ -45,8 +45,6 @@ protected List createNestedBuilderCreatorMethods( String newBuilderMethodName, String createDefaultMethodName, List annotations) { - AnnotationNode betaApiAnnotaiton = - AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build(); List methods = new ArrayList<>(); methods.addAll( @@ -59,10 +57,7 @@ protected List createNestedBuilderCreatorMethods( typeStore, "newHttpJsonBuilder", "createHttpJsonDefault", - ImmutableList.builder() - .addAll(annotations) - .add(betaApiAnnotaiton) - .build())); + ImmutableList.builder().addAll(annotations).build())); } return methods; } @@ -77,9 +72,6 @@ protected List createNewBuilderMethods( CommentStatement comment) { List methods = new ArrayList<>(); - AnnotationNode betaApiAnnotaiton = - AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build(); - Iterator transportNames = getTransportContext().transportNames().iterator(); methods.addAll( @@ -98,10 +90,7 @@ protected List createNewBuilderMethods( typeStore, "newHttpJsonBuilder", "createHttpJsonDefault", - ImmutableList.builder() - .addAll(annotations) - .add(betaApiAnnotaiton) - .build(), + ImmutableList.builder().addAll(annotations).build(), new SettingsCommentComposer(transportNames.next()) .getNewTransportBuilderMethodComment())); } diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java index 19e7cfbcbb..e631dce36d 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java @@ -210,19 +210,6 @@ protected List createOperationsStubGetterMethod( return super.createOperationsStubGetterMethod(service, operationsStubVarExpr); } - @Override - protected List createClassAnnotations(Service service) { - List annotations = super.createClassAnnotations(service); - - TypeNode betaApiType = FIXED_TYPESTORE.get("BetaApi"); - - if (annotations.stream().noneMatch(a -> betaApiType.equals(a.type()))) { - annotations.add(AnnotationNode.builder().setType(betaApiType).build()); - } - - return annotations; - } - @Override protected List createGetMethodDescriptorsMethod( Service service, diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden index 0abf62baec..2456b6cb0c 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden @@ -177,7 +177,6 @@ public class EchoSettings extends ClientSettings { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -219,7 +218,6 @@ public class EchoSettings extends ClientSettings { return new Builder(EchoStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(EchoStubSettings.newHttpJsonBuilder()); } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden index 9b5d7c3b8f..6b390feb69 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden @@ -1,6 +1,5 @@ package com.google.auto.populate.field.stub; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -36,7 +35,6 @@ import javax.annotation.Generated; *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonAutoPopulateFieldTestingStub extends AutoPopulateFieldTestingStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden index 1987cbc592..b377fe3a18 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden @@ -1,6 +1,5 @@ package com.google.explicit.dynamic.routing.header.stub; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -35,7 +34,6 @@ import javax.annotation.Generated; *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonExplicitDynamicRoutingHeaderTestingStub extends ExplicitDynamicRoutingHeaderTestingStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java index 823f9ccb10..f07f55a8c7 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java @@ -212,7 +212,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -254,7 +253,6 @@ private static Builder createDefault() { return new Builder(ComplianceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(ComplianceStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java index 360d136fff..aed2c2ea70 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java @@ -228,7 +228,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -270,7 +269,6 @@ private static Builder createDefault() { return new Builder(EchoStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(EchoStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java index 5b425ed700..252c9aba3e 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java @@ -190,7 +190,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -232,7 +231,6 @@ private static Builder createDefault() { return new Builder(IdentityStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(IdentityStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java index a28bd4806a..22670dcd5d 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java @@ -248,7 +248,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -290,7 +289,6 @@ private static Builder createDefault() { return new Builder(MessagingStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(MessagingStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java index 111119b942..a323894e08 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java @@ -200,7 +200,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -242,7 +241,6 @@ private static Builder createDefault() { return new Builder(SequenceServiceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(SequenceServiceStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java index 13d6defe57..8d49238eb6 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java @@ -207,7 +207,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -249,7 +248,6 @@ private static Builder createDefault() { return new Builder(TestingStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(TestingStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java index 6127ea2ae3..4e26180f91 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java @@ -134,7 +134,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -176,7 +175,6 @@ private static Builder createDefault() { return new Builder(ConnectionServiceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(ConnectionServiceStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java index 434cecd957..8077e81100 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java @@ -18,7 +18,6 @@ import static com.google.cloud.apigeeconnect.v1.ConnectionServiceClient.ListConnectionsPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -49,7 +48,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonConnectionServiceStub extends ConnectionServiceStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java index d490f6d679..81a6e9bae3 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java @@ -262,7 +262,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -304,7 +303,6 @@ private static Builder createDefault() { return new Builder(AssetServiceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(AssetServiceStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java index fde890bd68..d4825f9180 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java @@ -21,7 +21,6 @@ import static com.google.cloud.asset.v1.AssetServiceClient.SearchAllIamPoliciesPagedResponse; import static com.google.cloud.asset.v1.AssetServiceClient.SearchAllResourcesPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -91,7 +90,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonAssetServiceStub extends AssetServiceStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder() diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java index a0caf3d274..3eac03ac83 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java @@ -19,7 +19,6 @@ import static com.google.cloud.compute.v1small.AddressesClient.AggregatedListPagedResponse; import static com.google.cloud.compute.v1small.AddressesClient.ListPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -59,7 +58,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonAddressesStub extends AddressesStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(Operation.getDescriptor()).build(); diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java index 81f0e4838b..3eb2ee3c21 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java @@ -16,7 +16,6 @@ package com.google.cloud.compute.v1small.stub; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -54,7 +53,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonRegionOperationsStub extends RegionOperationsStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java index 221ee9c4b8..421e040501 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java @@ -147,7 +147,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -189,7 +188,6 @@ private static Builder createDefault() { return new Builder(IamCredentialsStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(IamCredentialsStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java index 5cb18810cf..4e0a28aa06 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java @@ -16,7 +16,6 @@ package com.google.cloud.iam.credentials.v1.stub; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -53,7 +52,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonIamCredentialsStub extends IamCredentialsStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java index 410830a7fe..d6e3b5a5bf 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java @@ -202,7 +202,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -244,7 +243,6 @@ private static Builder createDefault() { return new Builder(LibraryServiceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(LibraryServiceStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java index 7c2e501087..116e6b7614 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java @@ -19,7 +19,6 @@ import static com.google.cloud.example.library.v1.LibraryServiceClient.ListBooksPagedResponse; import static com.google.cloud.example.library.v1.LibraryServiceClient.ListShelvesPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -64,7 +63,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonLibraryServiceStub extends LibraryServiceStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java index f3045607b8..089c7c5a26 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java @@ -236,7 +236,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -278,7 +277,6 @@ private static Builder createDefault() { return new Builder(CloudRedisStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(CloudRedisStubSettings.newHttpJsonBuilder()); }