From c1f786e9273efd6a0fc90e05e44cc6fea8af490b Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Tue, 1 Dec 2020 12:53:04 -0800
Subject: [PATCH] chore: migrate managedidentities to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 345080570
---
 google/cloud/managedidentities/v1/BUILD.bazel      | 11 +++++------
 .../v1/managedidentities_gapic.yaml                |  2 --
 google/cloud/managedidentities/v1beta1/BUILD.bazel | 14 +++++++-------
 .../v1beta1/managedidentities_gapic.yaml           |  2 --
 .../managedidentities_grpc_service_config.json     | 12 ++++++++++++
 5 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 google/cloud/managedidentities/v1beta1/managedidentities_grpc_service_config.json

diff --git a/google/cloud/managedidentities/v1/BUILD.bazel b/google/cloud/managedidentities/v1/BUILD.bazel
index 693cd2aa..c329ee26 100644
--- a/google/cloud/managedidentities/v1/BUILD.bazel
+++ b/google/cloud/managedidentities/v1/BUILD.bazel
@@ -36,12 +36,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -59,11 +60,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "managedidentities_java_gapic",
-    src = ":managedidentities_proto_with_info",
-    gapic_yaml = "managedidentities_gapic.yaml",
+    srcs = [":managedidentities_proto_with_info"],
     grpc_service_config = "managedidentities_grpc_service_config.json",
     package = "google.cloud.managedidentities.v1",
-    service_yaml = "managedidentities_v1.yaml",
     test_deps = [
         ":managedidentities_java_grpc",
     ],
diff --git a/google/cloud/managedidentities/v1/managedidentities_gapic.yaml b/google/cloud/managedidentities/v1/managedidentities_gapic.yaml
index 307c02c5..07763531 100644
--- a/google/cloud/managedidentities/v1/managedidentities_gapic.yaml
+++ b/google/cloud/managedidentities/v1/managedidentities_gapic.yaml
@@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 # The settings of generated code in a specific language.
 language_settings:
-  java:
-    package_name: com.google.cloud.managedidentities.v1
   python:
     package_name: google.cloud.managedidentities_v1.gapic
   go:
diff --git a/google/cloud/managedidentities/v1beta1/BUILD.bazel b/google/cloud/managedidentities/v1beta1/BUILD.bazel
index a785f699..2ed495e9 100644
--- a/google/cloud/managedidentities/v1beta1/BUILD.bazel
+++ b/google/cloud/managedidentities/v1beta1/BUILD.bazel
@@ -35,14 +35,15 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 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_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
 )
 
 java_proto_library(
@@ -58,10 +59,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "managedidentities_java_gapic",
-    src = ":managedidentities_proto_with_info",
-    gapic_yaml = "managedidentities_gapic.yaml",
+    srcs = [":managedidentities_proto_with_info"],
+    grpc_service_config = "managedidentities_grpc_service_config.json",
     package = "google.cloud.managedidentities.v1beta1",
-    service_yaml = "managedidentities_v1beta1.yaml",
     test_deps = [
         ":managedidentities_java_grpc",
     ],
@@ -119,9 +119,9 @@ go_gapic_library(
     service_yaml = "managedidentities_v1beta1.yaml",
     deps = [
         ":managedidentities_go_proto",
-        "@com_google_cloud_go//longrunning/autogen:go_default_library",
         "//google/longrunning:longrunning_go_proto",
         "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
     ],
 )
 
diff --git a/google/cloud/managedidentities/v1beta1/managedidentities_gapic.yaml b/google/cloud/managedidentities/v1beta1/managedidentities_gapic.yaml
index 7134da6f..c1007a27 100644
--- a/google/cloud/managedidentities/v1beta1/managedidentities_gapic.yaml
+++ b/google/cloud/managedidentities/v1beta1/managedidentities_gapic.yaml
@@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 # The settings of generated code in a specific language.
 language_settings:
-  java:
-    package_name: com.google.cloud.managedidentities.v1beta1
   python:
     package_name: google.cloud.managedidentities_v1beta1.gapic
   go:
diff --git a/google/cloud/managedidentities/v1beta1/managedidentities_grpc_service_config.json b/google/cloud/managedidentities/v1beta1/managedidentities_grpc_service_config.json
new file mode 100644
index 00000000..29110c10
--- /dev/null
+++ b/google/cloud/managedidentities/v1beta1/managedidentities_grpc_service_config.json
@@ -0,0 +1,12 @@
+{
+  "methodConfig": [
+    {
+      "name": [
+        {
+          "service": "google.cloud.managedidentities.v1.ManagedIdentitiesService"
+        }
+      ],
+      "timeout": "60s"
+    }
+  ]
+}