bazel: fix dependency chain for java macro

Signed-off-by: Aaron Pham <29749331+aarnphm@users.noreply.github.com>

BUILD.bazel

@@ -16,4 +16,5 @@ proto_library(
         "@com_google_protobuf//:struct_proto",
         "@com_google_protobuf//:wrappers_proto",
     ],
+    visibility = ["//grpc-client:__subpackages__"],
 )

grpc-client/java/BUILD.bazel

@@ -1,25 +1,40 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
 
+# We need to create a separate proto_library
+# to conform with macro java_proto_library rules
+proto_library(
+    name = "service_proto",
+    srcs = ["src/main/proto/v1alpha1/service.proto"],
+    deps = ["@com_google_protobuf//:struct_proto", "@com_google_protobuf//:wrappers_proto"],
+)
+
 java_proto_library(
-    name = "service",
-    deps = ["//:service_v1alpha1_proto"],
+    name = "service_java_proto",
+    deps = [":service_proto"],
 )
 
 java_grpc_library(
-    name = "service_grpc",
-    srcs = ["//:service_v1alpha1_proto"],
-    deps = [":service"],
+    name = "service_java_grpc",
+    srcs = [":service_proto"],
+    deps = [":service_java_proto"],
+)
+
+java_library(
+    name="grpc-library",
+    srcs = glob(["src/main/java/**/*.java"],),
+    deps = [
+        ":service_java_proto",
+        ":service_java_grpc",
+        "@io_grpc_grpc_java//api",
+    ],
 )
 
 java_binary(
     name = "client",
-    srcs = ["src/main/java/com/client/BentoServiceClient.java"],
     main_class = "com.client.BentoServiceClient",
     runtime_deps = [
+        ":grpc-library",
         "@io_grpc_grpc_java//netty",
     ],
-    deps = [
-        ":service_grpc",
-        "@io_grpc_grpc_java//api",
-    ],
 )

grpc-client/kotlin/BUILD.bazel

@@ -1,25 +1,39 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary")
+load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
 load("@com_github_grpc_grpc_kotlin//:kt_jvm_grpc.bzl", "kt_jvm_grpc_library", "kt_jvm_proto_library")
 
+# We need to create a separate proto_library
+# to conform with macro java_proto_library rules
+proto_library(
+    name = "service_proto",
+    srcs = ["src/main/proto/v1alpha1/service.proto"],
+    deps = ["@com_google_protobuf//:struct_proto", "@com_google_protobuf//:wrappers_proto"],
+)
+
+java_proto_library(
+    name = "service_java_proto",
+    deps = [":service_proto"],
+)
+
 kt_jvm_proto_library(
-    name = "service_kt",
-    deps = ["//:service_v1alpha1_proto"],
+    name = "service_kt_proto",
+    deps = [":service_proto"],
 )
 
 kt_jvm_grpc_library(
-    name = "service_grpc",
-    srcs = ["//:service_v1alpha1_proto"],
-    deps = [
-        ":service_kt",
-    ],
+    name = "service_kt_grpc",
+    srcs = [":service_proto"],
+    deps = [ ":service_java_proto" ],
 )
 
 kt_jvm_binary(
     name = "client",
     srcs = ["src/main/kotlin/com/client/BentoServiceClient.kt"],
     main_class = "com.client.BentoServiceClient",
     deps = [
-        ":service_grpc",
+        ":service_kt_proto",
+        ":service_kt_grpc",
         "@com_google_protobuf//:protobuf_java_util",
         "@io_grpc_grpc_java//netty",
     ],