From daf7a6ec53d5aa73ba6caa9af40475451f4fa3a6 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Tue, 8 Dec 2020 12:36:43 -0800
Subject: [PATCH] chore: migrate channel to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 346386640
---
 google/cloud/channel/v1/BUILD.bazel             | 11 ++++-------
 google/cloud/channel/v1/cloudchannel_gapic.yaml |  2 --
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/google/cloud/channel/v1/BUILD.bazel b/google/cloud/channel/v1/BUILD.bazel
index 19d71983..f5fcf774 100644
--- a/google/cloud/channel/v1/BUILD.bazel
+++ b/google/cloud/channel/v1/BUILD.bazel
@@ -56,15 +56,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(
@@ -80,11 +79,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "channel_java_gapic",
-    src = ":channel_proto_with_info",
-    gapic_yaml = "cloudchannel_gapic.yaml",
+    srcs = [":channel_proto_with_info"],
     grpc_service_config = "cloudchannel_grpc_service_config.json",
     package = "google.cloud.channel.v1",
-    service_yaml = "cloudchannel_v1.yaml",
     test_deps = [
         ":channel_java_grpc",
     ],
diff --git a/google/cloud/channel/v1/cloudchannel_gapic.yaml b/google/cloud/channel/v1/cloudchannel_gapic.yaml
index 333f45ef..6f1e7367 100644
--- a/google/cloud/channel/v1/cloudchannel_gapic.yaml
+++ b/google/cloud/channel/v1/cloudchannel_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.channel.v1
   python:
     package_name: google.cloud.channel_v1.gapic
   go: