Skip to content

Commit 3c5284a

Browse files
diegomarquezpdiegomarquezp
authored
chore: remove beta api annotation from client header customization surface (#2311)
Fixes #2100
1 parent 5f17e62 commit 3c5284a

62 files changed

Lines changed: 0 additions & 116 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -430,14 +430,6 @@ private List<MethodDefinition> createDefaultGetterMethods(Service service, TypeS
430430
"defaultApiClientHeaderProviderBuilder",
431431
TypeNode.withReference(
432432
ConcreteReference.withClazz(ApiClientHeaderProvider.Builder.class)))
433-
.setAnnotations(
434-
Arrays.asList(
435-
AnnotationNode.builder()
436-
.setType(FIXED_TYPESTORE.get("BetaApi"))
437-
.setDescription(
438-
"The surface for customizing headers is not stable yet and may"
439-
+ " change in the future.")
440-
.build()))
441433
.build());
442434
return javaMethods;
443435
}

‎gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -370,15 +370,7 @@ protected MethodDefinition createApiClientHeaderProviderBuilderMethod(
370370
.setReturnType(returnType)
371371
.build();
372372

373-
AnnotationNode annotation =
374-
AnnotationNode.builder()
375-
.setType(FIXED_TYPESTORE.get("BetaApi"))
376-
.setDescription(
377-
"The surface for customizing headers is not stable yet and may change in the"
378-
+ " future.")
379-
.build();
380373
return MethodDefinition.builder()
381-
.setAnnotations(Arrays.asList(annotation))
382374
.setScope(ScopeNode.PUBLIC)
383375
.setIsStatic(true)
384376
.setReturnType(returnType)

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceSettings.golden‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.google.testdata.v1;
22

33
import com.google.api.core.ApiFunction;
4-
import com.google.api.core.BetaApi;
54
import com.google.api.gax.core.GoogleCredentialsProvider;
65
import com.google.api.gax.core.InstantiatingExecutorProvider;
76
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
@@ -109,7 +108,6 @@ public class DeprecatedServiceSettings extends ClientSettings<DeprecatedServiceS
109108
return DeprecatedServiceStubSettings.defaultTransportChannelProvider();
110109
}
111110

112-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
113111
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
114112
return DeprecatedServiceStubSettings.defaultApiClientHeaderProviderBuilder();
115113
}

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.google.testdata.v1.stub;
22

33
import com.google.api.core.ApiFunction;
4-
import com.google.api.core.BetaApi;
54
import com.google.api.gax.core.GaxProperties;
65
import com.google.api.gax.core.GoogleCredentialsProvider;
76
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -148,7 +147,6 @@ public class DeprecatedServiceStubSettings extends StubSettings<DeprecatedServic
148147
return defaultGrpcTransportProviderBuilder().build();
149148
}
150149

151-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
152150
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
153151
return ApiClientHeaderProvider.newBuilder()
154152
.setGeneratedLibToken(

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoSettings.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ public class EchoSettings extends ClientSettings<EchoSettings> {
154154
return EchoStubSettings.defaultTransportChannelProvider();
155155
}
156156

157-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
158157
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
159158
return EchoStubSettings.defaultApiClientHeaderProviderBuilder();
160159
}

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
331331
return defaultGrpcTransportProviderBuilder().build();
332332
}
333333

334-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
335334
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
336335
return ApiClientHeaderProvider.newBuilder()
337336
.setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(EchoStubSettings.class))

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import static com.google.logging.v2.LoggingServiceV2Client.ListMonitoredResource
77
import com.google.api.MonitoredResourceDescriptor;
88
import com.google.api.core.ApiFunction;
99
import com.google.api.core.ApiFuture;
10-
import com.google.api.core.BetaApi;
1110
import com.google.api.gax.batching.BatchingSettings;
1211
import com.google.api.gax.batching.FlowControlSettings;
1312
import com.google.api.gax.batching.FlowController;
@@ -474,7 +473,6 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S
474473
return defaultGrpcTransportProviderBuilder().build();
475474
}
476475

477-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
478476
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
479477
return ApiClientHeaderProvider.newBuilder()
480478
.setGeneratedLibToken(

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import static com.google.pubsub.v1.PublisherClient.ListTopicsPagedResponse;
66

77
import com.google.api.core.ApiFunction;
88
import com.google.api.core.ApiFuture;
9-
import com.google.api.core.BetaApi;
109
import com.google.api.gax.batching.BatchingSettings;
1110
import com.google.api.gax.batching.FlowControlSettings;
1211
import com.google.api.gax.batching.FlowController;
@@ -483,7 +482,6 @@ public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
483482
return defaultGrpcTransportProviderBuilder().build();
484483
}
485484

486-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
487485
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
488486
return ApiClientHeaderProvider.newBuilder()
489487
.setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(PublisherStubSettings.class))

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ public class EchoSettings extends ClientSettings<EchoSettings> {
167167
return EchoStubSettings.defaultTransportChannelProvider();
168168
}
169169

170-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
171170
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
172171
return EchoStubSettings.defaultApiClientHeaderProviderBuilder();
173172
}

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,15 +354,13 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
354354
return defaultGrpcTransportProviderBuilder().build();
355355
}
356356

357-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
358357
public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
359358
return ApiClientHeaderProvider.newBuilder()
360359
.setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(EchoStubSettings.class))
361360
.setTransportToken(
362361
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
363362
}
364363

365-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
366364
public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
367365
return ApiClientHeaderProvider.newBuilder()
368366
.setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(EchoStubSettings.class))

0 commit comments

Comments
 (0)