Fix grpc user proto enum name collision

Fix grpc user proto enum name collision

Author: bytelazy

t/grpc_server_example/main.go

@@ -237,32 +237,32 @@ func (s *server) GetUserInfo(ctx context.Context, in *pb.UserRequest) (*pb.UserR
 	switch in.GetAge() {
 	case 0:
 		return &pb.UserResponse{
-			Gender:  pb.Gender_GENDER_MALE,
+
+			Gender:  pb.UserGender_GENDER_MALE,
 			Items:   []string{"Senior member", "Exclusive service"},
 			Message: "You are an experienced user!",
 			Job: &pb.Job{
-				Items: "Intern engineer",
+				Items: []string{"Intern engineer"},
 			},
 		}, nil
 	case 1:
 		return &pb.UserResponse{
-			Gender:  pb.Gender_GENDER_FEMALE,
+
+			Gender:  pb.UserGender_GENDER_FEMALE,
 			Message: "Welcome new users!",
 			Job: &pb.Job{
-				Items: "junior engineer",
+				Items: []string{"junior engineer"},
 			},
 		}, nil
 	case 2:
 		return &pb.UserResponse{
-			Gender:  pb.Gender_GENDER_UNSPECIFIED,
+			Gender:  pb.UserGender_GENDER_UNSPECIFIED,
 			Message: "You are an experienced user!",
-			Job: &pb.Job{
-				Items: "senior engineer",
-			},
+			Job:     &pb.Job{},
 		}, nil
 	default:
 		return &pb.UserResponse{
-			Gender: pb.Gender_GENDER_UNSPECIFIED,
+			Gender: pb.UserGender_GENDER_UNSPECIFIED,
 		}, nil
 	}
 }

t/grpc_server_example/proto/user.pb.go

@@ -24,14 +24,14 @@ service UserService {
   rpc GetUserInfo (UserRequest) returns (UserResponse) {}
 }
 
-enum Gender {
+enum UserGender {
   GENDER_UNSPECIFIED = 0;
   GENDER_MALE = 1;
   GENDER_FEMALE = 2;
 }
 
 message Job {
-  string items = 1;
+  repeated string items = 1;
 }
 
 message UserRequest {
@@ -40,7 +40,7 @@ message UserRequest {
 }
 
 message UserResponse {
-  Gender gender = 1;
+  UserGender gender = 1;
   repeated string items = 2;
   string message = 3;
   Job job = 4;

t/grpc_server_example/proto/user.proto

@@ -50,21 +50,21 @@ __DATA__
                         rpc GetUserInfo(UserRequest) returns (UserResponse) {}
                      }
 
-                    enum Gender {
+                    enum UserGender {
                         GENDER_UNSPECIFIED = 0;
                         GENDER_MALE = 1;
                         GENDER_FEMALE = 2;
                     }
                     message Job {
-                        string items = 1;
+                        repeated string items = 1;
                     }
                     message UserRequest {
                         string name = 1;
                         int32 age = 2;
                     }
 
                     message UserResponse {
-                        Gender gender = 1;
+                        UserGender gender = 1;
                         repeated string items = 2;
                         string message = 3;
                         Job job = 4;
@@ -118,7 +118,7 @@ POST /grpctest
 --- more_headers
 Content-Type: application/json
 --- response_body_json
-{"gender":"GENDER_MALE","message":"You are an experienced user!","items":["Senior member","Exclusive service"],"job":{"items":"Intern engineer"}}
+{"gender":"GENDER_MALE","message":"You are an experienced user!","items":["Senior member","Exclusive service"],"job":{"items":["Intern engineer"]}}
 
 
 
@@ -129,7 +129,7 @@ POST /grpctest
 --- more_headers
 Content-Type: application/json
 --- response_body_json
-{"gender":"GENDER_FEMALE","message":"Welcome new users!","job":{"items":"junior engineer"},"items":[]}
+{"gender":"GENDER_FEMALE","message":"Welcome new users!","job":{"items":["junior engineer"]},"items":[]}
 
 
 
@@ -140,7 +140,7 @@ POST /grpctest
 --- more_headers
 Content-Type: application/json
 --- response_body_json
-{"items":[],"message":"You are an experienced user!","job":{"items":"senior engineer"},"gender":"GENDER_UNSPECIFIED"}
+{"items":[],"message":"You are an experienced user!","job":{"items":[]},"gender":"GENDER_UNSPECIFIED"}