Skip to content

Commit 7da92b1

Browse files
JoeWang1127JoeWang1127
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

+2-13
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

-13
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

-2
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

-2
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

-2
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

-2
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

-2
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

-2
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

-2
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

-2
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
}

‎showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java

-2
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ public static Builder newBuilder() {
207207
}
208208

209209
/** Returns a new REST builder for this class. */
210-
@BetaApi
211210
public static Builder newHttpJsonBuilder() {
212211
return Builder.createHttpJsonDefault();
213212
}
@@ -249,7 +248,6 @@ private static Builder createDefault() {
249248
return new Builder(TestingStubSettings.newBuilder());
250249
}
251250

252-
@BetaApi
253251
private static Builder createHttpJsonDefault() {
254252
return new Builder(TestingStubSettings.newHttpJsonBuilder());
255253
}

‎test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java

-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ public static Builder newBuilder() {
134134
}
135135

136136
/** Returns a new REST builder for this class. */
137-
@BetaApi
138137
public static Builder newHttpJsonBuilder() {
139138
return Builder.createHttpJsonDefault();
140139
}
@@ -176,7 +175,6 @@ private static Builder createDefault() {
176175
return new Builder(ConnectionServiceStubSettings.newBuilder());
177176
}
178177

179-
@BetaApi
180178
private static Builder createHttpJsonDefault() {
181179
return new Builder(ConnectionServiceStubSettings.newHttpJsonBuilder());
182180
}

‎test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static com.google.cloud.apigeeconnect.v1.ConnectionServiceClient.ListConnectionsPagedResponse;
2020

21-
import com.google.api.core.BetaApi;
2221
import com.google.api.core.InternalApi;
2322
import com.google.api.gax.core.BackgroundResource;
2423
import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -49,7 +48,6 @@
4948
* <p>This class is for advanced usage and reflects the underlying API directly.
5049
*/
5150
@Generated("by gapic-generator-java")
52-
@BetaApi
5351
public class HttpJsonConnectionServiceStub extends ConnectionServiceStub {
5452
private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
5553

‎test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java

-2
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ public static Builder newBuilder() {
262262
}
263263

264264
/** Returns a new REST builder for this class. */
265-
@BetaApi
266265
public static Builder newHttpJsonBuilder() {
267266
return Builder.createHttpJsonDefault();
268267
}
@@ -304,7 +303,6 @@ private static Builder createDefault() {
304303
return new Builder(AssetServiceStubSettings.newBuilder());
305304
}
306305

307-
@BetaApi
308306
private static Builder createHttpJsonDefault() {
309307
return new Builder(AssetServiceStubSettings.newHttpJsonBuilder());
310308
}

‎test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static com.google.cloud.asset.v1.AssetServiceClient.SearchAllIamPoliciesPagedResponse;
2222
import static com.google.cloud.asset.v1.AssetServiceClient.SearchAllResourcesPagedResponse;
2323

24-
import com.google.api.core.BetaApi;
2524
import com.google.api.core.InternalApi;
2625
import com.google.api.gax.core.BackgroundResource;
2726
import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -91,7 +90,6 @@
9190
* <p>This class is for advanced usage and reflects the underlying API directly.
9291
*/
9392
@Generated("by gapic-generator-java")
94-
@BetaApi
9593
public class HttpJsonAssetServiceStub extends AssetServiceStub {
9694
private static final TypeRegistry typeRegistry =
9795
TypeRegistry.newBuilder()

‎test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.cloud.compute.v1small.AddressesClient.AggregatedListPagedResponse;
2020
import static com.google.cloud.compute.v1small.AddressesClient.ListPagedResponse;
2121

22-
import com.google.api.core.BetaApi;
2322
import com.google.api.core.InternalApi;
2423
import com.google.api.gax.core.BackgroundResource;
2524
import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -59,7 +58,6 @@
5958
* <p>This class is for advanced usage and reflects the underlying API directly.
6059
*/
6160
@Generated("by gapic-generator-java")
62-
@BetaApi
6361
public class HttpJsonAddressesStub extends AddressesStub {
6462
private static final TypeRegistry typeRegistry =
6563
TypeRegistry.newBuilder().add(Operation.getDescriptor()).build();

‎test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.compute.v1small.stub;
1818

19-
import com.google.api.core.BetaApi;
2019
import com.google.api.core.InternalApi;
2120
import com.google.api.gax.core.BackgroundResource;
2221
import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -54,7 +53,6 @@
5453
* <p>This class is for advanced usage and reflects the underlying API directly.
5554
*/
5655
@Generated("by gapic-generator-java")
57-
@BetaApi
5856
public class HttpJsonRegionOperationsStub extends RegionOperationsStub {
5957
private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
6058

‎test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java

-2
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ public static Builder newBuilder() {
147147
}
148148

149149
/** Returns a new REST builder for this class. */
150-
@BetaApi
151150
public static Builder newHttpJsonBuilder() {
152151
return Builder.createHttpJsonDefault();
153152
}
@@ -189,7 +188,6 @@ private static Builder createDefault() {
189188
return new Builder(IamCredentialsStubSettings.newBuilder());
190189
}
191190

192-
@BetaApi
193191
private static Builder createHttpJsonDefault() {
194192
return new Builder(IamCredentialsStubSettings.newHttpJsonBuilder());
195193
}

‎test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.iam.credentials.v1.stub;
1818

19-
import com.google.api.core.BetaApi;
2019
import com.google.api.core.InternalApi;
2120
import com.google.api.gax.core.BackgroundResource;
2221
import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -53,7 +52,6 @@
5352
* <p>This class is for advanced usage and reflects the underlying API directly.
5453
*/
5554
@Generated("by gapic-generator-java")
56-
@BetaApi
5755
public class HttpJsonIamCredentialsStub extends IamCredentialsStub {
5856
private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
5957

‎test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java

-2
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ public static Builder newBuilder() {
202202
}
203203

204204
/** Returns a new REST builder for this class. */
205-
@BetaApi
206205
public static Builder newHttpJsonBuilder() {
207206
return Builder.createHttpJsonDefault();
208207
}
@@ -244,7 +243,6 @@ private static Builder createDefault() {
244243
return new Builder(LibraryServiceStubSettings.newBuilder());
245244
}
246245

247-
@BetaApi
248246
private static Builder createHttpJsonDefault() {
249247
return new Builder(LibraryServiceStubSettings.newHttpJsonBuilder());
250248
}

‎test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.cloud.example.library.v1.LibraryServiceClient.ListBooksPagedResponse;
2020
import static com.google.cloud.example.library.v1.LibraryServiceClient.ListShelvesPagedResponse;
2121

22-
import com.google.api.core.BetaApi;
2322
import com.google.api.core.InternalApi;
2423
import com.google.api.gax.core.BackgroundResource;
2524
import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -64,7 +63,6 @@
6463
* <p>This class is for advanced usage and reflects the underlying API directly.
6564
*/
6665
@Generated("by gapic-generator-java")
67-
@BetaApi
6866
public class HttpJsonLibraryServiceStub extends LibraryServiceStub {
6967
private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
7068

‎test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java

-2
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ public static Builder newBuilder() {
236236
}
237237

238238
/** Returns a new REST builder for this class. */
239-
@BetaApi
240239
public static Builder newHttpJsonBuilder() {
241240
return Builder.createHttpJsonDefault();
242241
}
@@ -278,7 +277,6 @@ private static Builder createDefault() {
278277
return new Builder(CloudRedisStubSettings.newBuilder());
279278
}
280279

281-
@BetaApi
282280
private static Builder createHttpJsonDefault() {
283281
return new Builder(CloudRedisStubSettings.newHttpJsonBuilder());
284282
}

0 commit comments

Comments
 (0)