From 6bf92d7ceaf8841f77fe960163f5c607f4edc59a Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Thu, 3 Dec 2020 18:25:03 -0800
Subject: [PATCH] chore: migrate language to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 345578804
---
 google/cloud/language/v1/BUILD.bazel              | 11 +++++------
 google/cloud/language/v1/language_gapic.yaml      |  2 --
 google/cloud/language/v1beta2/BUILD.bazel         | 11 +++++------
 google/cloud/language/v1beta2/language_gapic.yaml |  2 --
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/google/cloud/language/v1/BUILD.bazel b/google/cloud/language/v1/BUILD.bazel
index a460119a..34942741 100644
--- a/google/cloud/language/v1/BUILD.bazel
+++ b/google/cloud/language/v1/BUILD.bazel
@@ -40,12 +40,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",
 )
@@ -63,11 +64,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "language_java_gapic",
-    src = ":language_proto_with_info",
-    gapic_yaml = "language_gapic.yaml",
+    srcs = [":language_proto_with_info"],
     grpc_service_config = "language_grpc_service_config.json",
     package = "google.cloud.language.v1",
-    service_yaml = "//google/cloud/language:language_v1.yaml",
     test_deps = [
         ":language_java_grpc",
     ],
diff --git a/google/cloud/language/v1/language_gapic.yaml b/google/cloud/language/v1/language_gapic.yaml
index 633e6ec7..49184213 100644
--- a/google/cloud/language/v1/language_gapic.yaml
+++ b/google/cloud/language/v1/language_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.language.v1
   python:
     package_name: google.cloud.language_v1.gapic
   go:
diff --git a/google/cloud/language/v1beta2/BUILD.bazel b/google/cloud/language/v1beta2/BUILD.bazel
index 39750680..233fbc0b 100644
--- a/google/cloud/language/v1beta2/BUILD.bazel
+++ b/google/cloud/language/v1beta2/BUILD.bazel
@@ -41,12 +41,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",
 )
@@ -64,11 +65,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "language_java_gapic",
-    src = ":language_proto_with_info",
-    gapic_yaml = "language_gapic.yaml",
+    srcs = [":language_proto_with_info"],
     grpc_service_config = "language_grpc_service_config.json",
     package = "google.cloud.language.v1beta2",
-    service_yaml = "language_v1beta2.yaml",
     test_deps = [
         ":language_java_grpc",
     ],
diff --git a/google/cloud/language/v1beta2/language_gapic.yaml b/google/cloud/language/v1beta2/language_gapic.yaml
index fef710ae..a34f3590 100644
--- a/google/cloud/language/v1beta2/language_gapic.yaml
+++ b/google/cloud/language/v1beta2/language_gapic.yaml
@@ -1,8 +1,6 @@
 type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 language_settings:
-  java:
-    package_name: com.google.cloud.language.v1beta2
   python:
     package_name: google.cloud.language_v1beta2.gapic
   go: