Skip to content

Commit a0dfae4

Browse files
committed
Align user proto schema with generated bindings
1 parent 89960d4 commit a0dfae4

File tree

4 files changed

+38
-27
lines changed

4 files changed

+38
-27
lines changed

t/grpc_server_example/main.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,24 +241,22 @@ func (s *server) GetUserInfo(ctx context.Context, in *pb.UserRequest) (*pb.UserR
241241
Items: []string{"Senior member", "Exclusive service"},
242242
Message: "You are an experienced user!",
243243
Job: &pb.Job{
244-
Items: "Intern engineer",
244+
Items: []string{"Intern engineer"},
245245
},
246246
}, nil
247247
case 1:
248248
return &pb.UserResponse{
249249
Gender: pb.UserGender_GENDER_FEMALE,
250250
Message: "Welcome new users!",
251251
Job: &pb.Job{
252-
Items: "junior engineer",
252+
Items: []string{"junior engineer"},
253253
},
254254
}, nil
255255
case 2:
256256
return &pb.UserResponse{
257257
Gender: pb.UserGender_GENDER_UNSPECIFIED,
258258
Message: "You are an experienced user!",
259-
Job: &pb.Job{
260-
Items: "senior engineer",
261-
},
259+
Job: &pb.Job{},
262260
}, nil
263261
default:
264262
return &pb.UserResponse{

t/grpc_server_example/proto/user.pb.go

Lines changed: 26 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

t/grpc_server_example/proto/user.proto

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ service UserService {
2424
rpc GetUserInfo (UserRequest) returns (UserResponse) {}
2525
}
2626

27-
enum Gender {
27+
enum UserGender {
2828
GENDER_UNSPECIFIED = 0;
2929
GENDER_MALE = 1;
3030
GENDER_FEMALE = 2;
3131
}
3232

3333
message Job {
34-
string items = 1;
34+
repeated string items = 1;
3535
}
3636

3737
message UserRequest {
@@ -40,7 +40,7 @@ message UserRequest {
4040
}
4141

4242
message UserResponse {
43-
Gender gender = 1;
43+
UserGender gender = 1;
4444
repeated string items = 2;
4545
string message = 3;
4646
Job job = 4;

t/plugin/grpc-transcode4.t

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ __DATA__
5050
rpc GetUserInfo(UserRequest) returns (UserResponse) {}
5151
}
5252
53-
enum Gender {
53+
enum UserGender {
5454
GENDER_UNSPECIFIED = 0;
5555
GENDER_MALE = 1;
5656
GENDER_FEMALE = 2;
5757
}
5858
message Job {
59-
string items = 1;
59+
repeated string items = 1;
6060
}
6161
message UserRequest {
6262
string name = 1;
6363
int32 age = 2;
6464
}
6565
6666
message UserResponse {
67-
Gender gender = 1;
67+
UserGender gender = 1;
6868
repeated string items = 2;
6969
string message = 3;
7070
Job job = 4;
@@ -118,7 +118,7 @@ POST /grpctest
118118
--- more_headers
119119
Content-Type: application/json
120120
--- response_body_json
121-
{"gender":"GENDER_MALE","message":"You are an experienced user!","items":["Senior member","Exclusive service"],"job":{"items":"Intern engineer"}}
121+
{"gender":"GENDER_MALE","message":"You are an experienced user!","items":["Senior member","Exclusive service"],"job":{"items":["Intern engineer"]}}
122122
123123
124124
@@ -129,7 +129,7 @@ POST /grpctest
129129
--- more_headers
130130
Content-Type: application/json
131131
--- response_body_json
132-
{"gender":"GENDER_FEMALE","message":"Welcome new users!","job":{"items":"junior engineer"},"items":[]}
132+
{"gender":"GENDER_FEMALE","message":"Welcome new users!","job":{"items":["junior engineer"]},"items":[]}
133133
134134
135135
@@ -140,7 +140,7 @@ POST /grpctest
140140
--- more_headers
141141
Content-Type: application/json
142142
--- response_body_json
143-
{"items":[],"message":"You are an experienced user!","job":{"items":"senior engineer"},"gender":"GENDER_UNSPECIFIED"}
143+
{"items":[],"message":"You are an experienced user!","job":{"items":[]},"gender":"GENDER_UNSPECIFIED"}
144144
145145
146146

0 commit comments

Comments
 (0)