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 index 22dc53c24..5f33c3644 100644 --- 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 index 177dde6ed..a5aef3d69 100644 --- 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 { private final MethodDescriptor methodDescriptor; private final RequestParamsExtractor paramsExtractor; @@ -50,7 +49,6 @@ public MethodDescriptor getMethodDescriptor() { return methodDescriptor; } - @BetaApi public RequestParamsExtractor getParamsExtractor() { return paramsExtractor; } @@ -94,7 +92,6 @@ public Builder setMethodDescriptor( return this; } - @BetaApi public Builder setParamsExtractor( RequestParamsExtractor 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 index e94842b27..8a0c4e0b3 100644 --- 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 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 UnaryCallable createBatchingCallable( GrpcCallSettings grpcCallSettings, BatchingCallSettings batchingCallSettings, @@ -177,8 +174,6 @@ public static UnaryCallable 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 OperationCallable createOperationCallable( GrpcCallSettings grpcCallSettings, @@ -223,7 +218,6 @@ OperationCallable 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 BidiStreamingCallable createBidiStreamingCallable( GrpcCallSettings grpcCallSettings, @@ -253,7 +247,6 @@ BidiStreamingCallable createBidiStreamingCallable( * @deprecated Please use ServerStreamingCallSettings */ @Deprecated - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public static ServerStreamingCallable createServerStreamingCallable( GrpcCallSettings grpcCallSettings, @@ -277,7 +270,6 @@ ServerStreamingCallable 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 ServerStreamingCallable createServerStreamingCallable( GrpcCallSettings grpcCallSettings, @@ -312,7 +304,6 @@ ServerStreamingCallable 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 ClientStreamingCallable createClientStreamingCallable( GrpcCallSettings 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 index c04ab0183..f3d4de8ba 100644 --- 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 index 30f7be638..1375fe9fb 100644 --- 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 UnaryCallable 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 BidiStreamingCallable createBidiStreamingCallable( GrpcCallSettings grpcCallSettings, @@ -88,7 +86,6 @@ BidiStreamingCallable 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 ServerStreamingCallable createServerStreamingCallable( GrpcCallSettings grpcCallSettings, @@ -109,7 +106,6 @@ ServerStreamingCallable 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 ClientStreamingCallable createClientStreamingCallable( GrpcCallSettings 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 index 0c196a7bc..9e018eefb 100644 --- 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 @@ * * */ -@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 index 002a4024a..131dafc1f 100644 --- 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,7 +44,6 @@ 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 { /** @@ -53,7 +51,7 @@ public interface GrpcStubCallableFactory { * * @param grpcCallSettings the gRPC call settings */ - public UnaryCallable createUnaryCallable( + UnaryCallable createUnaryCallable( GrpcCallSettings grpcCallSettings, UnaryCallSettings callSettings, ClientContext clientContext); @@ -67,7 +65,7 @@ public UnaryCallable createUnaryCalla * @param clientContext {@link ClientContext} to use to connect to the service. * @return {@link UnaryCallable} callable object. */ - public + UnaryCallable createPagedCallable( GrpcCallSettings grpcCallSettings, PagedCallSettings pagedCallSettings, @@ -83,8 +81,7 @@ UnaryCallable 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 UnaryCallable createBatchingCallable( + UnaryCallable createBatchingCallable( GrpcCallSettings grpcCallSettings, BatchingCallSettings batchingCallSettings, ClientContext clientContext); @@ -100,9 +97,7 @@ public UnaryCallable 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 + OperationCallable createOperationCallable( GrpcCallSettings grpcCallSettings, OperationCallSettings operationCallSettings, @@ -119,12 +114,10 @@ OperationCallable 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 - BidiStreamingCallable createBidiStreamingCallable( - GrpcCallSettings grpcCallSettings, - StreamingCallSettings streamingCallSettings, - ClientContext clientContext); + BidiStreamingCallable createBidiStreamingCallable( + GrpcCallSettings grpcCallSettings, + StreamingCallSettings streamingCallSettings, + ClientContext clientContext); /** * Create a server-streaming callable with grpc-specific functionality. Designed for use by @@ -135,12 +128,10 @@ BidiStreamingCallable 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 - ServerStreamingCallable createServerStreamingCallable( - GrpcCallSettings grpcCallSettings, - ServerStreamingCallSettings streamingCallSettings, - ClientContext clientContext); + ServerStreamingCallable createServerStreamingCallable( + GrpcCallSettings grpcCallSettings, + ServerStreamingCallSettings streamingCallSettings, + ClientContext clientContext); /** * Create a client-streaming callable object with grpc-specific functionality. Designed for use by @@ -152,10 +143,8 @@ ServerStreamingCallable 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 - ClientStreamingCallable createClientStreamingCallable( - GrpcCallSettings grpcCallSettings, - StreamingCallSettings streamingCallSettings, - ClientContext clientContext); + ClientStreamingCallable createClientStreamingCallable( + GrpcCallSettings grpcCallSettings, + StreamingCallSettings 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 index 5fa49c586..61d0dc872 100644 --- 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 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 index 330ecff5b..e3d990d9e 100644 --- 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 index 68ddc9467..4ce195602 100644 --- 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,7 +29,6 @@ */ package com.google.api.gax.grpc; -import com.google.api.core.BetaApi; import io.grpc.Metadata; /** @@ -37,7 +36,6 @@ * 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 index c1210d7db..024950cda 100644 --- 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 index 16035fc6f..22ea7e5a1 100644 --- 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 index fad6deebe..8a18008c0 100644 --- 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 @@ * *

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 UnaryCallable createUnaryCallable( diff --git a/gax-grpc/src/main/java/com/google/longrunning/stub/GrpcOperationsStub.java b/gax-grpc/src/main/java/com/google/longrunning/stub/GrpcOperationsStub.java index e44c5b003..c00574e88 100644 --- a/gax-grpc/src/main/java/com/google/longrunning/stub/GrpcOperationsStub.java +++ b/gax-grpc/src/main/java/com/google/longrunning/stub/GrpcOperationsStub.java @@ -31,7 +31,6 @@ import static com.google.longrunning.OperationsClient.ListOperationsPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; import com.google.api.gax.grpc.GrpcCallSettings; @@ -59,7 +58,6 @@ * *

This class is for advanced usage and reflects the underlying API directly. */ -@BetaApi("A restructuring of stub classes is planned, so this may break in the future") public class GrpcOperationsStub extends OperationsStub { private static final MethodDescriptor diff --git a/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStub.java b/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStub.java index e0eefbd96..467572b00 100644 --- a/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStub.java +++ b/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStub.java @@ -31,7 +31,6 @@ import static com.google.longrunning.OperationsClient.ListOperationsPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.UnaryCallable; import com.google.longrunning.CancelOperationRequest; @@ -48,7 +47,6 @@ * *

This class is for advanced usage and reflects the underlying API directly. */ -@BetaApi("A restructuring of stub classes is planned, so this may break in the future") public abstract class OperationsStub implements BackgroundResource { public UnaryCallable getOperationCallable() { diff --git a/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStubSettings.java b/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStubSettings.java index 1de1411bd..85da6db5c 100644 --- a/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStubSettings.java +++ b/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStubSettings.java @@ -33,7 +33,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; @@ -67,7 +66,6 @@ import org.threeten.bp.Duration; /** Settings class to configure an instance of {@link OperationsStub}. */ -@BetaApi public class OperationsStubSettings extends StubSettings { private final UnaryCallSettings getOperationSettings; @@ -105,7 +103,6 @@ public UnaryCallSettings waitOperationSettings( return waitOperationSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public OperationsStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() @@ -127,7 +124,6 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde return GoogleCredentialsProvider.newBuilder(); } - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { return ApiClientHeaderProvider.newBuilder() .setGeneratedLibToken( diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/FieldsExtractor.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/FieldsExtractor.java index 3e47076cb..024e8d3d1 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/FieldsExtractor.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/FieldsExtractor.java @@ -29,13 +29,10 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; - /** * A functional interface to be implemented for each request message to extract specific fields from * it. For advanced usage only. */ -@BetaApi public interface FieldsExtractor { ParamsT extract(RequestT request); } diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java index 9433d1c00..469435d60 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java @@ -59,7 +59,7 @@ * copies of the object, but with one field changed. The immutability and thread safety of the * arguments solely depends on the arguments themselves. */ -@BetaApi +@BetaApi("Reference ApiCallContext instead - this class is likely to experience breaking changes") public final class HttpJsonCallContext implements ApiCallContext { private final HttpJsonChannel channel; private final HttpJsonCallOptions callOptions; diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java index d951a90a5..6131c911f 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -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; @@ -51,7 +50,6 @@ import javax.annotation.Nonnull; /** Class with utility methods to create http/json-based direct callables. */ -@BetaApi public class HttpJsonCallableFactory { // Used to extract service and method name from a grpc MethodDescriptor. // fullMethodName has the format: service.resource.action @@ -161,8 +159,6 @@ public static UnaryCallable createBat return callable.withDefaultCallContext(clientContext.getDefaultCallContext()); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") public static OperationCallable createOperationCallable( OperationCallSettings operationCallSettings, @@ -175,7 +171,6 @@ OperationCallable createOperationCallable( return operationCallable.withDefaultCallContext(clientContext.getDefaultCallContext()); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public static ServerStreamingCallable createServerStreamingCallable( HttpJsonCallSettings httpJsoncallSettings, diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonLongRunningClient.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonLongRunningClient.java index 7e1601434..55bb5733c 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonLongRunningClient.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonLongRunningClient.java @@ -30,7 +30,6 @@ package com.google.api.gax.httpjson; import com.google.api.core.ApiFunction; -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.LongRunningClient; @@ -42,7 +41,6 @@ * *

Public for technical reasons. For internal use only. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") @InternalApi public class HttpJsonLongRunningClient implements LongRunningClient { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshot.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshot.java index 471cff04d..1e616a31a 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshot.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshot.java @@ -41,7 +41,7 @@ * *

Public for technical reasons. For internal use only. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") +@BetaApi @InternalApi public class HttpJsonOperationSnapshot implements OperationSnapshot { private final String name; diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshotCallable.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshotCallable.java index 30a278011..58f99064a 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshotCallable.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshotCallable.java @@ -46,7 +46,7 @@ * *

Public for technical reasons. For internal use only. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") +@BetaApi @InternalApi public class HttpJsonOperationSnapshotCallable extends UnaryCallable { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStubCallableFactory.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStubCallableFactory.java index 59b0ceaed..a12ca89eb 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStubCallableFactory.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStubCallableFactory.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.BatchingCallSettings; import com.google.api.gax.rpc.ClientContext; @@ -42,7 +41,6 @@ import com.google.api.gax.rpc.UnaryCallSettings; import com.google.api.gax.rpc.UnaryCallable; -@BetaApi("The surface for use by generated code is not stable yet and may change in the future.") public interface HttpJsonStubCallableFactory< OperationT, OperationsStub extends BackgroundResource> { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonTransportChannel.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonTransportChannel.java index 337f7b5a0..355193964 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonTransportChannel.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonTransportChannel.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; import com.google.api.gax.rpc.TransportChannel; import com.google.auto.value.AutoValue; @@ -37,7 +36,6 @@ /** Implementation of TransportChannel based on http/json. */ @AutoValue -@BetaApi @InternalExtensionOnly public abstract class HttpJsonTransportChannel implements TransportChannel { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestFormatter.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestFormatter.java index 944eeb617..3d42b313d 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestFormatter.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestFormatter.java @@ -29,13 +29,11 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import java.util.List; import java.util.Map; /** Interface for classes that create parts of HTTP requests from a parameterized message. */ -@BetaApi public interface HttpRequestFormatter { /** * Return a map where each entry is the name of a query param mapped to the values of the param. diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/OperationSnapshotFactory.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/OperationSnapshotFactory.java index a62c9e4a9..21a746c51 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/OperationSnapshotFactory.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/OperationSnapshotFactory.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.gax.longrunning.OperationSnapshot; /** @@ -42,7 +41,6 @@ * @param initial request message type * @param initial or polling response type */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public interface OperationSnapshotFactory { OperationSnapshot create(RequestT request, OperationT response); } diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/PollingRequestFactory.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/PollingRequestFactory.java index 21d24a3aa..f5a6e9c8d 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/PollingRequestFactory.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/PollingRequestFactory.java @@ -29,14 +29,11 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; - /** * A factory which creates a subsequent polling request from a compund operation id. * * @param polling request type */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public interface PollingRequestFactory { /** * Creates a polling request message from a {@code compoundOperationId}. diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatter.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatter.java index e617522d7..f0d31ac07 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatter.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatter.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.pathtemplate.PathTemplate; import com.google.protobuf.Message; @@ -37,7 +36,6 @@ import java.util.Map; /** Creates parts of a HTTP request from a protobuf message. */ -@BetaApi public class ProtoMessageRequestFormatter implements HttpRequestFormatter { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageResponseParser.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageResponseParser.java index 2820b2c56..959efe379 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageResponseParser.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageResponseParser.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.protobuf.Message; import com.google.protobuf.TypeRegistry; import java.io.IOException; @@ -39,7 +38,6 @@ import java.nio.charset.StandardCharsets; /** The implementation of {@link HttpResponseParser} which works with protobuf messages. */ -@BetaApi public class ProtoMessageResponseParser implements HttpResponseParser { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoOperationTransformers.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoOperationTransformers.java index 6c3850a93..a5a3e436c 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoOperationTransformers.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoOperationTransformers.java @@ -30,7 +30,6 @@ package com.google.api.gax.httpjson; 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-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java index b24c0f8c2..fe5093c19 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java @@ -142,7 +142,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 using create(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); } @@ -151,7 +150,6 @@ public static final OperationsClient create(OperationsStub stub) { * Constructs an instance of OperationsClient, using the given stub for making calls. This is for * advanced usage - prefer using create(OperationsSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final OperationsClient create(BackgroundResource stub) { return new OperationsClient((OperationsStub) stub); } diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java index a22ab01d5..58aff3d7c 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java @@ -143,7 +143,6 @@ public static TransportChannelProvider defaultTransportChannelProvider() { return OperationsStubSettings.defaultTransportChannelProvider(); } - @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-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java index d98991702..193faa79f 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java @@ -81,8 +81,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java index 32cad36f7..5759c4172 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java @@ -30,7 +30,6 @@ package com.google.api.gax.httpjson.longrunning.stub; import com.google.api.client.http.HttpMethods; -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; @@ -70,7 +69,6 @@ * *

This class is for advanced usage and reflects the underlying API directly. */ -@BetaApi("A restructuring of stub classes is planned, so this may break in the future") public class HttpJsonOperationsStub extends OperationsStub { private static final Pattern CLIENT_PACKAGE_VERSION_PATTERN = Pattern.compile("\\.(?v\\d+[a-zA-Z]*\\d*[a-zA-Z]*\\d*)\\.[\\w.]*stub"); diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java index 46755d1ce..bbfec5bde 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson.longrunning.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.longrunning.OperationsClient.ListOperationsPagedResponse; import com.google.api.gax.rpc.LongRunningClient; @@ -48,7 +47,6 @@ * *

This class is for advanced usage and reflects the underlying API directly. */ -@BetaApi public abstract class OperationsStub implements BackgroundResource { public UnaryCallable diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java index ccee9b1f2..5f327a109 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java @@ -33,7 +33,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; @@ -99,7 +98,6 @@ * OperationsStubSettings operationsSettings = operationsSettingsBuilder.build(); * } */ -@BetaApi public class OperationsStubSettings extends StubSettings { /** The default scopes of the service. */ private static final ImmutableList DEFAULT_SERVICE_SCOPES = @@ -188,7 +186,6 @@ public UnaryCallSettings cancelOperationSettings( return cancelOperationSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public OperationsStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() @@ -235,7 +232,6 @@ public static TransportChannelProvider defaultTransportChannelProvider() { return defaultHttpJsonTransportProviderBuilder().build(); } - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { return ApiClientHeaderProvider.newBuilder() .setGeneratedLibToken( diff --git a/gax/src/main/java/com/google/api/gax/batching/AccumulatingBatchReceiver.java b/gax/src/main/java/com/google/api/gax/batching/AccumulatingBatchReceiver.java index 5a7a30280..3e6e47013 100644 --- a/gax/src/main/java/com/google/api/gax/batching/AccumulatingBatchReceiver.java +++ b/gax/src/main/java/com/google/api/gax/batching/AccumulatingBatchReceiver.java @@ -30,13 +30,11 @@ package com.google.api.gax.batching; import com.google.api.core.ApiFuture; -import com.google.api.core.BetaApi; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; /** A simple ThresholdBatchReceiver that just accumulates batches. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public final class AccumulatingBatchReceiver implements ThresholdBatchReceiver { private final ConcurrentLinkedQueue batches = new ConcurrentLinkedQueue<>(); private final ApiFuture retFuture; diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchEntry.java b/gax/src/main/java/com/google/api/gax/batching/BatchEntry.java index 3845e0264..163eae9fd 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchEntry.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchEntry.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.core.SettableApiFuture; import com.google.auto.value.AutoValue; @@ -43,7 +42,6 @@ * @param The type of each individual element to be batched. * @param The type of the result for each individual element. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") @InternalApi("For google-cloud-java client use only.") @AutoValue public abstract class BatchEntry { diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchMerger.java b/gax/src/main/java/com/google/api/gax/batching/BatchMerger.java index 8a4fc8dfe..2d8005307 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchMerger.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchMerger.java @@ -29,9 +29,6 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; - -@BetaApi("The surface for batching is not stable yet and may change in the future.") public interface BatchMerger { void merge(B batch, B newBatch); } diff --git a/gax/src/main/java/com/google/api/gax/batching/Batcher.java b/gax/src/main/java/com/google/api/gax/batching/Batcher.java index 8ac78ef2f..1e069d53e 100644 --- a/gax/src/main/java/com/google/api/gax/batching/Batcher.java +++ b/gax/src/main/java/com/google/api/gax/batching/Batcher.java @@ -30,7 +30,6 @@ package com.google.api.gax.batching; import com.google.api.core.ApiFuture; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; import com.google.api.gax.rpc.ApiCallContext; @@ -46,7 +45,6 @@ * @param The type of each individual element to be batched. * @param The type of the result for each individual element. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") @InternalExtensionOnly public interface Batcher extends AutoCloseable { diff --git a/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java b/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java index 743d25c57..d29e40d60 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatcherImpl.java @@ -34,7 +34,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutureCallback; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.core.SettableApiFuture; import com.google.api.gax.batching.FlowController.FlowControlException; @@ -74,7 +73,6 @@ * @param The type of the request that will contain the accumulated elements. * @param The type of the response that will unpack into individual element results. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") @InternalApi("For google-cloud-java client use only") public class BatcherImpl implements Batcher { diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchingCallSettings.java b/gax/src/main/java/com/google/api/gax/batching/BatchingCallSettings.java index 8bd8647a9..f7a25ae77 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchingCallSettings.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchingCallSettings.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.StatusCode; @@ -64,7 +63,6 @@ * @param The type of the request that will contain the accumulated elements. * @param The type of the response that will unpack into individual element results. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public final class BatchingCallSettings extends UnaryCallSettings { private final BatchingDescriptor diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchingDescriptor.java b/gax/src/main/java/com/google/api/gax/batching/BatchingDescriptor.java index 23e6cfb05..d81068a98 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchingDescriptor.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchingDescriptor.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import java.util.List; @@ -80,7 +79,6 @@ * @param The type of the request that will contain the accumulated elements * @param The type of the response that will be unpacked into individual element results */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") @InternalApi("For google-cloud-java client use only.") public interface BatchingDescriptor { diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchingException.java b/gax/src/main/java/com/google/api/gax/batching/BatchingException.java index 62cd3b028..470c659d0 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchingException.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchingException.java @@ -29,10 +29,7 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; - /** Represents exception occurred during batching. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public final class BatchingException extends RuntimeException { BatchingException(String message) { diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchingFlowController.java b/gax/src/main/java/com/google/api/gax/batching/BatchingFlowController.java index 659991fc6..4252f7594 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchingFlowController.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchingFlowController.java @@ -29,13 +29,11 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.api.gax.batching.FlowController.FlowControlException; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; /** Wraps a {@link FlowController} for use by batching. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public class BatchingFlowController { private final FlowController flowController; diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchingRequestBuilder.java b/gax/src/main/java/com/google/api/gax/batching/BatchingRequestBuilder.java index 6c0c06ef3..448e15c5b 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchingRequestBuilder.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchingRequestBuilder.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; /** @@ -41,7 +40,6 @@ * @param The type of each individual element to be batched. * @param The type of the request that will contain the accumulated elements. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") @InternalApi("For google-cloud-java client use only.") public interface BatchingRequestBuilder { diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchingThreshold.java b/gax/src/main/java/com/google/api/gax/batching/BatchingThreshold.java index 550bd2a02..02ceabdb1 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchingThreshold.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchingThreshold.java @@ -29,13 +29,10 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; - /** * The interface representing a threshold to be used in ThresholdBatcher. Thresholds do not need to * be thread-safe if they are only used inside ThresholdBatcher. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public interface BatchingThreshold { /** diff --git a/gax/src/main/java/com/google/api/gax/batching/BatchingThresholds.java b/gax/src/main/java/com/google/api/gax/batching/BatchingThresholds.java index 74404f24c..28409b00b 100644 --- a/gax/src/main/java/com/google/api/gax/batching/BatchingThresholds.java +++ b/gax/src/main/java/com/google/api/gax/batching/BatchingThresholds.java @@ -29,12 +29,10 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.common.collect.ImmutableList; import java.util.List; /** Factory methods for general-purpose batching thresholds. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public final class BatchingThresholds { /** diff --git a/gax/src/main/java/com/google/api/gax/batching/ElementCounter.java b/gax/src/main/java/com/google/api/gax/batching/ElementCounter.java index 2f5ebe1bc..40c271699 100644 --- a/gax/src/main/java/com/google/api/gax/batching/ElementCounter.java +++ b/gax/src/main/java/com/google/api/gax/batching/ElementCounter.java @@ -29,14 +29,11 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; - /** * Interface representing an object that provides a numerical count given an object of the * parameterized type. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public interface ElementCounter { /** Provides the numerical count associated with the given object. */ - public long count(E element); + long count(E element); } diff --git a/gax/src/main/java/com/google/api/gax/batching/FlowController.java b/gax/src/main/java/com/google/api/gax/batching/FlowController.java index 15a6cd8e1..00bf6988d 100644 --- a/gax/src/main/java/com/google/api/gax/batching/FlowController.java +++ b/gax/src/main/java/com/google/api/gax/batching/FlowController.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.batching.FlowControlEventStats.FlowControlEvent; import com.google.common.base.Preconditions; @@ -38,7 +37,6 @@ import javax.annotation.Nullable; /** Provides flow control capability. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public class FlowController { /** Base exception that signals a flow control state. */ public abstract static class FlowControlException extends Exception { @@ -49,7 +47,6 @@ private FlowControlException() {} * Runtime exception that can be used in place of FlowControlException when an unchecked exception * is required. */ - @BetaApi public static class FlowControlRuntimeException extends RuntimeException { private FlowControlRuntimeException(FlowControlException e) { super(e); @@ -64,7 +61,6 @@ public static FlowControlRuntimeException fromFlowControlException(FlowControlEx * Exception thrown when client-side flow control is enforced based on the maximum number of * outstanding in-memory elements. */ - @BetaApi public static final class MaxOutstandingElementCountReachedException extends FlowControlException { private final long currentMaxElementCount; @@ -88,7 +84,6 @@ public String toString() { * Exception thrown when client-side flow control is enforced based on the maximum number of * unacknowledged in-memory bytes. */ - @BetaApi public static final class MaxOutstandingRequestBytesReachedException extends FlowControlException { private final long currentMaxBytes; @@ -112,7 +107,6 @@ public String toString() { * Enumeration of behaviors that FlowController can use in case the flow control limits are * exceeded. */ - @BetaApi public enum LimitExceededBehavior { /** * Throws {@link MaxOutstandingElementCountReachedException} or {@link diff --git a/gax/src/main/java/com/google/api/gax/batching/NumericThreshold.java b/gax/src/main/java/com/google/api/gax/batching/NumericThreshold.java index 9b2c074cd..3012873ce 100644 --- a/gax/src/main/java/com/google/api/gax/batching/NumericThreshold.java +++ b/gax/src/main/java/com/google/api/gax/batching/NumericThreshold.java @@ -29,11 +29,9 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.common.base.Preconditions; /** A threshold which accumulates a count based on the provided ElementCounter. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public final class NumericThreshold implements BatchingThreshold { private final long threshold; private final ElementCounter extractor; diff --git a/gax/src/main/java/com/google/api/gax/batching/PartitionKey.java b/gax/src/main/java/com/google/api/gax/batching/PartitionKey.java index ba4f814d6..ad1ee483a 100644 --- a/gax/src/main/java/com/google/api/gax/batching/PartitionKey.java +++ b/gax/src/main/java/com/google/api/gax/batching/PartitionKey.java @@ -30,10 +30,8 @@ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; import com.google.common.collect.ImmutableList; -@BetaApi("The surface for batching is not stable yet and may change in the future.") public final class PartitionKey { private final ImmutableList keys; private final int hash; diff --git a/gax/src/main/java/com/google/api/gax/batching/RequestBuilder.java b/gax/src/main/java/com/google/api/gax/batching/RequestBuilder.java index a9188f627..1371069a8 100644 --- a/gax/src/main/java/com/google/api/gax/batching/RequestBuilder.java +++ b/gax/src/main/java/com/google/api/gax/batching/RequestBuilder.java @@ -29,9 +29,6 @@ */ package com.google.api.gax.batching; -import com.google.api.core.BetaApi; - -@BetaApi("The surface for batching is not stable yet and may change in the future.") public interface RequestBuilder { void appendRequest(RequestT request); diff --git a/gax/src/main/java/com/google/api/gax/batching/ThresholdBatchReceiver.java b/gax/src/main/java/com/google/api/gax/batching/ThresholdBatchReceiver.java index d57b7efd2..5f655a8b5 100644 --- a/gax/src/main/java/com/google/api/gax/batching/ThresholdBatchReceiver.java +++ b/gax/src/main/java/com/google/api/gax/batching/ThresholdBatchReceiver.java @@ -30,13 +30,11 @@ package com.google.api.gax.batching; import com.google.api.core.ApiFuture; -import com.google.api.core.BetaApi; /** * Interface representing an object that receives batches from a ThresholdBatcher and takes action * on them. Implementations of ThresholdBatchReceiver should be thread-safe. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public interface ThresholdBatchReceiver { /** diff --git a/gax/src/main/java/com/google/api/gax/batching/ThresholdBatcher.java b/gax/src/main/java/com/google/api/gax/batching/ThresholdBatcher.java index 08f3ca070..75d93ec14 100644 --- a/gax/src/main/java/com/google/api/gax/batching/ThresholdBatcher.java +++ b/gax/src/main/java/com/google/api/gax/batching/ThresholdBatcher.java @@ -35,7 +35,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutureCallback; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.core.SettableApiFuture; import com.google.api.gax.batching.FlowController.FlowControlException; import com.google.common.annotations.VisibleForTesting; @@ -52,7 +51,6 @@ * Queues up elements until either a duration of time has passed or any threshold in a given set of * thresholds is breached, and then delivers the elements in a batch to the consumer. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public final class ThresholdBatcher { private class ReleaseResourcesFunction implements ApiFunction { diff --git a/gax/src/main/java/com/google/api/gax/core/Distribution.java b/gax/src/main/java/com/google/api/gax/core/Distribution.java index 839f01586..71d17c549 100644 --- a/gax/src/main/java/com/google/api/gax/core/Distribution.java +++ b/gax/src/main/java/com/google/api/gax/core/Distribution.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.core; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import java.util.concurrent.atomic.AtomicInteger; @@ -41,7 +40,6 @@ * *

Methods may be called concurrently. */ -@BetaApi public class Distribution { private final AtomicLongArray buckets; diff --git a/gax/src/main/java/com/google/api/gax/longrunning/OperationFuture.java b/gax/src/main/java/com/google/api/gax/longrunning/OperationFuture.java index 56ec5a714..7c15ff9e4 100644 --- a/gax/src/main/java/com/google/api/gax/longrunning/OperationFuture.java +++ b/gax/src/main/java/com/google/api/gax/longrunning/OperationFuture.java @@ -30,7 +30,6 @@ package com.google.api.gax.longrunning; import com.google.api.core.ApiFuture; -import com.google.api.core.BetaApi; import com.google.api.gax.retrying.RetryingFuture; import java.util.concurrent.ExecutionException; @@ -40,7 +39,6 @@ * *

Implementations are expected to be thread-safe. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public interface OperationFuture extends ApiFuture { /** * Returns the value of the name of the operation from the initial operation object returned from diff --git a/gax/src/main/java/com/google/api/gax/longrunning/OperationFutureImpl.java b/gax/src/main/java/com/google/api/gax/longrunning/OperationFutureImpl.java index 4d12edba9..769ec2adc 100644 --- a/gax/src/main/java/com/google/api/gax/longrunning/OperationFutureImpl.java +++ b/gax/src/main/java/com/google/api/gax/longrunning/OperationFutureImpl.java @@ -35,7 +35,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.core.InternalApi; import com.google.api.gax.retrying.RetryingFuture; import java.util.concurrent.ExecutionException; @@ -51,7 +50,6 @@ * *

This is public only for technical reasons, for advanced usage. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") @InternalApi public final class OperationFutureImpl implements OperationFuture { diff --git a/gax/src/main/java/com/google/api/gax/longrunning/OperationFutures.java b/gax/src/main/java/com/google/api/gax/longrunning/OperationFutures.java index 067f16e65..16d167bd3 100644 --- a/gax/src/main/java/com/google/api/gax/longrunning/OperationFutures.java +++ b/gax/src/main/java/com/google/api/gax/longrunning/OperationFutures.java @@ -31,7 +31,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.retrying.RetryingFuture; import com.google.api.gax.rpc.ApiException; import com.google.api.gax.rpc.StatusCode; @@ -40,7 +39,6 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public class OperationFutures { private OperationFutures() { // Utility class diff --git a/gax/src/main/java/com/google/api/gax/longrunning/OperationResponsePollAlgorithm.java b/gax/src/main/java/com/google/api/gax/longrunning/OperationResponsePollAlgorithm.java index 953057e5a..00c3389bb 100644 --- a/gax/src/main/java/com/google/api/gax/longrunning/OperationResponsePollAlgorithm.java +++ b/gax/src/main/java/com/google/api/gax/longrunning/OperationResponsePollAlgorithm.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.longrunning; -import com.google.api.core.BetaApi; import com.google.api.gax.retrying.ResultRetryAlgorithm; import com.google.api.gax.retrying.TimedAttemptSettings; @@ -37,7 +36,6 @@ * Operation polling algorithm, which keeps retrying until {@link OperationSnapshot#isDone()} is * true. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public class OperationResponsePollAlgorithm implements ResultRetryAlgorithm { @Override public TimedAttemptSettings createNextAttempt( diff --git a/gax/src/main/java/com/google/api/gax/longrunning/OperationSnapshot.java b/gax/src/main/java/com/google/api/gax/longrunning/OperationSnapshot.java index 7f1e511a4..7f275970e 100644 --- a/gax/src/main/java/com/google/api/gax/longrunning/OperationSnapshot.java +++ b/gax/src/main/java/com/google/api/gax/longrunning/OperationSnapshot.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.longrunning; -import com.google.api.core.BetaApi; import com.google.api.gax.rpc.StatusCode; /** @@ -38,7 +37,6 @@ *

The metadata and response will have a structure defined by the particular long-running * operation that was initiated. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public interface OperationSnapshot { /** The name of the operation. This is used for identifying the operation on the server. */ diff --git a/gax/src/main/java/com/google/api/gax/longrunning/OperationTimedPollAlgorithm.java b/gax/src/main/java/com/google/api/gax/longrunning/OperationTimedPollAlgorithm.java index 5aeaad013..ddc49f3c0 100644 --- a/gax/src/main/java/com/google/api/gax/longrunning/OperationTimedPollAlgorithm.java +++ b/gax/src/main/java/com/google/api/gax/longrunning/OperationTimedPollAlgorithm.java @@ -30,7 +30,6 @@ package com.google.api.gax.longrunning; import com.google.api.core.ApiClock; -import com.google.api.core.BetaApi; import com.google.api.core.NanoClock; import com.google.api.gax.retrying.ExponentialRetryAlgorithm; import com.google.api.gax.retrying.RetrySettings; @@ -42,7 +41,6 @@ * next polling operation should be executed. If the polling exceeds the total timeout this * algorithm cancels polling. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public class OperationTimedPollAlgorithm extends ExponentialRetryAlgorithm { /** * Creates the polling algorithm, using the default {@code NanoClock} for time computations. diff --git a/gax/src/main/java/com/google/api/gax/paging/Pages.java b/gax/src/main/java/com/google/api/gax/paging/Pages.java index f6abdd3ce..fcd8a5932 100644 --- a/gax/src/main/java/com/google/api/gax/paging/Pages.java +++ b/gax/src/main/java/com/google/api/gax/paging/Pages.java @@ -29,11 +29,9 @@ */ package com.google.api.gax.paging; -import com.google.api.core.BetaApi; import java.util.Collections; /** Utility class for {@link Page}s. */ -@BetaApi public class Pages { private Pages() {} diff --git a/gax/src/main/java/com/google/api/gax/retrying/DirectRetryingExecutor.java b/gax/src/main/java/com/google/api/gax/retrying/DirectRetryingExecutor.java index c024bda77..54b7750ca 100644 --- a/gax/src/main/java/com/google/api/gax/retrying/DirectRetryingExecutor.java +++ b/gax/src/main/java/com/google/api/gax/retrying/DirectRetryingExecutor.java @@ -33,7 +33,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import java.io.InterruptedIOException; import java.nio.channels.ClosedByInterruptException; import java.util.concurrent.Callable; @@ -81,7 +80,6 @@ public RetryingFuture createFuture(Callable callable) { * @param callable the actual callable, which should be executed in a retriable context * @return retrying future facade */ - @BetaApi("The surface for passing per operation state is not yet stable") @Override public RetryingFuture createFuture( Callable callable, RetryingContext context) { diff --git a/gax/src/main/java/com/google/api/gax/retrying/SimpleStreamResumptionStrategy.java b/gax/src/main/java/com/google/api/gax/retrying/SimpleStreamResumptionStrategy.java index 4d2f706fb..7c5902129 100644 --- a/gax/src/main/java/com/google/api/gax/retrying/SimpleStreamResumptionStrategy.java +++ b/gax/src/main/java/com/google/api/gax/retrying/SimpleStreamResumptionStrategy.java @@ -29,14 +29,12 @@ */ package com.google.api.gax.retrying; -import com.google.api.core.BetaApi; import com.google.common.base.Preconditions; /** * Simplest implementation of a {@link StreamResumptionStrategy} which returns the initial request * for unstarted streams. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public final class SimpleStreamResumptionStrategy implements StreamResumptionStrategy { private boolean seenFirstResponse; diff --git a/gax/src/main/java/com/google/api/gax/retrying/StreamResumptionStrategy.java b/gax/src/main/java/com/google/api/gax/retrying/StreamResumptionStrategy.java index b1614ca4b..227b4b0ce 100644 --- a/gax/src/main/java/com/google/api/gax/retrying/StreamResumptionStrategy.java +++ b/gax/src/main/java/com/google/api/gax/retrying/StreamResumptionStrategy.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.retrying; -import com.google.api.core.BetaApi; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -39,7 +38,6 @@ * *

Implementations don't have to be threadsafe because all of the calls will be serialized. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public interface StreamResumptionStrategy { /** Creates a new instance of this StreamResumptionStrategy without accumulated state */ diff --git a/gax/src/main/java/com/google/api/gax/retrying/TimedAttemptSettings.java b/gax/src/main/java/com/google/api/gax/retrying/TimedAttemptSettings.java index 89462e19b..2f9028a2e 100644 --- a/gax/src/main/java/com/google/api/gax/retrying/TimedAttemptSettings.java +++ b/gax/src/main/java/com/google/api/gax/retrying/TimedAttemptSettings.java @@ -30,13 +30,10 @@ package com.google.api.gax.retrying; import com.google.api.core.ApiClock; -import com.google.api.core.BetaApi; import com.google.auto.value.AutoValue; -import com.google.auto.value.AutoValue.Builder; import org.threeten.bp.Duration; /** Timed attempt execution settings. Defines time-specific properties of a retry attempt. */ -@BetaApi @AutoValue public abstract class TimedAttemptSettings { diff --git a/gax/src/main/java/com/google/api/gax/rpc/ApiCallContext.java b/gax/src/main/java/com/google/api/gax/rpc/ApiCallContext.java index 79e4ef0e7..5a34b58e3 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ApiCallContext.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ApiCallContext.java @@ -98,7 +98,6 @@ public interface ApiCallContext extends RetryingContext { *

Please note that this timeout is best effort and the maximum resolution is configured in * {@link StubSettings#getStreamWatchdogCheckInterval()}. */ - @BetaApi("The surface for streaming is not stable yet and may change in the future.") ApiCallContext withStreamWaitTimeout(@Nullable Duration streamWaitTimeout); /** @@ -106,7 +105,6 @@ public interface ApiCallContext extends RetryingContext { * * @see #withStreamWaitTimeout(Duration) */ - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nullable Duration getStreamWaitTimeout(); @@ -128,7 +126,6 @@ public interface ApiCallContext extends RetryingContext { *

Please note that this timeout is best effort and the maximum resolution is configured in * {@link StubSettings#getStreamWatchdogCheckInterval()}. */ - @BetaApi("The surface for streaming is not stable yet and may change in the future.") ApiCallContext withStreamIdleTimeout(@Nullable Duration streamIdleTimeout); /** @@ -136,7 +133,6 @@ public interface ApiCallContext extends RetryingContext { * * @see #withStreamIdleTimeout(Duration) */ - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nullable Duration getStreamIdleTimeout(); diff --git a/gax/src/main/java/com/google/api/gax/rpc/ApiClientHeaderProvider.java b/gax/src/main/java/com/google/api/gax/rpc/ApiClientHeaderProvider.java index 1c0ba4f79..34d00d0f3 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ApiClientHeaderProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ApiClientHeaderProvider.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.api.gax.core.GaxProperties; import com.google.common.collect.ImmutableMap; import java.io.Serializable; @@ -39,7 +38,6 @@ * Implementation of HeaderProvider that provides headers describing the API client library making * API calls. */ -@BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public class ApiClientHeaderProvider implements HeaderProvider, Serializable { private static final long serialVersionUID = -8876627296793342119L; static final String QUOTA_PROJECT_ID_HEADER_KEY = "x-goog-user-project"; diff --git a/gax/src/main/java/com/google/api/gax/rpc/ApiStreamObserver.java b/gax/src/main/java/com/google/api/gax/rpc/ApiStreamObserver.java index 1a1040bcd..6dd12c311 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ApiStreamObserver.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ApiStreamObserver.java @@ -29,8 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; - /** * Receives notifications from an observable stream of messages. * @@ -52,7 +50,6 @@ *

This interface is a fork of io.grpc.stub.StreamObserver to enable shadowing of Guava, and also * to allow for a transport-agnostic interface that doesn't depend on gRPC. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public interface ApiStreamObserver { /** * Receives a value from the stream. diff --git a/gax/src/main/java/com/google/api/gax/rpc/BatchedRequestIssuer.java b/gax/src/main/java/com/google/api/gax/rpc/BatchedRequestIssuer.java index bbfbcb2cc..599fa5183 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/BatchedRequestIssuer.java +++ b/gax/src/main/java/com/google/api/gax/rpc/BatchedRequestIssuer.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.common.base.Preconditions; /** @@ -38,7 +37,6 @@ * *

This class is designed to be used by generated code. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public final class BatchedRequestIssuer { private final BatchedFuture batchedFuture; private final long messageCount; diff --git a/gax/src/main/java/com/google/api/gax/rpc/BatchingCallSettings.java b/gax/src/main/java/com/google/api/gax/rpc/BatchingCallSettings.java index b79371003..922f48640 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/BatchingCallSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/BatchingCallSettings.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; import com.google.api.gax.batching.BatchingSettings; import com.google.api.gax.batching.FlowController; @@ -42,7 +41,6 @@ * A settings class to configure a {@link UnaryCallable} for calls to an API method that supports * batching. The settings are provided using an instance of {@link BatchingSettings}. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") @InternalExtensionOnly public final class BatchingCallSettings extends UnaryCallSettings { diff --git a/gax/src/main/java/com/google/api/gax/rpc/BatchingDescriptor.java b/gax/src/main/java/com/google/api/gax/rpc/BatchingDescriptor.java index fb10d95f1..ce4cf737c 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/BatchingDescriptor.java +++ b/gax/src/main/java/com/google/api/gax/rpc/BatchingDescriptor.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.api.gax.batching.PartitionKey; import com.google.api.gax.batching.RequestBuilder; import java.util.Collection; @@ -43,7 +42,6 @@ * *

This class is designed to be used by generated code. */ -@BetaApi("The surface for batching is not stable yet and may change in the future.") public interface BatchingDescriptor { /** Returns the value of the partition key for the given request. */ diff --git a/gax/src/main/java/com/google/api/gax/rpc/BidiStream.java b/gax/src/main/java/com/google/api/gax/rpc/BidiStream.java index c9fe47c4c..a47468567 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/BidiStream.java +++ b/gax/src/main/java/com/google/api/gax/rpc/BidiStream.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; /** @@ -69,7 +68,6 @@ * @param The type of each request. * @param The type of each response. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public class BidiStream extends ServerStream implements ClientStream { diff --git a/gax/src/main/java/com/google/api/gax/rpc/BidiStreamObserver.java b/gax/src/main/java/com/google/api/gax/rpc/BidiStreamObserver.java index 4d90b345a..427a68068 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/BidiStreamObserver.java +++ b/gax/src/main/java/com/google/api/gax/rpc/BidiStreamObserver.java @@ -29,8 +29,5 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; - -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public interface BidiStreamObserver extends ResponseObserver, ClientStreamReadyObserver {} diff --git a/gax/src/main/java/com/google/api/gax/rpc/BidiStreamingCallable.java b/gax/src/main/java/com/google/api/gax/rpc/BidiStreamingCallable.java index 08e3a574f..c97367588 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/BidiStreamingCallable.java +++ b/gax/src/main/java/com/google/api/gax/rpc/BidiStreamingCallable.java @@ -29,8 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; - /** * A BidiStreamingCallable is an immutable object which is capable of making RPC calls to * bidirectional streaming API methods. Not all transports support streaming. @@ -39,7 +37,6 @@ * class is intended to be created by a generated client class, and configured by instances of * StreamingCallSettings.Builder which are exposed through the client settings class. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public abstract class BidiStreamingCallable { protected BidiStreamingCallable() {} diff --git a/gax/src/main/java/com/google/api/gax/rpc/Callables.java b/gax/src/main/java/com/google/api/gax/rpc/Callables.java index 939e66b7f..413a11649 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/Callables.java +++ b/gax/src/main/java/com/google/api/gax/rpc/Callables.java @@ -77,7 +77,6 @@ public static UnaryCallable retrying( clientContext.getDefaultCallContext(), innerCallable, retryingExecutor); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public static ServerStreamingCallable retrying( ServerStreamingCallable innerCallable, ServerStreamingCallSettings callSettings, @@ -105,7 +104,6 @@ public static ServerStreamingCallable innerCallable, retryingExecutor, settings.getResumptionStrategy()); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public static ServerStreamingCallable watched( ServerStreamingCallable callable, ServerStreamingCallSettings callSettings, @@ -132,7 +130,6 @@ public static ServerStreamingCallable * @param context {@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 UnaryCallable batching( UnaryCallable innerCallable, BatchingCallSettings batchingCallSettings, diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java b/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java index ff18e77d3..45a54e549 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java @@ -84,21 +84,17 @@ public abstract class ClientContext { @Nullable public abstract TransportChannel getTransportChannel(); - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public abstract Map getHeaders(); - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected abstract Map getInternalHeaders(); public abstract ApiClock getClock(); public abstract ApiCallContext getDefaultCallContext(); - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nullable public abstract Watchdog getStreamWatchdog(); - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nonnull public abstract Duration getStreamWatchdogCheckInterval(); @@ -305,10 +301,8 @@ public abstract static class Builder { public abstract Builder setTransportChannel(TransportChannel transportChannel); - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public abstract Builder setHeaders(Map headers); - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected abstract Builder setInternalHeaders(Map headers); public abstract Builder setClock(ApiClock clock); @@ -319,10 +313,8 @@ public abstract static class Builder { public abstract Builder setQuotaProjectId(String QuotaProjectId); - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public abstract Builder setStreamWatchdog(Watchdog watchdog); - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public abstract Builder setStreamWatchdogCheckInterval(Duration duration); /** diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java b/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java index bd4891ccc..a1097a410 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java @@ -31,7 +31,6 @@ import com.google.api.core.ApiClock; import com.google.api.core.ApiFunction; -import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; import com.google.api.gax.core.ExecutorProvider; import com.google.common.base.MoreObjects; @@ -82,12 +81,10 @@ public final CredentialsProvider getCredentialsProvider() { return stubSettings.getCredentialsProvider(); } - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public final HeaderProvider getHeaderProvider() { return stubSettings.getHeaderProvider(); } - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected final HeaderProvider getInternalHeaderProvider() { return stubSettings.getInternalHeaderProvider(); } @@ -104,13 +101,11 @@ public final String getQuotaProjectId() { return stubSettings.getQuotaProjectId(); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nullable public final WatchdogProvider getWatchdogProvider() { return stubSettings.getStreamWatchdogProvider(); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nonnull public final Duration getWatchdogCheckInterval() { return stubSettings.getStreamWatchdogCheckInterval(); @@ -204,7 +199,6 @@ public B setCredentialsProvider(CredentialsProvider credentialsProvider) { * Some reserved headers can be overridden (e.g. Content-Type) or merged with the default value * (e.g. User-Agent) by the underlying transport layer. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public B setHeaderProvider(HeaderProvider headerProvider) { stubSettings.setHeaderProvider(headerProvider); return self(); @@ -217,7 +211,6 @@ public B setHeaderProvider(HeaderProvider headerProvider) { * the constructed client. Some reserved headers can be overridden (e.g. Content-Type) or merged * with the default value (e.g. User-Agent) by the underlying transport layer. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected B setInternalHeaderProvider(HeaderProvider internalHeaderProvider) { stubSettings.setInternalHeaderProvider(internalHeaderProvider); return self(); @@ -252,13 +245,11 @@ public B setQuotaProjectId(String quotaProjectId) { return self(); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public B setWatchdogProvider(@Nullable WatchdogProvider watchdogProvider) { stubSettings.setStreamWatchdogProvider(watchdogProvider); return self(); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public B setWatchdogCheckInterval(@Nullable Duration checkInterval) { stubSettings.setStreamWatchdogCheckInterval(checkInterval); return self(); @@ -298,13 +289,11 @@ public CredentialsProvider getCredentialsProvider() { } /** Gets the custom HeaderProvider that was previously set on this Builder. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public HeaderProvider getHeaderProvider() { return stubSettings.getHeaderProvider(); } /** Gets the internal HeaderProvider that was previously set on this Builder. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected HeaderProvider getInternalHeaderProvider() { return stubSettings.getInternalHeaderProvider(); } @@ -323,13 +312,11 @@ public String getQuotaProjectId() { return stubSettings.getQuotaProjectId(); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nullable public WatchdogProvider getWatchdogProvider() { return stubSettings.getStreamWatchdogProvider(); } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nullable public Duration getWatchdogCheckInterval() { return stubSettings.getStreamWatchdogCheckInterval(); diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientStream.java b/gax/src/main/java/com/google/api/gax/rpc/ClientStream.java index ffa491bab..0a451b68d 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ClientStream.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ClientStream.java @@ -29,8 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; - /** * A wrapper used to send requests to the server. * @@ -51,7 +49,6 @@ * * @param The type of each request. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public interface ClientStream { /** Sends a request to the server. It is an error to call this if the stream is already closed. */ void send(RequestT request); diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientStreamReadyObserver.java b/gax/src/main/java/com/google/api/gax/rpc/ClientStreamReadyObserver.java index 9f7e0e7fc..034752451 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ClientStreamReadyObserver.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ClientStreamReadyObserver.java @@ -29,10 +29,7 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; - /** A callback used to report that the {@link ClientStream} is ready to send more messages. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public interface ClientStreamReadyObserver { void onReady(ClientStream stream); } diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientStreamingCallable.java b/gax/src/main/java/com/google/api/gax/rpc/ClientStreamingCallable.java index 82882ef1e..13ef1c645 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ClientStreamingCallable.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ClientStreamingCallable.java @@ -29,8 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; - /** * A ClientStreamingCallable is an immutable object which is capable of making RPC calls to client * streaming API methods. Not all transports support streaming. @@ -39,7 +37,6 @@ * This class is intended to be created by a generated client class, and configured by instances of * StreamingCallSettings.Builder which are exposed through the client settings class. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public abstract class ClientStreamingCallable { protected ClientStreamingCallable() {} diff --git a/gax/src/main/java/com/google/api/gax/rpc/FixedHeaderProvider.java b/gax/src/main/java/com/google/api/gax/rpc/FixedHeaderProvider.java index 7e39f08b8..8aa781697 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/FixedHeaderProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/FixedHeaderProvider.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableMap; import java.io.Serializable; @@ -41,7 +40,6 @@ /** An instance of HeaderProvider that always provides the same headers. */ @AutoValue -@BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public abstract class FixedHeaderProvider implements HeaderProvider, Serializable { private static final long serialVersionUID = -4881534091594970538L; diff --git a/gax/src/main/java/com/google/api/gax/rpc/FixedTransportChannelProvider.java b/gax/src/main/java/com/google/api/gax/rpc/FixedTransportChannelProvider.java index c2f08fc62..860dfc14a 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/FixedTransportChannelProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/FixedTransportChannelProvider.java @@ -70,13 +70,11 @@ public FixedTransportChannelProvider withExecutor(Executor executor) { } @Override - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public boolean needsHeaders() { return false; } @Override - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public FixedTransportChannelProvider withHeaders(Map headers) { throw new UnsupportedOperationException("FixedTransportChannelProvider doesn't need headers"); } diff --git a/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java b/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java index c958c66f6..a1fd245b5 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java @@ -30,7 +30,6 @@ package com.google.api.gax.rpc; import com.google.api.core.ApiClock; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nonnull; @@ -44,7 +43,6 @@ *

This is the internal class and is public only for technical reasons. It may change any time * without notice, please do not depend on it explicitly. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") @InternalApi public final class FixedWatchdogProvider implements WatchdogProvider { @Nullable private final Watchdog watchdog; diff --git a/gax/src/main/java/com/google/api/gax/rpc/HeaderProvider.java b/gax/src/main/java/com/google/api/gax/rpc/HeaderProvider.java index 1336ce00f..c20351c0a 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/HeaderProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/HeaderProvider.java @@ -29,11 +29,9 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import java.util.Map; /** Provider of headers to put on http requests. */ -@BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public interface HeaderProvider { /** Get the headers to put on http requests. */ diff --git a/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java b/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java index b63d0ca99..a069c49c8 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java @@ -30,7 +30,6 @@ package com.google.api.gax.rpc; import com.google.api.core.ApiClock; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.common.base.Preconditions; import java.util.concurrent.ScheduledExecutorService; @@ -44,7 +43,6 @@ *

This is the internal class and is public only for technical reasons. It may change any time * without notice, please do not depend on it explicitly. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") @InternalApi public final class InstantiatingWatchdogProvider implements WatchdogProvider { @Nullable private final ApiClock clock; diff --git a/gax/src/main/java/com/google/api/gax/rpc/LongRunningClient.java b/gax/src/main/java/com/google/api/gax/rpc/LongRunningClient.java index fa9267f4d..87ebd2611 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/LongRunningClient.java +++ b/gax/src/main/java/com/google/api/gax/rpc/LongRunningClient.java @@ -29,11 +29,9 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.api.gax.longrunning.OperationSnapshot; /** Implementation-agnostic interface for managing long-running operations. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public interface LongRunningClient { /** diff --git a/gax/src/main/java/com/google/api/gax/rpc/NoHeaderProvider.java b/gax/src/main/java/com/google/api/gax/rpc/NoHeaderProvider.java index 959e1ef40..48b8532ea 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/NoHeaderProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/NoHeaderProvider.java @@ -29,13 +29,11 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import java.io.Serializable; import java.util.Collections; import java.util.Map; /** Implementation of HeaderProvider that provides empty headers. */ -@BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public class NoHeaderProvider implements HeaderProvider, Serializable { private static final long serialVersionUID = 7323717933589691233L; diff --git a/gax/src/main/java/com/google/api/gax/rpc/OperationCallSettings.java b/gax/src/main/java/com/google/api/gax/rpc/OperationCallSettings.java index ec60c24ed..0236f59a5 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/OperationCallSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/OperationCallSettings.java @@ -32,7 +32,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.api.core.ApiFunction; -import com.google.api.core.BetaApi; import com.google.api.gax.longrunning.OperationSnapshot; import com.google.api.gax.retrying.TimedRetryAlgorithm; @@ -40,7 +39,6 @@ * A settings class to configure an {@link OperationCallable} for calls to initiate, resume, and * cancel a long-running operation. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public final class OperationCallSettings { private final UnaryCallSettings initialCallSettings; private final TimedRetryAlgorithm pollingAlgorithm; diff --git a/gax/src/main/java/com/google/api/gax/rpc/OperationCallable.java b/gax/src/main/java/com/google/api/gax/rpc/OperationCallable.java index 64e527eb0..75eac0e92 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/OperationCallable.java +++ b/gax/src/main/java/com/google/api/gax/rpc/OperationCallable.java @@ -30,7 +30,6 @@ package com.google.api.gax.rpc; import com.google.api.core.ApiFuture; -import com.google.api.core.BetaApi; import com.google.api.gax.longrunning.OperationFuture; /** @@ -42,7 +41,6 @@ * class is intended to be created by a generated client class, and configured by instances of * OperationCallSettings.Builder which are exposed through the client settings class. */ -@BetaApi("The surface for long-running operations is not stable yet and may change in the future.") public abstract class OperationCallable { protected OperationCallable() {} diff --git a/gax/src/main/java/com/google/api/gax/rpc/ResponseObserver.java b/gax/src/main/java/com/google/api/gax/rpc/ResponseObserver.java index 8c27471c6..77c7a82d3 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ResponseObserver.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ResponseObserver.java @@ -29,8 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; - /** * Receives notifications from server-streaming calls. * @@ -50,7 +48,6 @@ * control by calling {@code disableAutoInboundFlowControl()} in {@code onStart}. After this, the * consumer must request responses by calling {@code request()}. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public interface ResponseObserver { /** diff --git a/gax/src/main/java/com/google/api/gax/rpc/ServerStream.java b/gax/src/main/java/com/google/api/gax/rpc/ServerStream.java index 79b9509a0..518c68523 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ServerStream.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ServerStream.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import java.util.Iterator; import javax.annotation.Nonnull; @@ -65,7 +64,6 @@ * * @param The type of each response. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public class ServerStream implements Iterable { private final QueuingResponseObserver observer = new QueuingResponseObserver<>(); private final ServerStreamIterator iterator = new ServerStreamIterator<>(observer); diff --git a/gax/src/main/java/com/google/api/gax/rpc/ServerStreamingCallSettings.java b/gax/src/main/java/com/google/api/gax/rpc/ServerStreamingCallSettings.java index 3fe85948a..eb9373e0c 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ServerStreamingCallSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ServerStreamingCallSettings.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.retrying.SimpleStreamResumptionStrategy; import com.google.api.gax.retrying.StreamResumptionStrategy; @@ -72,7 +71,6 @@ *

  • totalTimeout still applies to the entire stream. * */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public final class ServerStreamingCallSettings extends StreamingCallSettings { diff --git a/gax/src/main/java/com/google/api/gax/rpc/ServerStreamingCallable.java b/gax/src/main/java/com/google/api/gax/rpc/ServerStreamingCallable.java index 6cdb53b5b..51eed9388 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ServerStreamingCallable.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ServerStreamingCallable.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import java.util.Iterator; import java.util.List; @@ -41,7 +40,6 @@ * This class is intended to be created by a generated client class, and configured by instances of * StreamingCallSettings.Builder which are exposed through the client settings class. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public abstract class ServerStreamingCallable { private final FirstElementCallable firstCallable; private final SpoolingCallable spoolingCallable; diff --git a/gax/src/main/java/com/google/api/gax/rpc/StateCheckingResponseObserver.java b/gax/src/main/java/com/google/api/gax/rpc/StateCheckingResponseObserver.java index a9fcdc255..d787f434d 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/StateCheckingResponseObserver.java +++ b/gax/src/main/java/com/google/api/gax/rpc/StateCheckingResponseObserver.java @@ -29,11 +29,9 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.common.base.Preconditions; /** Base implementation of {@link ResponseObserver} that performs state sanity checks. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public abstract class StateCheckingResponseObserver implements ResponseObserver { private boolean isStarted; private boolean isClosed; diff --git a/gax/src/main/java/com/google/api/gax/rpc/StreamController.java b/gax/src/main/java/com/google/api/gax/rpc/StreamController.java index f1fb8188f..42a09efdc 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/StreamController.java +++ b/gax/src/main/java/com/google/api/gax/rpc/StreamController.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import java.util.concurrent.CancellationException; /** @@ -40,7 +39,6 @@ * flow control. The receiver can also save a reference to the instance and terminate the stream * early using {@code cancel()}. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public interface StreamController { /** * Cancel the stream early. diff --git a/gax/src/main/java/com/google/api/gax/rpc/StreamingCallSettings.java b/gax/src/main/java/com/google/api/gax/rpc/StreamingCallSettings.java index a6b01bf76..7f8895436 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/StreamingCallSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/StreamingCallSettings.java @@ -29,13 +29,11 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; /** * A settings class to configure a streaming callable object for calls to a streaming API method. */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") @InternalExtensionOnly public class StreamingCallSettings { diff --git a/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java b/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java index 04f1d59c9..877b03e29 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java @@ -123,12 +123,10 @@ public final CredentialsProvider getCredentialsProvider() { return credentialsProvider; } - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public final HeaderProvider getHeaderProvider() { return headerProvider; } - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected final HeaderProvider getInternalHeaderProvider() { return internalHeaderProvider; } @@ -154,13 +152,11 @@ public final String getQuotaProjectId() { return quotaProjectId; } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nullable public final WatchdogProvider getStreamWatchdogProvider() { return streamWatchdogProvider; } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nonnull public final Duration getStreamWatchdogCheckInterval() { return streamWatchdogCheckInterval; @@ -351,7 +347,6 @@ public B setCredentialsProvider(CredentialsProvider credentialsProvider) { * Some reserved headers can be overridden (e.g. Content-Type) or merged with the default value * (e.g. User-Agent) by the underlying transport layer. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public B setHeaderProvider(HeaderProvider headerProvider) { this.headerProvider = headerProvider; if (this.quotaProjectId == null @@ -368,7 +363,6 @@ public B setHeaderProvider(HeaderProvider headerProvider) { * the constructed client. Some reserved headers can be overridden (e.g. Content-Type) or merged * with the default value (e.g. User-Agent) by the underlying transport layer. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected B setInternalHeaderProvider(HeaderProvider internalHeaderProvider) { this.internalHeaderProvider = internalHeaderProvider; if (this.quotaProjectId == null @@ -392,7 +386,6 @@ public B setTransportChannelProvider(TransportChannelProvider transportChannelPr * *

    This will default to a {@link InstantiatingWatchdogProvider} if it is not set. */ - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public B setStreamWatchdogProvider(@Nullable WatchdogProvider streamWatchdogProvider) { this.streamWatchdogProvider = streamWatchdogProvider; return self(); @@ -436,7 +429,6 @@ public B setQuotaProjectId(String quotaProjectId) { * Sets how often the {@link Watchdog} will check ongoing streaming RPCs. Defaults to 10 secs. * Use {@link Duration#ZERO} to disable. */ - @BetaApi("The surface for streaming is not stable yet and may change in the future.") public B setStreamWatchdogCheckInterval(@Nonnull Duration checkInterval) { Preconditions.checkNotNull(checkInterval); this.streamWatchdogCheckInterval = checkInterval; @@ -477,19 +469,16 @@ public CredentialsProvider getCredentialsProvider() { } /** Gets the custom HeaderProvider that was previously set on this Builder. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public HeaderProvider getHeaderProvider() { return headerProvider; } /** Gets the internal HeaderProvider that was previously set on this Builder. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected HeaderProvider getInternalHeaderProvider() { return internalHeaderProvider; } /** Gets the {@link WatchdogProvider }that was previously set on this Builder. */ - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nullable public WatchdogProvider getStreamWatchdogProvider() { return streamWatchdogProvider; @@ -513,7 +502,6 @@ public String getQuotaProjectId() { return quotaProjectId; } - @BetaApi("The surface for streaming is not stable yet and may change in the future.") @Nonnull public Duration getStreamWatchdogCheckInterval() { return streamWatchdogCheckInterval; diff --git a/gax/src/main/java/com/google/api/gax/rpc/TransportChannelProvider.java b/gax/src/main/java/com/google/api/gax/rpc/TransportChannelProvider.java index 160adf02f..fdc1a98e9 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/TransportChannelProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/TransportChannelProvider.java @@ -78,7 +78,6 @@ public interface TransportChannelProvider { TransportChannelProvider withExecutor(ScheduledExecutorService executor); /** True if the TransportProvider has no headers provided. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") boolean needsHeaders(); /** @@ -86,7 +85,6 @@ public interface TransportChannelProvider { * *

    This method should only be called if {@link #needsHeaders()} returns true. */ - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") TransportChannelProvider withHeaders(Map headers); /** True if the TransportProvider has no endpoint set. */ diff --git a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java index d40da8c18..83d729933 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java +++ b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java @@ -30,7 +30,6 @@ package com.google.api.gax.rpc; import com.google.api.core.ApiClock; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.common.base.Preconditions; import java.util.Iterator; @@ -61,7 +60,6 @@ * had no outstanding demand. Duration.ZERO disables the timeout. * */ -@BetaApi public final class Watchdog implements Runnable, BackgroundResource { private static final Logger LOG = Logger.getLogger(Watchdog.class.getName()); diff --git a/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java b/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java index a1fa227e8..e01ed3c20 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java @@ -30,12 +30,10 @@ package com.google.api.gax.rpc; import com.google.api.core.ApiClock; -import com.google.api.core.BetaApi; import java.util.concurrent.ScheduledExecutorService; import javax.annotation.Nonnull; import org.threeten.bp.Duration; -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public interface WatchdogProvider { boolean needsClock(); diff --git a/gax/src/main/java/com/google/api/gax/rpc/WatchdogTimeoutException.java b/gax/src/main/java/com/google/api/gax/rpc/WatchdogTimeoutException.java index 6a78b4425..15b0cc388 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/WatchdogTimeoutException.java +++ b/gax/src/main/java/com/google/api/gax/rpc/WatchdogTimeoutException.java @@ -29,8 +29,6 @@ */ package com.google.api.gax.rpc; -import com.google.api.core.BetaApi; - /** * The marker exception thrown when a timeout is exceeded. * @@ -44,7 +42,6 @@ * or next on {@link ServerStream#iterator()} (in case of blocking api). * */ -@BetaApi("The surface for streaming is not stable yet and may change in the future.") public class WatchdogTimeoutException extends ApiException { private static final long serialVersionUID = -777463630112442086L;