Skip to content

Commit 7da92b1

Browse files
authored
chore: remove beta httpjson (#2358)
Fixes #2101 ☕️
1 parent 5a821c5 commit 7da92b1

File tree

22 files changed

+2
-66
lines changed

22 files changed

+2
-66
lines changed

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ protected List<MethodDefinition> createNestedBuilderCreatorMethods(
4545
String newBuilderMethodName,
4646
String createDefaultMethodName,
4747
List<AnnotationNode> annotations) {
48-
AnnotationNode betaApiAnnotaiton =
49-
AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build();
5048

5149
List<MethodDefinition> methods = new ArrayList<>();
5250
methods.addAll(
@@ -59,10 +57,7 @@ protected List<MethodDefinition> createNestedBuilderCreatorMethods(
5957
typeStore,
6058
"newHttpJsonBuilder",
6159
"createHttpJsonDefault",
62-
ImmutableList.<AnnotationNode>builder()
63-
.addAll(annotations)
64-
.add(betaApiAnnotaiton)
65-
.build()));
60+
ImmutableList.<AnnotationNode>builder().addAll(annotations).build()));
6661
}
6762
return methods;
6863
}
@@ -77,9 +72,6 @@ protected List<MethodDefinition> createNewBuilderMethods(
7772
CommentStatement comment) {
7873
List<MethodDefinition> methods = new ArrayList<>();
7974

80-
AnnotationNode betaApiAnnotaiton =
81-
AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build();
82-
8375
Iterator<String> transportNames = getTransportContext().transportNames().iterator();
8476

8577
methods.addAll(
@@ -98,10 +90,7 @@ protected List<MethodDefinition> createNewBuilderMethods(
9890
typeStore,
9991
"newHttpJsonBuilder",
10092
"createHttpJsonDefault",
101-
ImmutableList.<AnnotationNode>builder()
102-
.addAll(annotations)
103-
.add(betaApiAnnotaiton)
104-
.build(),
93+
ImmutableList.<AnnotationNode>builder().addAll(annotations).build(),
10594
new SettingsCommentComposer(transportNames.next())
10695
.getNewTransportBuilderMethodComment()));
10796
}

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,6 @@ protected List<MethodDefinition> createOperationsStubGetterMethod(
210210
return super.createOperationsStubGetterMethod(service, operationsStubVarExpr);
211211
}
212212

213-
@Override
214-
protected List<AnnotationNode> createClassAnnotations(Service service) {
215-
List<AnnotationNode> annotations = super.createClassAnnotations(service);
216-
217-
TypeNode betaApiType = FIXED_TYPESTORE.get("BetaApi");
218-
219-
if (annotations.stream().noneMatch(a -> betaApiType.equals(a.type()))) {
220-
annotations.add(AnnotationNode.builder().setType(betaApiType).build());
221-
}
222-
223-
return annotations;
224-
}
225-
226213
@Override
227214
protected List<MethodDefinition> createGetMethodDescriptorsMethod(
228215
Service service,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ public class EchoSettings extends ClientSettings<EchoSettings> {
177177
}
178178

179179
/** Returns a new REST builder for this class. */
180-
@BetaApi
181180
public static Builder newHttpJsonBuilder() {
182181
return Builder.createHttpJsonDefault();
183182
}
@@ -219,7 +218,6 @@ public class EchoSettings extends ClientSettings<EchoSettings> {
219218
return new Builder(EchoStubSettings.newBuilder());
220219
}
221220

222-
@BetaApi
223221
private static Builder createHttpJsonDefault() {
224222
return new Builder(EchoStubSettings.newHttpJsonBuilder());
225223
}

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.google.auto.populate.field.stub;
22

3-
import com.google.api.core.BetaApi;
43
import com.google.api.core.InternalApi;
54
import com.google.api.gax.core.BackgroundResource;
65
import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -36,7 +35,6 @@ import javax.annotation.Generated;
3635
* <p>This class is for advanced usage and reflects the underlying API directly.
3736
*/
3837
@Generated("by gapic-generator-java")
39-
@BetaApi
4038
public class HttpJsonAutoPopulateFieldTestingStub extends AutoPopulateFieldTestingStub {
4139
private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
4240

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.google.explicit.dynamic.routing.header.stub;
22

3-
import com.google.api.core.BetaApi;
43
import com.google.api.core.InternalApi;
54
import com.google.api.gax.core.BackgroundResource;
65
import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -35,7 +34,6 @@ import javax.annotation.Generated;
3534
* <p>This class is for advanced usage and reflects the underlying API directly.
3635
*/
3736
@Generated("by gapic-generator-java")
38-
@BetaApi
3937
public class HttpJsonExplicitDynamicRoutingHeaderTestingStub
4038
extends ExplicitDynamicRoutingHeaderTestingStub {
4139
private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();

showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ public static Builder newBuilder() {
212212
}
213213

214214
/** Returns a new REST builder for this class. */
215-
@BetaApi
216215
public static Builder newHttpJsonBuilder() {
217216
return Builder.createHttpJsonDefault();
218217
}
@@ -254,7 +253,6 @@ private static Builder createDefault() {
254253
return new Builder(ComplianceStubSettings.newBuilder());
255254
}
256255

257-
@BetaApi
258256
private static Builder createHttpJsonDefault() {
259257
return new Builder(ComplianceStubSettings.newHttpJsonBuilder());
260258
}

showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ public static Builder newBuilder() {
228228
}
229229

230230
/** Returns a new REST builder for this class. */
231-
@BetaApi
232231
public static Builder newHttpJsonBuilder() {
233232
return Builder.createHttpJsonDefault();
234233
}
@@ -270,7 +269,6 @@ private static Builder createDefault() {
270269
return new Builder(EchoStubSettings.newBuilder());
271270
}
272271

273-
@BetaApi
274272
private static Builder createHttpJsonDefault() {
275273
return new Builder(EchoStubSettings.newHttpJsonBuilder());
276274
}

showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ public static Builder newBuilder() {
190190
}
191191

192192
/** Returns a new REST builder for this class. */
193-
@BetaApi
194193
public static Builder newHttpJsonBuilder() {
195194
return Builder.createHttpJsonDefault();
196195
}
@@ -232,7 +231,6 @@ private static Builder createDefault() {
232231
return new Builder(IdentityStubSettings.newBuilder());
233232
}
234233

235-
@BetaApi
236234
private static Builder createHttpJsonDefault() {
237235
return new Builder(IdentityStubSettings.newHttpJsonBuilder());
238236
}

showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ public static Builder newBuilder() {
248248
}
249249

250250
/** Returns a new REST builder for this class. */
251-
@BetaApi
252251
public static Builder newHttpJsonBuilder() {
253252
return Builder.createHttpJsonDefault();
254253
}
@@ -290,7 +289,6 @@ private static Builder createDefault() {
290289
return new Builder(MessagingStubSettings.newBuilder());
291290
}
292291

293-
@BetaApi
294292
private static Builder createHttpJsonDefault() {
295293
return new Builder(MessagingStubSettings.newHttpJsonBuilder());
296294
}

showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ public static Builder newBuilder() {
200200
}
201201

202202
/** Returns a new REST builder for this class. */
203-
@BetaApi
204203
public static Builder newHttpJsonBuilder() {
205204
return Builder.createHttpJsonDefault();
206205
}
@@ -242,7 +241,6 @@ private static Builder createDefault() {
242241
return new Builder(SequenceServiceStubSettings.newBuilder());
243242
}
244243

245-
@BetaApi
246244
private static Builder createHttpJsonDefault() {
247245
return new Builder(SequenceServiceStubSettings.newHttpJsonBuilder());
248246
}

0 commit comments

Comments
 (0)