chore: migrate maps/roads onto the {Java,Python} microgenerators

Google APIs · copybara-github · commit 28a44eced3d3 · 2021-02-16T11:47:25.000-08:00
Committer: @miraleung PiperOrigin-RevId: 357770189
diff --git a/google/maps/roads/v1op/BUILD.bazel b/google/maps/roads/v1op/BUILD.bazel
@@ -34,15 +34,14 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
-# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
+    "java_gapic_assembly_gradle_pkg",
+    "java_gapic_library",
+    "java_gapic_test",
     "java_grpc_library",
     "java_proto_library",
-    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy",
-    java_gapic_library = "java_gapic_library_legacy",
-    java_gapic_test = "java_gapic_test_legacy",
 )
 
 java_proto_library(
@@ -58,10 +57,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "roads_java_gapic",
-    src = ":roads_proto_with_info",
+    srcs = [":roads_proto_with_info"],
     gapic_yaml = "roads_gapic.yaml",
-    package = "google.maps.roads.v1op",
-    service_yaml = "roads_v1op.yaml",
+    grpc_service_config = "roads_grpc_service_config.json",
     test_deps = [
         ":roads_java_grpc",
     ],
@@ -70,6 +68,12 @@ java_gapic_library(
     ],
 )
 
+java_gapic_test(
+    name = "roads_java_gapic_test_suite",
+    test_classes = ["com.google.maps.roads.v1op.RoadsServiceClientTest"],
+    runtime_deps = ["roads_java_gapic_test"],
+)
+
 # Open Source Packages
 java_gapic_assembly_gradle_pkg(
     name = "google-maps-roads-v1op-java",
@@ -139,47 +143,24 @@ go_gapic_assembly_pkg(
 
 ##############################################################################
 # Python
-# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "py_grpc_library",
-    "py_proto_library",
-    py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy",
-    py_gapic_library = "py_gapic_library_legacy",
-)
-
-py_proto_library(
-    name = "roads_py_proto",
-    plugin = "@protoc_docs_plugin//:docs_plugin",
-    deps = [":roads_proto"],
-)
-
-py_grpc_library(
-    name = "roads_py_grpc",
-    srcs = [":roads_proto"],
-    deps = [":roads_py_proto"],
+    "py_gapic_assembly_pkg",
+    "py_gapic_library",
 )
 
 py_gapic_library(
     name = "roads_py_gapic",
-    src = ":roads_proto_with_info",
-    gapic_yaml = "roads_gapic.yaml",
-    package = "google.maps.roads.v1op",
-    service_yaml = "roads_v1op.yaml",
-    deps = [
-        ":roads_py_grpc",
-        ":roads_py_proto",
-    ],
+    srcs = [":roads_proto"],
+    grpc_service_config = "roads_grpc_service_config.json",
 )
 
 # Open Source Packages
 py_gapic_assembly_pkg(
     name = "roads-v1op-py",
     deps = [
         ":roads_py_gapic",
-        ":roads_py_grpc",
-        ":roads_py_proto",
     ],
 )
 
diff --git a/google/maps/roads/v1op/roads.proto b/google/maps/roads/v1op/roads.proto
@@ -33,12 +33,16 @@ service RoadsService {
   // This method takes a sequence of latitude,longitude points and snaps them to
   // the most likely road segments. Optionally returns additional points giving
   // the full road geometry. Also returns a place ID for each snapped point.
-  rpc SnapToRoads(SnapToRoadsRequest) returns (SnapToRoadsResponse) {}
+  rpc SnapToRoads(SnapToRoadsRequest) returns (SnapToRoadsResponse) {
+    option (google.api.method_signature) = "path";
+  }
 
   // This method takes a list of latitude,longitude points and snaps them each
   // to their nearest road. Also returns a place ID for each snapped point.
   rpc ListNearestRoads(ListNearestRoadsRequest)
-      returns (ListNearestRoadsResponse) {}
+      returns (ListNearestRoadsResponse) {
+    option (google.api.method_signature) = "points";
+  }
 }
 
 // A request to the SnapToRoads method, requesting that a sequence of points be
diff --git a/google/maps/roads/v1op/roads_gapic.yaml b/google/maps/roads/v1op/roads_gapic.yaml
@@ -1,8 +1,6 @@
 type: com.google.api.codegen.ConfigProto
-config_schema_version: 1.0.0
+config_schema_version: 2.0.0
 language_settings:
-  java:
-    package_name: com.google.maps.roads.v1op
   python:
     package_name: google.maps.roads.v1op.gapic
   go:
@@ -16,35 +14,3 @@ language_settings:
   nodejs:
     package_name: roads.v1op
     domain_layer_location: googlemaps  # becomes @googlemaps/roads
-interfaces:
-- name: google.maps.roads.v1op.RoadsService
-  collections: []
-  retry_codes_def:
-  - name: idempotent
-    retry_codes:
-    - UNAVAILABLE
-    - DEADLINE_EXCEEDED
-  - name: non_idempotent
-    retry_codes: []
-  retry_params_def:
-  - name: default
-    initial_retry_delay_millis: 100
-    retry_delay_multiplier: 1.3
-    max_retry_delay_millis: 60000
-    initial_rpc_timeout_millis: 60000
-    rpc_timeout_multiplier: 1
-    max_rpc_timeout_millis: 60000
-    total_timeout_millis: 600000
-  methods:
-  - name: SnapToRoads
-    required_fields:
-    - path
-    retry_codes_name: idempotent
-    retry_params_name: default
-    timeout_millis: 60000
-  - name: ListNearestRoads
-    required_fields:
-    - points
-    retry_codes_name: idempotent
-    retry_params_name: default
-    timeout_millis: 60000
