chore: remove beta client LRO (#2497)

JoeWang1127 · web-flow · commit fc18449438ac · 2024-02-22T13:20:18.000-05:00
Fixes #2103 ☕️
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java
@@ -839,13 +839,6 @@ private static MethodDefinition createMethodDefaultMethod(
                   .copyAndSetGenerics(
                       Arrays.asList(
                           lro.responseType().reference(), lro.metadataType().reference())));
-      if (method.lro().operationServiceStubType() != null) {
-        annotations.add(
-            AnnotationNode.withTypeAndDescription(
-                typeStore.get("BetaApi"),
-                "The surface for long-running operations is not stable yet and may change in the"
-                    + " future."));
-      }
     }
 
     // Construct the method that accepts a request proto.
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java
@@ -235,7 +235,7 @@ private List<MethodDefinition> createLongRunningClientGetters(TypeStore typeStor
         createCallableGetterMethodDefinition(
             TypeNode.withReference(ConcreteReference.withClazz(LongRunningClient.class)),
             "longRunningClient",
-            ImmutableList.of(AnnotationNode.withType(typeStore.get("BetaApi"))),
+            Collections.emptyList(),
             typeStore));
   }
 
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java
@@ -2023,27 +2023,14 @@ private static List<MethodDefinition> createNestedClassSettingsBuilderGetterMeth
             t.reference()
                 .copyAndSetGenerics(ImmutableList.of())
                 .equals(operationCallSettingsBuilderRef);
-    AnnotationNode lroBetaAnnotation =
-        AnnotationNode.builder()
-            .setType(FIXED_TYPESTORE.get("BetaApi"))
-            .setDescription(
-                "The surface for use by generated code is not stable yet and may change in the"
-                    + " future.")
-            .build();
     AnnotationNode deprecatedAnnotation = AnnotationNode.withType(TypeNode.DEPRECATED);
 
     List<MethodDefinition> javaMethods = new ArrayList<>();
     for (Map.Entry<String, VariableExpr> settingsVarEntry :
         nestedMethodSettingsMemberVarExprs.entrySet()) {
       String varName = settingsVarEntry.getKey();
       VariableExpr settingsVarExpr = settingsVarEntry.getValue();
-      boolean isOperationCallSettings =
-          isOperationCallSettingsBuilderFn.apply(settingsVarExpr.type());
-
       List<AnnotationNode> annotations = new ArrayList<>();
-      if (isOperationCallSettings) {
-        annotations.add(lroBetaAnnotation);
-      }
 
       boolean isDeprecated = nestedDeprecatedSettingVarNames.contains(varName);
       if (isDeprecated) {
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java
@@ -18,7 +18,6 @@
 import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
 import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.UnaryCallable;
-import com.google.api.generator.engine.ast.AnnotationNode;
 import com.google.api.generator.engine.ast.AssignmentExpr;
 import com.google.api.generator.engine.ast.ConcreteReference;
 import com.google.api.generator.engine.ast.ExprStatement;
@@ -36,6 +35,7 @@
 import com.google.longrunning.Operation;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -55,20 +55,6 @@ public static HttpJsonServiceCallableFactoryClassComposer instance() {
     return INSTANCE;
   }
 
-  @Override
-  protected List<AnnotationNode> createClassAnnotations(Service service, TypeStore typeStore) {
-    List<AnnotationNode> annotations = super.createClassAnnotations(service, typeStore);
-    // Always add @BetaApi annotation to the generated CallableFactory for now. It is a public class
-    // for technical reasons, end users are not expected to interact with it, but it may change
-    // when we add LRO support, that is why making it @BetaApi for now.
-    //
-    // Remove the @BetaApi annotation once the LRO feature is fully implemented and stabilized.
-    if (annotations.stream().noneMatch(a -> a.type().equals(typeStore.get("BetaApi")))) {
-      annotations.add(AnnotationNode.withType(typeStore.get("BetaApi")));
-    }
-    return annotations;
-  }
-
   @Override
   protected List<TypeNode> createClassImplements(Service service, TypeStore typeStore) {
     TypeNode operationsStubType = getOperationsStubType(service);
@@ -104,16 +90,6 @@ protected MethodDefinition createOperationCallableMethod(Service service, TypeSt
     List<String> methodTemplateNames =
         Arrays.asList(requestTemplateName, responseTemplateName, "MetadataT");
 
-    // Always add @BetaApi annotation to the generated createOperationCallable() method for now,
-    // until LRO is fully implemented.
-    //
-    // Remove the @BetaApi annotation once the LRO feature is fully implemented and stabilized.
-    AnnotationNode betaAnnotation =
-        AnnotationNode.withTypeAndDescription(
-            typeStore.get("BetaApi"),
-            "The surface for long-running operations is not stable yet and may change in the"
-                + " future.");
-
     // Generate generic method without the body
     TypeNode operationType = service.operationType();
     if (operationType == null) {
@@ -133,7 +109,7 @@ protected MethodDefinition createOperationCallableMethod(Service service, TypeSt
             /*callSettingsTemplateObjects=*/ methodTemplateNames.stream()
                 .map(n -> (Object) n)
                 .collect(Collectors.toList()),
-            Arrays.asList(betaAnnotation));
+            Collections.emptyList());
 
     List<Statement> createOperationCallableBody = new ArrayList<>();
     List<VariableExpr> arguments = new ArrayList<>(method.arguments());
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden
@@ -620,8 +620,6 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
     }
 
     /** Returns the builder for the settings used for calls to wait. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<WaitRequest, WaitResponse, WaitMetadata>
         waitOperationSettings() {
       return waitOperationSettings;
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden
@@ -659,8 +659,6 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
     }
 
     /** Returns the builder for the settings used for calls to wait. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<WaitRequest, WaitResponse, WaitMetadata>
         waitOperationSettings() {
       return waitOperationSettings;
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoCallableFactory.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoCallableFactory.golden
@@ -57,8 +57,6 @@ public class HttpJsonEchoCallableFactory
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceCallableFactory.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceCallableFactory.golden
@@ -57,8 +57,6 @@ public class HttpJsonComplianceCallableFactory
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java
@@ -882,8 +882,6 @@ public UnaryCallSettings.Builder<WaitRequest, Operation> waitSettings() {
     }
 
     /** Returns the builder for the settings used for calls to wait. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<WaitRequest, WaitResponse, WaitMetadata>
         waitOperationSettings() {
       return waitOperationSettings;
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonComplianceCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonComplianceCallableFactory.java
@@ -73,8 +73,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoCallableFactory.java
@@ -73,8 +73,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonIdentityCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonIdentityCallableFactory.java
@@ -73,8 +73,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonMessagingCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonMessagingCallableFactory.java
@@ -73,8 +73,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonSequenceServiceCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonSequenceServiceCallableFactory.java
@@ -73,8 +73,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonTestingCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonTestingCallableFactory.java
@@ -73,8 +73,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java
@@ -943,8 +943,6 @@ public UnaryCallSettings.Builder<SearchBlurbsRequest, Operation> searchBlurbsSet
     }
 
     /** Returns the builder for the settings used for calls to searchBlurbs. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             SearchBlurbsRequest, SearchBlurbsResponse, SearchBlurbsMetadata>
         searchBlurbsOperationSettings() {
diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceCallableFactory.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceCallableFactory.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.apigeeconnect.v1.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.httpjson.HttpJsonCallSettings;
 import com.google.api.gax.httpjson.HttpJsonCallableFactory;
 import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
@@ -41,7 +40,6 @@
  * <p>This class is for advanced usage.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonConnectionServiceCallableFactory
     implements HttpJsonStubCallableFactory<Operation, OperationsStub> {
 
@@ -73,8 +71,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java
@@ -1164,8 +1164,6 @@ public UnaryCallSettings.Builder<ExportAssetsRequest, Operation> exportAssetsSet
     }
 
     /** Returns the builder for the settings used for calls to exportAssets. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             ExportAssetsRequest, ExportAssetsResponse, ExportAssetsRequest>
         exportAssetsOperationSettings() {
@@ -1238,8 +1236,6 @@ public UnaryCallSettings.Builder<DeleteFeedRequest, Empty> deleteFeedSettings()
     }
 
     /** Returns the builder for the settings used for calls to analyzeIamPolicyLongrunning. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnalyzeIamPolicyLongrunningRequest,
             AnalyzeIamPolicyLongrunningResponse,
diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceCallableFactory.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceCallableFactory.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.asset.v1.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.httpjson.HttpJsonCallSettings;
 import com.google.api.gax.httpjson.HttpJsonCallableFactory;
 import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
@@ -41,7 +40,6 @@
  * <p>This class is for advanced usage.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonAssetServiceCallableFactory
     implements HttpJsonStubCallableFactory<Operation, OperationsStub> {
 
@@ -73,8 +71,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java
@@ -18,7 +18,6 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
-import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
@@ -442,8 +441,6 @@ public final OperationFuture<Operation, Operation> deleteAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture<Operation, Operation> deleteAsync(DeleteAddressRequest request) {
     return deleteOperationCallable().futureCall(request);
   }
@@ -573,8 +570,6 @@ public final OperationFuture<Operation, Operation> insertAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture<Operation, Operation> insertAsync(InsertAddressRequest request) {
     return insertOperationCallable().futureCall(request);
   }
diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java
@@ -21,7 +21,6 @@
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
-import com.google.api.core.BetaApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -579,8 +578,6 @@ public UnaryCallSettings.Builder<DeleteAddressRequest, Operation> deleteSettings
     }
 
     /** Returns the builder for the settings used for calls to delete. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<DeleteAddressRequest, Operation, Operation>
         deleteOperationSettings() {
       return deleteOperationSettings;
@@ -592,8 +589,6 @@ public UnaryCallSettings.Builder<InsertAddressRequest, Operation> insertSettings
     }
 
     /** Returns the builder for the settings used for calls to insert. */
-    @BetaApi(
-        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<InsertAddressRequest, Operation, Operation>
         insertOperationSettings() {
       return insertOperationSettings;
diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesCallableFactory.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesCallableFactory.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.compute.v1small.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.httpjson.HttpJsonCallSettings;
 import com.google.api.gax.httpjson.HttpJsonCallableFactory;
 import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
@@ -40,7 +39,6 @@
  * <p>This class is for advanced usage.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonAddressesCallableFactory
     implements HttpJsonStubCallableFactory<Operation, RegionOperationsStub> {
 
@@ -72,8 +70,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsCallableFactory.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsCallableFactory.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.compute.v1small.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.httpjson.HttpJsonCallSettings;
 import com.google.api.gax.httpjson.HttpJsonCallableFactory;
 import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
@@ -41,7 +40,6 @@
  * <p>This class is for advanced usage.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonRegionOperationsCallableFactory
     implements HttpJsonStubCallableFactory<Operation, OperationsStub> {
 
@@ -73,8 +71,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
         httpJsonCallSettings, callSettings, clientContext);
   }
 
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStub.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStub.java
diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsCallableFactory.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsCallableFactory.java
diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceCallableFactory.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceCallableFactory.java
diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/HttpJsonCloudRedisCallableFactory.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/HttpJsonCloudRedisCallableFactory.java

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ private List<MethodDefinition> createLongRunningClientGetters(TypeStore typeStor`
`235`	`235`	`createCallableGetterMethodDefinition(`
`236`	`236`	`TypeNode.withReference(ConcreteReference.withClazz(LongRunningClient.class)),`
`237`	`237`	`"longRunningClient",`
`238`		`- ImmutableList.of(AnnotationNode.withType(typeStore.get("BetaApi"))),`
	`238`	`+ Collections.emptyList(),`
`239`	`239`	`typeStore));`
`240`	`240`	`}`
`241`	`241`
Original file line number	Diff line number	Diff line change
`@@ -620,8 +620,6 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {`
`620`	`620`	`}`
`621`	`621`
`622`	`622`	`/** Returns the builder for the settings used for calls to wait. */`
`623`		`- @BetaApi(`
`624`		`- "The surface for use by generated code is not stable yet and may change in the future.")`
`625`	`623`	`public OperationCallSettings.Builder<WaitRequest, WaitResponse, WaitMetadata>`
`626`	`624`	`waitOperationSettings() {`
`627`	`625`	`return waitOperationSettings;`
Original file line number	Diff line number	Diff line change
`@@ -659,8 +659,6 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`/** Returns the builder for the settings used for calls to wait. */`
`662`		`- @BetaApi(`
`663`		`- "The surface for use by generated code is not stable yet and may change in the future.")`
`664`	`662`	`public OperationCallSettings.Builder<WaitRequest, WaitResponse, WaitMetadata>`
`665`	`663`	`waitOperationSettings() {`
`666`	`664`	`return waitOperationSettings;`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ public class HttpJsonEchoCallableFactory`
`57`	`57`	`httpJsonCallSettings, callSettings, clientContext);`
`58`	`58`	`}`
`59`	`59`
`60`		`- @BetaApi(`
`61`		`- "The surface for long-running operations is not stable yet and may change in the future.")`
`62`	`60`	`@Override`
`63`	`61`	`public <RequestT, ResponseT, MetadataT>`
`64`	`62`	`OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(`
Original file line number	Diff line number	Diff line change
`@@ -882,8 +882,6 @@ public UnaryCallSettings.Builder<WaitRequest, Operation> waitSettings() {`
`882`	`882`	`}`
`883`	`883`
`884`	`884`	`/** Returns the builder for the settings used for calls to wait. */`
`885`		`- @BetaApi(`
`886`		`- "The surface for use by generated code is not stable yet and may change in the future.")`
`887`	`885`	`public OperationCallSettings.Builder<WaitRequest, WaitResponse, WaitMetadata>`
`888`	`886`	`waitOperationSettings() {`
`889`	`887`	`return waitOperationSettings;`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,6 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa`
`73`	`73`	`httpJsonCallSettings, callSettings, clientContext);`
`74`	`74`	`}`
`75`	`75`
`76`		`- @BetaApi(`
`77`		`- "The surface for long-running operations is not stable yet and may change in the future.")`
`78`	`76`	`@Override`
`79`	`77`	`public <RequestT, ResponseT, MetadataT>`
`80`	`78`	`OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(`