Skip to content

Commit 8ca872c

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
chore: migrate StreetView to the {Java,Python} microgenerators
Committer: @miraleung PiperOrigin-RevId: 357863594
1 parent c465e2f commit 8ca872c

6 files changed

Lines changed: 110 additions & 197 deletions

File tree

‎google/streetview/publish/streetview_publish_gapic.yaml‎

Lines changed: 0 additions & 140 deletions
This file was deleted.

‎google/streetview/publish/v1/BUILD.bazel‎

Lines changed: 18 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ proto_library_with_info(
3737

3838
##############################################################################
3939
# Java
40-
# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen
4140
##############################################################################
4241
load(
4342
"@com_google_googleapis_imports//:imports.bzl",
43+
"java_gapic_assembly_gradle_pkg",
44+
"java_gapic_library",
45+
"java_gapic_test",
4446
"java_grpc_library",
4547
"java_proto_library",
46-
java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy",
47-
java_gapic_library = "java_gapic_library_legacy",
48-
java_gapic_test = "java_gapic_test_legacy",
4948
)
5049

5150
java_proto_library(
@@ -61,10 +60,8 @@ java_grpc_library(
6160

6261
java_gapic_library(
6362
name = "publish_java_gapic",
64-
src = ":publish_proto_with_info",
65-
gapic_yaml = "//google/streetview/publish:streetview_publish_gapic.yaml",
66-
package = "google.streetview.publish.v1",
67-
service_yaml = "//google/streetview/publish:streetview_publish.yaml",
63+
srcs = [":publish_proto_with_info"],
64+
grpc_service_config = "streetview_publish_grpc_service_config.json",
6865
test_deps = [
6966
":publish_java_grpc",
7067
],
@@ -76,7 +73,7 @@ java_gapic_library(
7673
java_gapic_test(
7774
name = "publish_java_gapic_test_suite",
7875
test_classes = [
79-
"com.google.streetview.publish.v1.StreetViewPublishServiceClientTest",
76+
"com.google.geo.ugc.streetview.publish.v1.StreetViewPublishServiceClientTest",
8077
],
8178
runtime_deps = [":publish_java_gapic_test"],
8279
)
@@ -118,9 +115,9 @@ go_proto_library(
118115
go_gapic_library(
119116
name = "publish_go_gapic",
120117
srcs = [":publish_proto_with_info"],
121-
gapic_yaml = "//google/streetview/publish:streetview_publish_gapic.yaml",
118+
gapic_yaml = "streetview_publish_gapic.yaml",
122119
importpath = "google.golang.org/api/streetviewpublish/apiv1;streetviewpublish",
123-
service_yaml = "//google/streetview/publish:streetview_publish.yaml",
120+
service_yaml = "streetview_publish.yaml",
124121
deps = [
125122
":publish_go_proto",
126123
],
@@ -145,62 +142,27 @@ go_gapic_assembly_pkg(
145142

146143
##############################################################################
147144
# Python
148-
# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen
149145
##############################################################################
150146
load(
151147
"@com_google_googleapis_imports//:imports.bzl",
152148
"moved_proto_library",
149+
"py_gapic_assembly_pkg",
150+
"py_gapic_library",
153151
"py_grpc_library",
154152
"py_proto_library",
155-
py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy",
156-
py_gapic_library = "py_gapic_library_legacy",
157-
)
158-
159-
moved_proto_library(
160-
name = "publish_moved_proto",
161-
srcs = [":publish_proto"],
162-
deps = [
163-
"//google/api:annotations_proto",
164-
"//google/api:client_proto",
165-
"//google/rpc:status_proto",
166-
"//google/type:latlng_proto",
167-
"@com_google_protobuf//:empty_proto",
168-
"@com_google_protobuf//:field_mask_proto",
169-
"@com_google_protobuf//:timestamp_proto",
170-
],
171-
)
172-
173-
py_proto_library(
174-
name = "publish_py_proto",
175-
plugin = "@protoc_docs_plugin//:docs_plugin",
176-
deps = [":publish_moved_proto"],
177-
)
178-
179-
py_grpc_library(
180-
name = "publish_py_grpc",
181-
srcs = [":publish_moved_proto"],
182-
deps = [":publish_py_proto"],
183153
)
184154

185155
py_gapic_library(
186156
name = "publish_py_gapic",
187-
src = ":publish_proto_with_info",
188-
gapic_yaml = "//google/streetview/publish:streetview_publish_gapic.yaml",
189-
package = "google.streetview.publish.v1",
190-
service_yaml = "//google/streetview/publish:streetview_publish.yaml",
191-
deps = [
192-
":publish_py_grpc",
193-
":publish_py_proto",
194-
],
157+
srcs = [":publish_proto"],
158+
grpc_service_config = "streetview_publish_grpc_service_config.json",
195159
)
196160

197161
# Open Source Packages
198162
py_gapic_assembly_pkg(
199163
name = "streetview-publish-v1-py",
200164
deps = [
201165
":publish_py_gapic",
202-
":publish_py_grpc",
203-
":publish_py_proto",
204166
],
205167
)
206168

@@ -229,9 +191,9 @@ php_grpc_library(
229191
php_gapic_library(
230192
name = "publish_php_gapic",
231193
src = ":publish_proto_with_info",
232-
gapic_yaml = "//google/streetview/publish:streetview_publish_gapic.yaml",
194+
gapic_yaml = "streetview_publish_gapic.yaml",
233195
package = "google.streetview.publish.v1",
234-
service_yaml = "//google/streetview/publish:streetview_publish.yaml",
196+
service_yaml = "streetview_publish.yaml",
235197
deps = [
236198
":publish_php_grpc",
237199
":publish_php_proto",
@@ -261,9 +223,9 @@ nodejs_gapic_library(
261223
name = "publish_nodejs_gapic",
262224
src = ":publish_proto_with_info",
263225
extra_protoc_parameters = ["metadata"],
264-
gapic_yaml = "//google/streetview/publish:streetview_publish_gapic.yaml",
226+
gapic_yaml = "streetview_publish_gapic.yaml",
265227
package = "google.streetview.publish.v1",
266-
service_yaml = "//google/streetview/publish:streetview_publish.yaml",
228+
service_yaml = "streetview_publish.yaml",
267229
deps = [],
268230
)
269231

@@ -300,9 +262,9 @@ ruby_grpc_library(
300262
ruby_gapic_library(
301263
name = "publish_ruby_gapic",
302264
src = ":publish_proto_with_info",
303-
gapic_yaml = "//google/streetview/publish:streetview_publish_gapic.yaml",
265+
gapic_yaml = "streetview_publish_gapic.yaml",
304266
package = "google.streetview.publish.v1",
305-
service_yaml = "//google/streetview/publish:streetview_publish.yaml",
267+
service_yaml = "streetview_publish.yaml",
306268
deps = [
307269
":publish_ruby_grpc",
308270
":publish_ruby_proto",

‎google/streetview/publish/v1/streetview_publish.proto‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ option java_package = "com.google.geo.ugc.streetview.publish.v1";
3131
// Publishes and connects user-contributed photos on Street View.
3232
service StreetViewPublishService {
3333
option (google.api.default_host) = "streetviewpublish.googleapis.com";
34-
option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/streetviewpublish";
34+
option (google.api.oauth_scopes) =
35+
"https://www.googleapis.com/auth/streetviewpublish";
3536

3637
// Creates an upload session to start uploading photo bytes. The method uses
3738
// the upload URL of the returned
@@ -85,6 +86,7 @@ service StreetViewPublishService {
8586
post: "/v1/photo"
8687
body: "photo"
8788
};
89+
option (google.api.method_signature) = "photo";
8890
}
8991

9092
// Gets the metadata of the specified
@@ -104,6 +106,7 @@ service StreetViewPublishService {
104106
option (google.api.http) = {
105107
get: "/v1/photo/{photo_id}"
106108
};
109+
option (google.api.method_signature) = "photo_id,view";
107110
}
108111

109112
// Gets the metadata of the specified
@@ -126,6 +129,7 @@ service StreetViewPublishService {
126129
option (google.api.http) = {
127130
get: "/v1/photos:batchGet"
128131
};
132+
option (google.api.method_signature) = "photo_ids,view";
129133
}
130134

131135
// Lists all the [Photos][google.streetview.publish.v1.Photo] that belong to
@@ -137,6 +141,7 @@ service StreetViewPublishService {
137141
option (google.api.http) = {
138142
get: "/v1/photos"
139143
};
144+
option (google.api.method_signature) = "view,filter";
140145
}
141146

142147
// Updates the metadata of a [Photo][google.streetview.publish.v1.Photo], such
@@ -164,6 +169,7 @@ service StreetViewPublishService {
164169
put: "/v1/photo/{photo.photo_id.id}"
165170
body: "photo"
166171
};
172+
option (google.api.method_signature) = "photo,update_mask";
167173
}
168174

169175
// Updates the metadata of [Photos][google.streetview.publish.v1.Photo], such
@@ -205,6 +211,7 @@ service StreetViewPublishService {
205211
post: "/v1/photos:batchUpdate"
206212
body: "*"
207213
};
214+
option (google.api.method_signature) = "update_photo_requests";
208215
}
209216

210217
// Deletes a [Photo][google.streetview.publish.v1.Photo] and its metadata.
@@ -219,6 +226,7 @@ service StreetViewPublishService {
219226
option (google.api.http) = {
220227
delete: "/v1/photo/{photo_id}"
221228
};
229+
option (google.api.method_signature) = "photo_id";
222230
}
223231

224232
// Deletes a list of [Photos][google.streetview.publish.v1.Photo] and their
@@ -243,5 +251,6 @@ service StreetViewPublishService {
243251
post: "/v1/photos:batchDelete"
244252
body: "*"
245253
};
254+
option (google.api.method_signature) = "photo_ids";
246255
}
247256
}

google/streetview/publish/streetview_publish.yaml renamed to google/streetview/publish/v1/streetview_publish.yaml

File renamed without changes.

‎google/streetview/publish/v1/streetview_publish_gapic.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
type: com.google.api.codegen.ConfigProto
2+
config_schema_version: 2.0.0
3+
language_settings:
4+
java:
5+
package_name: com.google.streetview.publish.v1
6+
python:
7+
package_name: google.streetview.publish_v1.gapic
8+
go:
9+
# Seems to match other formats, e.g.
10+
# https://github.com/google/google-api-go-client/blob/master/examples/youtube.go
11+
package_name: google.golang.org/api/streetviewpublish/v1
12+
csharp:
13+
package_name: Google.Streetview.Publish.V1
14+
ruby:
15+
package_name: Google::Streetview::Publish::V1
16+
php:
17+
package_name: Google\Streetview\Publish\V1
18+
nodejs:
19+
package_name: google.streetview.publish.v1

0 commit comments

Comments
 (0)