From 222f2a571eac5f2a29662f3f310640e75ff6ca20 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Tue, 8 Dec 2020 17:05:47 -0800
Subject: [PATCH] chore: migrate storage to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 346442150
---
 google/storage/v1/BUILD.bazel                   | 17 ++++++++---------
 ...ig.json => storage_grpc_service_config.json} |  0
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename google/storage/v1/{storage_service_config.json => storage_grpc_service_config.json} (100%)

diff --git a/google/storage/v1/BUILD.bazel b/google/storage/v1/BUILD.bazel
index 29a8e214..5485201b 100644
--- a/google/storage/v1/BUILD.bazel
+++ b/google/storage/v1/BUILD.bazel
@@ -37,15 +37,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_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_gapic_assembly_gradle_pkg",
+    "java_gapic_library",
+    "java_gapic_test",
 )
 
 java_proto_library(
@@ -61,10 +60,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "storage_java_gapic",
-    src = ":storage_proto_with_info",
+    srcs = [":storage_proto_with_info"],
+    grpc_service_config = "storage_grpc_service_config.json",
     gapic_yaml = "storage_gapic.yaml",
     package = "google.storage.v1",
-    service_yaml = "storage_v1.yaml",
     test_deps = [
         ":storage_java_grpc",
         "//google/iam/v1:iam_java_grpc",
@@ -119,7 +118,7 @@ go_proto_library(
 go_gapic_library(
     name = "storage_go_gapic",
     srcs = [":storage_proto_with_info"],
-    grpc_service_config = "storage_service_config.json",
+    grpc_service_config = "storage_grpc_service_config.json",
     importpath = "cloud.google.com/go/storage/apiv1;storage",
     service_yaml = "storage_v1.yaml",
     deps = [
@@ -270,7 +269,7 @@ nodejs_gapic_library(
     name = "storage_nodejs_gapic",
     src = ":storage_proto_with_info",
     extra_protoc_parameters = ["metadata"],
-    grpc_service_config = "storage_service_config.json",
+    grpc_service_config = "storage_grpc_service_config.json",
     package = "google.storage.v1",
     service_yaml = "storage_v1.yaml",
     deps = [],
@@ -354,7 +353,7 @@ csharp_grpc_library(
 # csharp_gapic_library(
 #     name = "storage_csharp_gapic",
 #     srcs = [":storage_proto_with_info"],
-#     grpc_service_config = "storage_service_config.json",
+#     grpc_service_config = "storage_grpc_service_config.json",
 #     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
 #     deps = [
 #         ":storage_csharp_grpc",
diff --git a/google/storage/v1/storage_service_config.json b/google/storage/v1/storage_grpc_service_config.json
similarity index 100%
rename from google/storage/v1/storage_service_config.json
rename to google/storage/v1/storage_grpc_service_config.json