update proto package to grpc.gcp.s2a.

rmehta19 · rmehta19 · commit 2dd1c7e7befd · 2024-04-29T14:25:31.000-07:00
diff --git a/s2a/BUILD.bazel b/s2a/BUILD.bazel
@@ -133,28 +133,28 @@ java_library(
 # bazel only accepts proto import with absolute path.
 genrule(
     name = "protobuf_imports",
-    srcs = glob(["src/main/proto/grpc/gcp/*.proto"]),
+    srcs = glob(["src/main/proto/grpc/gcp/s2a/*.proto"]),
     outs = [
-        "protobuf_out/grpc/gcp/s2a.proto",
-        "protobuf_out/grpc/gcp/s2a_context.proto",
-        "protobuf_out/grpc/gcp/common.proto",
+        "protobuf_out/grpc/gcp/s2a/s2a.proto",
+        "protobuf_out/grpc/gcp/s2a/s2a_context.proto",
+        "protobuf_out/grpc/gcp/s2a/common.proto",
     ],
     cmd = "for fname in $(SRCS); do " +
           "sed 's,import \",import \"s2a/protobuf_out/,g' $$fname > " +
-          "$(@D)/protobuf_out/grpc/gcp/$$(basename $$fname); done",
+          "$(@D)/protobuf_out/grpc/gcp/s2a/$$(basename $$fname); done",
 )
 
 proto_library(
     name = "common_proto",
     srcs = [
-        "protobuf_out/grpc/gcp/common.proto",
+        "protobuf_out/grpc/gcp/s2a/common.proto",
     ],
 )
 
 proto_library(
     name = "s2a_context_proto",
     srcs = [
-        "protobuf_out/grpc/gcp/s2a_context.proto",
+        "protobuf_out/grpc/gcp/s2a/s2a_context.proto",
     ],
     deps = [
         ":common_proto",
@@ -164,7 +164,7 @@ proto_library(
 proto_library(
     name = "s2a_proto",
     srcs = [
-        "protobuf_out/grpc/gcp/s2a.proto",
+        "protobuf_out/grpc/gcp/s2a/s2a.proto",
     ],
     deps = [
         ":common_proto",
diff --git a/s2a/src/generated/main/grpc/io/grpc/s2a/handshaker/S2AServiceGrpc.java b/s2a/src/generated/main/grpc/io/grpc/s2a/handshaker/S2AServiceGrpc.java
@@ -6,13 +6,13 @@
  */
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
-    comments = "Source: grpc/gcp/s2a.proto")
+    comments = "Source: grpc/gcp/s2a/s2a.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class S2AServiceGrpc {
 
   private S2AServiceGrpc() {}
 
-  public static final java.lang.String SERVICE_NAME = "grpc.gcp.S2AService";
+  public static final java.lang.String SERVICE_NAME = "grpc.gcp.s2a.S2AService";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<io.grpc.s2a.handshaker.SessionReq,
diff --git a/s2a/src/main/proto/grpc/gcp/s2a/common.proto b/s2a/src/main/proto/grpc/gcp/s2a/common.proto
@@ -17,7 +17,7 @@
 
 syntax = "proto3";
 
-package grpc.gcp;
+package grpc.gcp.s2a;
 
 option java_multiple_files = true;
 option java_outer_classname = "CommonProto";
diff --git a/s2a/src/main/proto/grpc/gcp/s2a/s2a.proto b/s2a/src/main/proto/grpc/gcp/s2a/s2a.proto
@@ -17,10 +17,10 @@
 
 syntax = "proto3";
 
-package grpc.gcp;
+package grpc.gcp.s2a;
 
-import "grpc/gcp/common.proto";
-import "grpc/gcp/s2a_context.proto";
+import "grpc/gcp/s2a/common.proto";
+import "grpc/gcp/s2a/s2a_context.proto";
 
 option java_multiple_files = true;
 option java_outer_classname = "S2AProto";
diff --git a/s2a/src/main/proto/grpc/gcp/s2a/s2a_context.proto b/s2a/src/main/proto/grpc/gcp/s2a/s2a_context.proto
@@ -17,9 +17,9 @@
 
 syntax = "proto3";
 
-package grpc.gcp;
+package grpc.gcp.s2a;
 
-import "grpc/gcp/common.proto";
+import "grpc/gcp/s2a/common.proto";
 
 option java_multiple_files = true;
 option java_outer_classname = "S2AContextProto";
