From fa1a1755bb7d1d211261906886d9608359ba23d9 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Mon, 7 Dec 2020 10:20:09 -0800
Subject: [PATCH] chore: migrate redis to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 346121774
---
 google/cloud/redis/v1/BUILD.bazel           | 10 +++++-----
 google/cloud/redis/v1/redis_gapic.yaml      |  2 --
 google/cloud/redis/v1beta1/BUILD.bazel      | 10 +++++-----
 google/cloud/redis/v1beta1/redis_gapic.yaml |  2 --
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/google/cloud/redis/v1/BUILD.bazel b/google/cloud/redis/v1/BUILD.bazel
index 27ce2923..03b372b4 100644
--- a/google/cloud/redis/v1/BUILD.bazel
+++ b/google/cloud/redis/v1/BUILD.bazel
@@ -35,12 +35,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",
 )
@@ -58,11 +59,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "redis_java_gapic",
-    src = ":redis_proto_with_info",
+    srcs = [":redis_proto_with_info"],
     gapic_yaml = "redis_gapic.yaml",
     grpc_service_config = "redis_grpc_service_config.json",
     package = "google.cloud.redis.v1",
-    service_yaml = "redis_v1.yaml",
     test_deps = [
         ":redis_java_grpc",
     ],
diff --git a/google/cloud/redis/v1/redis_gapic.yaml b/google/cloud/redis/v1/redis_gapic.yaml
index 19840eb7..d7e52d4c 100644
--- a/google/cloud/redis/v1/redis_gapic.yaml
+++ b/google/cloud/redis/v1/redis_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.redis.v1
   python:
     package_name: google.cloud.redis_v1.gapic
   go:
diff --git a/google/cloud/redis/v1beta1/BUILD.bazel b/google/cloud/redis/v1beta1/BUILD.bazel
index e0868bda..3b663c7f 100644
--- a/google/cloud/redis/v1beta1/BUILD.bazel
+++ b/google/cloud/redis/v1beta1/BUILD.bazel
@@ -35,12 +35,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",
 )
@@ -58,11 +59,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "redis_java_gapic",
-    src = ":redis_proto_with_info",
+    srcs = [":redis_proto_with_info"],
     gapic_yaml = "redis_gapic.yaml",
     grpc_service_config = "redis_grpc_service_config.json",
     package = "google.cloud.redis.v1beta1",
-    service_yaml = "redis_v1beta1.yaml",
     test_deps = [
         ":redis_java_grpc",
     ],
diff --git a/google/cloud/redis/v1beta1/redis_gapic.yaml b/google/cloud/redis/v1beta1/redis_gapic.yaml
index fddfed25..1e4c8009 100644
--- a/google/cloud/redis/v1beta1/redis_gapic.yaml
+++ b/google/cloud/redis/v1beta1/redis_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.redis.v1beta1
   python:
     package_name: google.cloud.redis_v1beta1.gapic
   go: