From 0cf640e77a06b545c6d4f0cd0f62cc9c5e6c69a5 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Tue, 1 Dec 2020 11:03:18 -0800
Subject: [PATCH] chore: migrate automl to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 345057013
---
 google/cloud/automl/v1/BUILD.bazel            | 11 +++++------
 google/cloud/automl/v1/automl_gapic.yaml      |  2 --
 google/cloud/automl/v1beta1/BUILD.bazel       | 11 +++++------
 google/cloud/automl/v1beta1/automl_gapic.yaml |  2 --
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/google/cloud/automl/v1/BUILD.bazel b/google/cloud/automl/v1/BUILD.bazel
index 23a6213d..f9d15a9b 100644
--- a/google/cloud/automl/v1/BUILD.bazel
+++ b/google/cloud/automl/v1/BUILD.bazel
@@ -58,12 +58,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",
 )
@@ -81,11 +82,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "automl_java_gapic",
-    src = ":automl_proto_with_info",
-    gapic_yaml = "automl_gapic.yaml",
+    srcs = [":automl_proto_with_info"],
     grpc_service_config = "automl_grpc_service_config.json",
     package = "google.cloud.automl.v1",
-    service_yaml = "automl_v1.yaml",
     test_deps = [
         ":automl_java_grpc",
     ],
diff --git a/google/cloud/automl/v1/automl_gapic.yaml b/google/cloud/automl/v1/automl_gapic.yaml
index 4a7683b4..78ec01fa 100644
--- a/google/cloud/automl/v1/automl_gapic.yaml
+++ b/google/cloud/automl/v1/automl_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.automl.v1
   python:
     package_name: google.cloud.automl_v1.gapic
   go:
diff --git a/google/cloud/automl/v1beta1/BUILD.bazel b/google/cloud/automl/v1beta1/BUILD.bazel
index 794f2afa..20633b33 100644
--- a/google/cloud/automl/v1beta1/BUILD.bazel
+++ b/google/cloud/automl/v1beta1/BUILD.bazel
@@ -67,12 +67,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",
 )
@@ -90,11 +91,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "automl_java_gapic",
-    src = ":automl_proto_with_info",
-    gapic_yaml = "automl_gapic.yaml",
+    srcs = [":automl_proto_with_info"],
     grpc_service_config = "automl_grpc_service_config.json",
     package = "google.cloud.automl.v1beta1",
-    service_yaml = "automl_v1beta1.yaml",
     test_deps = [
         ":automl_java_grpc",
     ],
diff --git a/google/cloud/automl/v1beta1/automl_gapic.yaml b/google/cloud/automl/v1beta1/automl_gapic.yaml
index bebc0b3b..7e40f9da 100644
--- a/google/cloud/automl/v1beta1/automl_gapic.yaml
+++ b/google/cloud/automl/v1beta1/automl_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.automl.v1beta1
   python:
     package_name: google.cloud.automl_v1beta1.gapic
   go: