Skip to content

Commit 84fb822

Browse files
Google APIscopybara-github
authored andcommitted
feat: Add Java REST transport to analytics, servicecontrol, servicemanagement, serviceusage and langauge APIs
PiperOrigin-RevId: 454254635
1 parent a5f00a7 commit 84fb822

10 files changed

Lines changed: 44 additions & 12 deletions

File tree

google/analytics/admin/v1alpha/BUILD.bazel

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ java_gapic_library(
7474
test_deps = [
7575
":admin_java_grpc",
7676
],
77+
transport = "grpc+rest",
7778
deps = [
7879
":admin_java_proto",
7980
],
@@ -82,13 +83,16 @@ java_gapic_library(
8283
java_gapic_test(
8384
name = "admin_java_gapic_test_suite",
8485
test_classes = [
86+
"com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClientTest",
87+
"com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClientHttpJsonTest",
8588
],
8689
runtime_deps = [":admin_java_gapic_test"],
8790
)
8891

8992
# Open Source Packages
9093
java_gapic_assembly_gradle_pkg(
9194
name = "google-analytics-admin-v1alpha-java",
95+
transport = "grpc+rest",
9296
deps = [
9397
":admin_java_gapic",
9498
":admin_java_grpc",
@@ -244,8 +248,8 @@ nodejs_gapic_assembly_pkg(
244248
##############################################################################
245249
load(
246250
"@com_google_googleapis_imports//:imports.bzl",
247-
"ruby_gapic_assembly_pkg",
248251
"ruby_cloud_gapic_library",
252+
"ruby_gapic_assembly_pkg",
249253
"ruby_grpc_library",
250254
"ruby_proto_library",
251255
)
@@ -263,7 +267,7 @@ ruby_grpc_library(
263267

264268
ruby_cloud_gapic_library(
265269
name = "admin_ruby_gapic",
266-
srcs = [":admin_proto_with_info",],
270+
srcs = [":admin_proto_with_info"],
267271
extra_protoc_parameters = [
268272
"ruby-cloud-gem-name=google-analytics-admin-v1alpha",
269273
"ruby-cloud-env-prefix=ANALYTICS_ADMIN",

google/analytics/data/v1alpha/BUILD.bazel

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ java_gapic_library(
7171
test_deps = [
7272
":data_java_grpc",
7373
],
74+
transport = "grpc+rest",
7475
deps = [
7576
":data_java_proto",
7677
"//google/api:api_java_proto",
@@ -81,13 +82,15 @@ java_gapic_test(
8182
name = "data_java_gapic_test_suite",
8283
test_classes = [
8384
"com.google.analytics.data.v1alpha.AlphaAnalyticsDataClientTest",
85+
"com.google.analytics.data.v1alpha.AlphaAnalyticsDataClientHttpJsonTest",
8486
],
8587
runtime_deps = [":data_java_gapic_test"],
8688
)
8789

8890
# Open Source Packages
8991
java_gapic_assembly_gradle_pkg(
9092
name = "google-cloud-analytics-data-v1alpha-java",
93+
transport = "grpc+rest",
9194
deps = [
9295
":data_java_gapic",
9396
":data_java_grpc",
@@ -122,8 +125,8 @@ go_gapic_library(
122125
srcs = [":data_proto_with_info"],
123126
grpc_service_config = "analytics_data_grpc_service_config.json",
124127
importpath = "google.golang.org/google/analytics/data/v1alpha;data",
125-
service_yaml = "analyticsdata_v1alpha.yaml",
126128
metadata = True,
129+
service_yaml = "analyticsdata_v1alpha.yaml",
127130
deps = [
128131
":data_go_proto",
129132
"@io_bazel_rules_go//proto/wkt:duration_go_proto",
@@ -142,8 +145,8 @@ go_gapic_assembly_pkg(
142145
name = "gapi-cloud-analytics-data-v1alpha-go",
143146
deps = [
144147
":data_go_gapic",
145-
":data_go_gapic_srcjar-test.srcjar",
146148
":data_go_gapic_srcjar-metadata.srcjar",
149+
":data_go_gapic_srcjar-test.srcjar",
147150
":data_go_proto",
148151
],
149152
)
@@ -248,8 +251,8 @@ nodejs_gapic_assembly_pkg(
248251
##############################################################################
249252
load(
250253
"@com_google_googleapis_imports//:imports.bzl",
251-
"ruby_gapic_assembly_pkg",
252254
"ruby_cloud_gapic_library",
255+
"ruby_gapic_assembly_pkg",
253256
"ruby_grpc_library",
254257
"ruby_proto_library",
255258
)

google/analytics/data/v1beta/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ java_gapic_library(
7070
test_deps = [
7171
":data_java_grpc",
7272
],
73+
transport = "grpc+rest",
7374
deps = [
7475
":data_java_proto",
7576
],
@@ -79,13 +80,15 @@ java_gapic_test(
7980
name = "data_java_gapic_test_suite",
8081
test_classes = [
8182
"com.google.analytics.data.v1beta.BetaAnalyticsDataClientTest",
83+
"com.google.analytics.data.v1beta.BetaAnalyticsDataClientHttpJsonTest",
8284
],
8385
runtime_deps = [":data_java_gapic_test"],
8486
)
8587

8688
# Open Source Packages
8789
java_gapic_assembly_gradle_pkg(
8890
name = "google-analytics-data-v1beta-java",
91+
transport = "grpc+rest",
8992
deps = [
9093
":data_java_gapic",
9194
":data_java_grpc",

google/api/servicecontrol/v1/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ java_gapic_library(
8181
test_deps = [
8282
":servicecontrol_java_grpc",
8383
],
84+
transport = "grpc+rest",
8485
deps = [
8586
":servicecontrol_java_proto",
8687
],
@@ -91,13 +92,16 @@ java_gapic_test(
9192
test_classes = [
9293
"com.google.api.servicecontrol.v1.QuotaControllerClientTest",
9394
"com.google.api.servicecontrol.v1.ServiceControllerClientTest",
95+
"com.google.api.servicecontrol.v1.QuotaControllerClientHttpJsonTest",
96+
"com.google.api.servicecontrol.v1.ServiceControllerClientHttpJsonTest",
9497
],
9598
runtime_deps = [":servicecontrol_java_gapic_test"],
9699
)
97100

98101
# Open Source Packages
99102
java_gapic_assembly_gradle_pkg(
100103
name = "google-cloud-api-servicecontrol-v1-java",
104+
transport = "grpc+rest",
101105
deps = [
102106
":servicecontrol_java_gapic",
103107
":servicecontrol_java_grpc",

google/api/servicecontrol/v2/BUILD.bazel

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ proto_library(
2626
deps = [
2727
"//google/api:annotations_proto",
2828
"//google/api:client_proto",
29-
"//google/rpc/context:attribute_context_proto",
3029
"//google/rpc:status_proto",
30+
"//google/rpc/context:attribute_context_proto",
3131
],
3232
)
3333

@@ -71,6 +71,7 @@ java_gapic_library(
7171
test_deps = [
7272
":servicecontrol_java_grpc",
7373
],
74+
transport = "grpc+rest",
7475
deps = [
7576
":servicecontrol_java_proto",
7677
"//google/api:api_java_proto",
@@ -82,13 +83,15 @@ java_gapic_test(
8283
name = "servicecontrol_java_gapic_test_suite",
8384
test_classes = [
8485
"com.google.api.servicecontrol.v2.ServiceControllerClientTest",
86+
"com.google.api.servicecontrol.v2.ServiceControllerClientHttpJsonTest",
8587
],
8688
runtime_deps = [":servicecontrol_java_gapic_test"],
8789
)
8890

8991
# Open Source Packages
9092
java_gapic_assembly_gradle_pkg(
9193
name = "google-cloud-api-servicecontrol-v2-java",
94+
transport = "grpc+rest",
9295
deps = [
9396
":servicecontrol_java_gapic",
9497
":servicecontrol_java_grpc",
@@ -115,8 +118,8 @@ go_proto_library(
115118
protos = [":servicecontrol_proto"],
116119
deps = [
117120
"//google/api:annotations_go_proto",
118-
"//google/rpc/context:attribute_context_go_proto",
119121
"//google/rpc:status_go_proto",
122+
"//google/rpc/context:attribute_context_go_proto",
120123
],
121124
)
122125

@@ -125,8 +128,8 @@ go_gapic_library(
125128
srcs = [":servicecontrol_proto_with_info"],
126129
grpc_service_config = "servicecontrol_grpc_service_config.json",
127130
importpath = "cloud.google.com/go/api/servicecontrol/apiv2;servicecontrol",
128-
service_yaml = "servicecontrol.yaml",
129131
metadata = True,
132+
service_yaml = "servicecontrol.yaml",
130133
deps = [
131134
":servicecontrol_go_proto",
132135
],
@@ -144,8 +147,8 @@ go_gapic_assembly_pkg(
144147
name = "gapi-cloud-api-servicecontrol-v2-go",
145148
deps = [
146149
":servicecontrol_go_gapic",
147-
":servicecontrol_go_gapic_srcjar-test.srcjar",
148150
":servicecontrol_go_gapic_srcjar-metadata.srcjar",
151+
":servicecontrol_go_gapic_srcjar-test.srcjar",
149152
":servicecontrol_go_proto",
150153
],
151154
)
@@ -254,8 +257,8 @@ nodejs_gapic_assembly_pkg(
254257
##############################################################################
255258
load(
256259
"@com_google_googleapis_imports//:imports.bzl",
257-
"ruby_gapic_assembly_pkg",
258260
"ruby_cloud_gapic_library",
261+
"ruby_gapic_assembly_pkg",
259262
"ruby_grpc_library",
260263
"ruby_proto_library",
261264
)

google/api/servicemanagement/v1/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ java_gapic_library(
7676
test_deps = [
7777
":servicemanagement_java_grpc",
7878
],
79+
transport = "grpc+rest",
7980
deps = [
8081
":servicemanagement_java_proto",
8182
"//google/api:api_java_proto",
@@ -86,13 +87,15 @@ java_gapic_test(
8687
name = "servicemanagement_java_gapic_test_suite",
8788
test_classes = [
8889
"com.google.cloud.api.servicemanagement.v1.ServiceManagerClientTest",
90+
"com.google.cloud.api.servicemanagement.v1.ServiceManagerClientHttpJsonTest",
8991
],
9092
runtime_deps = [":servicemanagement_java_gapic_test"],
9193
)
9294

9395
# Open Source Packages
9496
java_gapic_assembly_gradle_pkg(
9597
name = "google-cloud-api-servicemanagement-v1-java",
98+
transport = "grpc+rest",
9699
deps = [
97100
":servicemanagement_java_gapic",
98101
":servicemanagement_java_grpc",

google/api/serviceusage/v1/BUILD.bazel

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ java_gapic_library(
7777
test_deps = [
7878
":serviceusage_java_grpc",
7979
],
80+
transport = "grpc+rest",
8081
deps = [
8182
":serviceusage_java_proto",
8283
],
@@ -86,13 +87,15 @@ java_gapic_test(
8687
name = "serviceusage_java_gapic_test_suite",
8788
test_classes = [
8889
"com.google.api.serviceusage.v1.ServiceUsageClientTest",
90+
"com.google.api.serviceusage.v1.ServiceUsageClientHttpJsonTest",
8991
],
9092
runtime_deps = [":serviceusage_java_gapic_test"],
9193
)
9294

9395
# Open Source Packages
9496
java_gapic_assembly_gradle_pkg(
9597
name = "google-cloud-api-serviceusage-v1-java",
98+
transport = "grpc+rest",
9699
deps = [
97100
":serviceusage_java_gapic",
98101
":serviceusage_java_grpc",
@@ -267,8 +270,8 @@ nodejs_gapic_assembly_pkg(
267270
##############################################################################
268271
load(
269272
"@com_google_googleapis_imports//:imports.bzl",
270-
"ruby_gapic_assembly_pkg",
271273
"ruby_cloud_gapic_library",
274+
"ruby_gapic_assembly_pkg",
272275
"ruby_grpc_library",
273276
"ruby_proto_library",
274277
)
@@ -340,7 +343,7 @@ csharp_gapic_library(
340343
srcs = [":serviceusage_proto_with_info"],
341344
common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
342345
grpc_service_config = "serviceusage_grpc_service_config.json",
343-
# service_yaml = "serviceusage_v1.yaml",
346+
# service_yaml = "serviceusage_v1.yaml",
344347
deps = [
345348
":serviceusage_csharp_grpc",
346349
":serviceusage_csharp_proto",

google/api/serviceusage/v1beta1/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ java_gapic_library(
7979
test_deps = [
8080
":serviceusage_java_grpc",
8181
],
82+
transport = "grpc+rest",
8283
deps = [
8384
":serviceusage_java_proto",
8485
],
@@ -88,13 +89,15 @@ java_gapic_test(
8889
name = "serviceusage_java_gapic_test_suite",
8990
test_classes = [
9091
"com.google.api.serviceusage.v1beta1.ServiceUsageClientTest",
92+
"com.google.api.serviceusage.v1beta1.ServiceUsageClientHttpJsonTest",
9193
],
9294
runtime_deps = [":serviceusage_java_gapic_test"],
9395
)
9496

9597
# Open Source Packages
9698
java_gapic_assembly_gradle_pkg(
9799
name = "google-cloud-api-serviceusage-v1beta1-java",
100+
transport = "grpc+rest",
98101
deps = [
99102
":serviceusage_java_gapic",
100103
":serviceusage_java_grpc",

google/cloud/language/v1/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ java_gapic_library(
6868
test_deps = [
6969
":language_java_grpc",
7070
],
71+
transport = "grpc+rest",
7172
deps = [
7273
":language_java_proto",
7374
],
@@ -77,13 +78,15 @@ java_gapic_test(
7778
name = "language_java_gapic_test_suite",
7879
test_classes = [
7980
"com.google.cloud.language.v1.LanguageServiceClientTest",
81+
"com.google.cloud.language.v1.LanguageServiceClientHttpJsonTest",
8082
],
8183
runtime_deps = [":language_java_gapic_test"],
8284
)
8385

8486
# Open Source Packages
8587
java_gapic_assembly_gradle_pkg(
8688
name = "google-cloud-language-v1-java",
89+
transport = "grpc+rest",
8790
deps = [
8891
":language_java_gapic",
8992
":language_java_grpc",

google/cloud/language/v1beta2/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ java_gapic_library(
6969
test_deps = [
7070
":language_java_grpc",
7171
],
72+
transport = "grpc+rest",
7273
deps = [
7374
":language_java_proto",
7475
],
@@ -78,13 +79,15 @@ java_gapic_test(
7879
name = "language_java_gapic_test_suite",
7980
test_classes = [
8081
"com.google.cloud.language.v1beta2.LanguageServiceClientTest",
82+
"com.google.cloud.language.v1beta2.LanguageServiceClientHttpJsonTest",
8183
],
8284
runtime_deps = [":language_java_gapic_test"],
8385
)
8486

8587
# Open Source Packages
8688
java_gapic_assembly_gradle_pkg(
8789
name = "google-cloud-language-v1beta2-java",
90+
transport = "grpc+rest",
8891
deps = [
8992
":language_java_gapic",
9093
":language_java_grpc",

0 commit comments

Comments
 (0)