chore: Remove @BetaApi annotations for the de-facto GA features (#1627

) * chore: Remove `@BetaApi` annotations for the de-facto GA features Those features have been under `BetaApi` annotation for 2-3+ years. They are: - Long running operations logic - Streaming logic - Fields extractor logic - Interceptors logic - Response metadata logic Many of the classes under gax-httpjson module remain `BetaApi` as those are much younger than grpc and shared classes, and will be cleaned up with httpjson module GA (which whill hopefully happen in H1). This also addresses a couple old issues: #1095 and #702 * undeprecate Distribution and Pages
googleapis · Feb 11, 2022 · 837a90b · 837a90b
1 parent 2df6162
commit 837a90b
Show file tree

Hide file tree

Showing 103 changed files with 20 additions and 299 deletions.
diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java
@@ -423,7 +423,6 @@ public CallOptions getCallOptions() {
    * @see ApiCallContext#withStreamWaitTimeout(Duration)
    */
   @Override
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   @Nullable
   public Duration getStreamWaitTimeout() {
     return streamWaitTimeout;
@@ -435,14 +434,12 @@ public Duration getStreamWaitTimeout() {
    * @see ApiCallContext#withStreamIdleTimeout(Duration)
    */
   @Override
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   @Nullable
   public Duration getStreamIdleTimeout() {
     return streamIdleTimeout;
   }
 
   /** The channel affinity for this context. */
-  @BetaApi("The surface for channel affinity is not stable yet and may change in the future.")
   @Nullable
   public Integer getChannelAffinity() {
     return channelAffinity;

diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallSettings.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallSettings.java
@@ -34,7 +34,6 @@
 import io.grpc.MethodDescriptor;
 
 /** Grpc-specific settings for creating callables. */
-@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
 public class GrpcCallSettings<RequestT, ResponseT> {
   private final MethodDescriptor<RequestT, ResponseT> methodDescriptor;
   private final RequestParamsExtractor<RequestT> paramsExtractor;
@@ -50,7 +49,6 @@ public MethodDescriptor<RequestT, ResponseT> getMethodDescriptor() {
     return methodDescriptor;
   }
 
-  @BetaApi
   public RequestParamsExtractor<RequestT> getParamsExtractor() {
     return paramsExtractor;
   }
@@ -94,7 +92,6 @@ public Builder<RequestT, ResponseT> setMethodDescriptor(
       return this;
     }
 
-    @BetaApi
     public Builder<RequestT, ResponseT> setParamsExtractor(
         RequestParamsExtractor<RequestT> paramsExtractor) {
       this.paramsExtractor = paramsExtractor;

diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallableFactory.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallableFactory.java
@@ -29,7 +29,6 @@
  */
 package com.google.api.gax.grpc;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.longrunning.OperationSnapshot;
 import com.google.api.gax.rpc.BatchingCallSettings;
@@ -65,7 +64,6 @@
 import javax.annotation.Nonnull;
 
 /** Class with utility methods to create grpc-based direct callables. */
-@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
 public class GrpcCallableFactory {
   // Used to extract service and method name from a grpc MethodDescriptor.
   private static final Pattern FULL_METHOD_NAME_REGEX = Pattern.compile("^.*?([^./]+)/([^./]+)$");
@@ -144,7 +142,6 @@ UnaryCallable<RequestT, PagedListResponseT> createPagedCallable(
    * @param clientContext {@link ClientContext} to use to connect to the service.
    * @return {@link UnaryCallable} callable object.
    */
-  @BetaApi("The surface for batching is not stable yet and may change in the future.")
   public static <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCallable(
       GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
       BatchingCallSettings<RequestT, ResponseT> batchingCallSettings,
@@ -177,8 +174,6 @@ public static <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBat
    * @param operationsStub {@link OperationsStub} to use to poll for updates on the Operation.
    * @return {@link com.google.api.gax.rpc.OperationCallable} callable object.
    */
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
   public static <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
           GrpcCallSettings<RequestT, Operation> grpcCallSettings,
@@ -223,7 +218,6 @@ OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
    * @param clientContext {@link ClientContext} to use to connect to the service.
    * @return {@link BidiStreamingCallable} callable object.
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   public static <RequestT, ResponseT>
       BidiStreamingCallable<RequestT, ResponseT> createBidiStreamingCallable(
           GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
@@ -253,7 +247,6 @@ BidiStreamingCallable<RequestT, ResponseT> createBidiStreamingCallable(
    * @deprecated Please use ServerStreamingCallSettings
    */
   @Deprecated
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   public static <RequestT, ResponseT>
       ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
           GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
@@ -277,7 +270,6 @@ ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
    *     settings with.
    * @param clientContext {@link ClientContext} to use to connect to the service.
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   public static <RequestT, ResponseT>
       ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
           GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
@@ -312,7 +304,6 @@ ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
    * @param clientContext {@link ClientContext} to use to connect to the service.
    * @return {@link ClientStreamingCallable} callable object.
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   public static <RequestT, ResponseT>
       ClientStreamingCallable<RequestT, ResponseT> createClientStreamingCallable(
           GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,

diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcInterceptorProvider.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcInterceptorProvider.java
@@ -29,13 +29,10 @@
  */
 package com.google.api.gax.grpc;
 
-import com.google.api.core.BetaApi;
 import io.grpc.ClientInterceptor;
 import java.util.List;
 
 /** Provider of custom gRPC ClientInterceptors. */
-@BetaApi(
-    "The surface for adding custom interceptors is not stable yet and may change in the future.")
 public interface GrpcInterceptorProvider {
 
   /**

diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcRawCallableFactory.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcRawCallableFactory.java
@@ -29,7 +29,6 @@
  */
 package com.google.api.gax.grpc;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.rpc.BidiStreamingCallable;
 import com.google.api.gax.rpc.ClientStreamingCallable;
@@ -70,7 +69,6 @@ public static <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUna
    * @param retryableCodes the {@link StatusCode.Code} that should be marked as retryable
    * @return {@link BidiStreamingCallable} callable object.
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   public static <RequestT, ResponseT>
       BidiStreamingCallable<RequestT, ResponseT> createBidiStreamingCallable(
           GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
@@ -88,7 +86,6 @@ BidiStreamingCallable<RequestT, ResponseT> createBidiStreamingCallable(
    * @param grpcCallSettings the gRPC call settings
    * @param retryableCodes the {@link StatusCode.Code} that should be marked as retryable
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   public static <RequestT, ResponseT>
       ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
           GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
@@ -109,7 +106,6 @@ ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
    * @param grpcCallSettings the gRPC call settings
    * @param retryableCodes the {@link StatusCode.Code} that should be marked as retryable
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
   public static <RequestT, ResponseT>
       ClientStreamingCallable<RequestT, ResponseT> createClientStreamingCallable(
           GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,

diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcResponseMetadata.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcResponseMetadata.java
@@ -29,7 +29,6 @@
  */
 package com.google.api.gax.grpc;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.common.base.Preconditions;
 import io.grpc.Metadata;
@@ -53,7 +52,6 @@
  * </code>
  * </pre>
  */
-@BetaApi("The surface for response metadata is not stable yet and may change in the future.")
 public class GrpcResponseMetadata implements ResponseMetadataHandler {
 
   private volatile Metadata responseMetadata;

diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcStubCallableFactory.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcStubCallableFactory.java
@@ -29,7 +29,6 @@
  */
 package com.google.api.gax.grpc;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.rpc.BatchingCallSettings;
 import com.google.api.gax.rpc.BidiStreamingCallable;
 import com.google.api.gax.rpc.ClientContext;
@@ -45,15 +44,14 @@
 import com.google.longrunning.Operation;
 import com.google.longrunning.stub.OperationsStub;
 
-@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
 public interface GrpcStubCallableFactory {
 
   /**
    * Create a callable object with grpc-specific functionality. Designed for use by generated code.
    *
    * @param grpcCallSettings the gRPC call settings
    */
-  public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(
+  <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(
       GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
       UnaryCallSettings<RequestT, ResponseT> callSettings,
       ClientContext clientContext);
@@ -67,7 +65,7 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCalla
    * @param clientContext {@link ClientContext} to use to connect to the service.
    * @return {@link UnaryCallable} callable object.
    */
-  public <RequestT, ResponseT, PagedListResponseT>
+  <RequestT, ResponseT, PagedListResponseT>
       UnaryCallable<RequestT, PagedListResponseT> createPagedCallable(
           GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
           PagedCallSettings<RequestT, ResponseT, PagedListResponseT> pagedCallSettings,
@@ -83,8 +81,7 @@ UnaryCallable<RequestT, PagedListResponseT> createPagedCallable(
    * @param clientContext {@link ClientContext} to use to connect to the service.
    * @return {@link UnaryCallable} callable object.
    */
-  @BetaApi("The surface for batching is not stable yet and may change in the future.")
-  public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCallable(
+  <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCallable(
       GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
       BatchingCallSettings<RequestT, ResponseT> batchingCallSettings,
       ClientContext clientContext);
@@ -100,9 +97,7 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCa
    * @param operationsStub {@link OperationsStub} to use to poll for updates on the Operation.
    * @return {@link OperationCallable} callable object.
    */
-  @BetaApi(
-      "The surface for long-running operations is not stable yet and may change in the future.")
-  public <RequestT, ResponseT, MetadataT>
+  <RequestT, ResponseT, MetadataT>
       OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
           GrpcCallSettings<RequestT, Operation> grpcCallSettings,
           OperationCallSettings<RequestT, ResponseT, MetadataT> operationCallSettings,
@@ -119,12 +114,10 @@ OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
    * @param clientContext {@link ClientContext} to use to connect to the service.
    * @return {@link BidiStreamingCallable} callable object.
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
-  public <RequestT, ResponseT>
-      BidiStreamingCallable<RequestT, ResponseT> createBidiStreamingCallable(
-          GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
-          StreamingCallSettings<RequestT, ResponseT> streamingCallSettings,
-          ClientContext clientContext);
+  <RequestT, ResponseT> BidiStreamingCallable<RequestT, ResponseT> createBidiStreamingCallable(
+      GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
+      StreamingCallSettings<RequestT, ResponseT> streamingCallSettings,
+      ClientContext clientContext);
 
   /**
    * Create a server-streaming callable with grpc-specific functionality. Designed for use by
@@ -135,12 +128,10 @@ BidiStreamingCallable<RequestT, ResponseT> createBidiStreamingCallable(
    *     settings with.
    * @param clientContext {@link ClientContext} to use to connect to the service.
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
-  public <RequestT, ResponseT>
-      ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
-          GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
-          ServerStreamingCallSettings<RequestT, ResponseT> streamingCallSettings,
-          ClientContext clientContext);
+  <RequestT, ResponseT> ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
+      GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
+      ServerStreamingCallSettings<RequestT, ResponseT> streamingCallSettings,
+      ClientContext clientContext);
 
   /**
    * Create a client-streaming callable object with grpc-specific functionality. Designed for use by
@@ -152,10 +143,8 @@ ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
    * @param clientContext {@link ClientContext} to use to connect to the service.
    * @return {@link ClientStreamingCallable} callable object.
    */
-  @BetaApi("The surface for streaming is not stable yet and may change in the future.")
-  public <RequestT, ResponseT>
-      ClientStreamingCallable<RequestT, ResponseT> createClientStreamingCallable(
-          GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
-          StreamingCallSettings<RequestT, ResponseT> streamingCallSettings,
-          ClientContext clientContext);
+  <RequestT, ResponseT> ClientStreamingCallable<RequestT, ResponseT> createClientStreamingCallable(
+      GrpcCallSettings<RequestT, ResponseT> grpcCallSettings,
+      StreamingCallSettings<RequestT, ResponseT> streamingCallSettings,
+      ClientContext clientContext);
 }
diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java
@@ -166,13 +166,11 @@ public TransportChannelProvider withExecutor(Executor executor) {
   }
 
   @Override
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
   public boolean needsHeaders() {
     return headerProvider == null;
   }
 
   @Override
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
   public TransportChannelProvider withHeaders(Map<String, String> headers) {
     return toBuilder().setHeaderProvider(FixedHeaderProvider.create(headers)).build();
   }

diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/ProtoOperationTransformers.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/ProtoOperationTransformers.java
@@ -30,7 +30,6 @@
 package com.google.api.gax.grpc;
 
 import com.google.api.core.ApiFunction;
-import com.google.api.core.BetaApi;
 import com.google.api.gax.longrunning.OperationSnapshot;
 import com.google.api.gax.rpc.ApiExceptionFactory;
 import com.google.api.gax.rpc.StatusCode.Code;
@@ -39,7 +38,6 @@
 import com.google.protobuf.Message;
 
 /** Public for technical reasons; intended for use by generated code. */
-@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
 public class ProtoOperationTransformers {
   private ProtoOperationTransformers() {}
 

diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/ResponseMetadataHandler.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/ResponseMetadataHandler.java
@@ -29,15 +29,13 @@
  */
 package com.google.api.gax.grpc;
 
-import com.google.api.core.BetaApi;
 import io.grpc.Metadata;
 
 /**
  * An interface to handle metadata returned from an RPC. A ResponseMetadataHandler is used by the
  * GrpcMetadataHandlerInterceptor class to provide custom handling of the returned headers and
  * trailers.
  */
-@BetaApi("The surface for response metadata is not stable yet and may change in the future.")
 public interface ResponseMetadataHandler {
 
   /** Handle the headers returned by an RPC. */

diff --git a/gax-grpc/src/main/java/com/google/longrunning/OperationsClient.java b/gax-grpc/src/main/java/com/google/longrunning/OperationsClient.java
@@ -34,7 +34,6 @@
 import com.google.api.core.ApiFunction;
 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.paging.AbstractFixedSizeCollection;
 import com.google.api.gax.paging.AbstractPage;
@@ -125,7 +124,6 @@ public static final OperationsClient create(OperationsSettings settings) throws
    * Constructs an instance of OperationsClient, using the given stub for making calls. This is for
    * advanced usage - prefer to use OperationsSettings}.
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final OperationsClient create(OperationsStub stub) {
     return new OperationsClient(stub);
   }
@@ -139,7 +137,6 @@ protected OperationsClient(OperationsSettings settings) throws IOException {
     this.stub = ((OperationsStubSettings) settings.getStubSettings()).createStub();
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected OperationsClient(OperationsStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -149,7 +146,6 @@ public final OperationsSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public OperationsStub getStub() {
     return stub;
   }

diff --git a/gax-grpc/src/main/java/com/google/longrunning/OperationsSettings.java b/gax-grpc/src/main/java/com/google/longrunning/OperationsSettings.java
@@ -30,7 +30,6 @@
 package com.google.longrunning;
 
 import com.google.api.core.ApiFunction;
-import com.google.api.core.BetaApi;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
@@ -86,7 +85,6 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
     return OperationsStubSettings.defaultCredentialsProviderBuilder();
   }
 
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
   public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
     return OperationsStubSettings.defaultApiClientHeaderProviderBuilder();
   }

diff --git a/gax-grpc/src/main/java/com/google/longrunning/stub/GrpcOperationsCallableFactory.java b/gax-grpc/src/main/java/com/google/longrunning/stub/GrpcOperationsCallableFactory.java
@@ -29,7 +29,6 @@
  */
 package com.google.longrunning.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcCallableFactory;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
@@ -52,7 +51,6 @@
  *
  * <p>This class is for advanced usage.
  */
-@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
 public class GrpcOperationsCallableFactory implements GrpcStubCallableFactory {
   @Override
   public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(