Skip to content

Commit

Permalink
use int32
Browse files Browse the repository at this point in the history
  • Loading branch information
timohuovinen committed Mar 23, 2023
1 parent 8e4a448 commit 9a7ac51
Show file tree
Hide file tree
Showing 26 changed files with 527 additions and 430 deletions.
91 changes: 49 additions & 42 deletions examples/bookstore/bookstore.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@ message Book {
string title = 3;
}

message ListBooksResponse {
repeated Book books = 1;
}
message ListBooksResponse { repeated Book books = 1; }

message ListShelvesResponse {
repeated Shelf shelves = 1;
}
message ListShelvesResponse { repeated Shelf shelves = 1; }

message Shelf {
string name = 1;
Expand All @@ -36,75 +32,86 @@ message Error {
string message = 2;
}

message CreateShelfRequest {
Shelf shelf = 1;
}
message CreateShelfRequest { Shelf shelf = 1; }

message GetShelfRequest {
int64 shelf = 1;
}
message GetShelfRequest { int32 shelf = 1; }

message DeleteShelfRequest {
int64 shelf = 1;
}
message DeleteShelfRequest { int32 shelf = 1; }

message ListBooksRequest {
int64 shelf = 1;
}
message ListBooksRequest { int32 shelf = 1; }

message CreateBookRequest {
int64 shelf = 1;
int32 shelf = 1;

Book book = 2;
}

message GetBookRequest {
int64 shelf = 1;
int32 shelf = 1;

int64 book = 2;
int32 book = 2;
}

message DeleteBookRequest {
int64 shelf = 1;
int32 shelf = 1;

int64 book = 2;
int32 book = 2;
}

service Bookstore {
rpc ListShelves ( google.protobuf.Empty ) returns ( ListShelvesResponse ) {
option (google.api.http) = { get:"/shelves" };
rpc ListShelves(google.protobuf.Empty) returns (ListShelvesResponse) {
option (google.api.http) = {
get : "/shelves"
};
}

rpc CreateShelf ( CreateShelfRequest ) returns ( Shelf ) {
option (google.api.http) = { post:"/shelves" body:"shelf" };
rpc CreateShelf(CreateShelfRequest) returns (Shelf) {
option (google.api.http) = {
post : "/shelves"
body : "shelf"
};
}

rpc DeleteShelves ( google.protobuf.Empty ) returns ( google.protobuf.Empty ) {
option (google.api.http) = { delete:"/shelves" };
rpc DeleteShelves(google.protobuf.Empty) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete : "/shelves"
};
}

rpc GetShelf ( GetShelfRequest ) returns ( Shelf ) {
option (google.api.http) = { get:"/shelves/{shelf}" };
rpc GetShelf(GetShelfRequest) returns (Shelf) {
option (google.api.http) = {
get : "/shelves/{shelf}"
};
}

rpc DeleteShelf ( DeleteShelfRequest ) returns ( google.protobuf.Empty ) {
option (google.api.http) = { delete:"/shelves/{shelf}" };
rpc DeleteShelf(DeleteShelfRequest) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete : "/shelves/{shelf}"
};
}

rpc ListBooks ( ListBooksRequest ) returns ( ListBooksResponse ) {
option (google.api.http) = { get:"/shelves/{shelf}/books" };
rpc ListBooks(ListBooksRequest) returns (ListBooksResponse) {
option (google.api.http) = {
get : "/shelves/{shelf}/books"
};
}

rpc CreateBook ( CreateBookRequest ) returns ( Book ) {
option (google.api.http) = { post:"/shelves/{shelf}/books" body:"book" };
rpc CreateBook(CreateBookRequest) returns (Book) {
option (google.api.http) = {
post : "/shelves/{shelf}/books"
body : "book"
};
}

rpc GetBook ( GetBookRequest ) returns ( Book ) {
option (google.api.http) = { get:"/shelves/{shelf}/books/{book}" };
rpc GetBook(GetBookRequest) returns (Book) {
option (google.api.http) = {
get : "/shelves/{shelf}/books/{book}"
};
}

rpc DeleteBook ( DeleteBookRequest ) returns ( google.protobuf.Empty ) {
option (google.api.http) = { delete:"/shelves/{shelf}/books/{book}" };
rpc DeleteBook(DeleteBookRequest) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete : "/shelves/{shelf}/books/{book}"
};
}
}

16 changes: 8 additions & 8 deletions examples/bookstore/bookstore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ paths:
required: true
schema:
type: integer
format: int64
format: int32
responses:
'200':
description: A shelf resource.
Expand All @@ -77,7 +77,7 @@ paths:
required: true
schema:
type: integer
format: int64
format: int32
responses:
default:
description: An empty response body.
Expand All @@ -92,7 +92,7 @@ paths:
required: true
schema:
type: integer
format: int64
format: int32
responses:
'200':
description: List of books on the specified shelf.
Expand All @@ -116,7 +116,7 @@ paths:
required: true
schema:
type: integer
format: int64
format: int32
responses:
'200':
description: A newly created book resource.
Expand Down Expand Up @@ -148,14 +148,14 @@ paths:
required: true
schema:
type: integer
format: int64
format: int32
- description: ID of the book to get from the shelf.
in: path
name: book
required: true
schema:
type: integer
format: int64
format: int32
responses:
'200':
description: A book resource.
Expand All @@ -179,14 +179,14 @@ paths:
required: true
schema:
type: integer
format: int64
format: int32
- description: ID of the book to delete from the shelf.
in: path
name: book
required: true
schema:
type: integer
format: int64
format: int32
responses:
default:
description: An empty response body.
Expand Down
91 changes: 49 additions & 42 deletions examples/end-to-end-grpc-gateway/bookstore.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@ message Book {
string title = 3;
}

message ListBooksResponse {
repeated Book books = 1;
}
message ListBooksResponse { repeated Book books = 1; }

message ListShelvesResponse {
repeated Shelf shelves = 1;
}
message ListShelvesResponse { repeated Shelf shelves = 1; }

message Shelf {
string name = 1;
Expand All @@ -36,75 +32,86 @@ message Error {
string message = 2;
}

message CreateShelfParameters {
Shelf shelf = 1;
}
message CreateShelfParameters { Shelf shelf = 1; }

message GetShelfParameters {
int64 shelf = 1;
}
message GetShelfParameters { int32 shelf = 1; }

message DeleteShelfParameters {
int64 shelf = 1;
}
message DeleteShelfParameters { int32 shelf = 1; }

message ListBooksParameters {
int64 shelf = 1;
}
message ListBooksParameters { int32 shelf = 1; }

message CreateBookParameters {
int64 shelf = 1;
int32 shelf = 1;

Book book = 2;
}

message GetBookParameters {
int64 shelf = 1;
int32 shelf = 1;

int64 book = 2;
int32 book = 2;
}

message DeleteBookParameters {
int64 shelf = 1;
int32 shelf = 1;

int64 book = 2;
int32 book = 2;
}

service Bookstore {
rpc ListShelves ( google.protobuf.Empty ) returns ( ListShelvesResponse ) {
option (google.api.http) = { get:"/shelves" };
rpc ListShelves(google.protobuf.Empty) returns (ListShelvesResponse) {
option (google.api.http) = {
get : "/shelves"
};
}

rpc CreateShelf ( CreateShelfParameters ) returns ( Shelf ) {
option (google.api.http) = { post:"/shelves" body:"shelf" };
rpc CreateShelf(CreateShelfParameters) returns (Shelf) {
option (google.api.http) = {
post : "/shelves"
body : "shelf"
};
}

rpc DeleteShelves ( google.protobuf.Empty ) returns ( google.protobuf.Empty ) {
option (google.api.http) = { delete:"/shelves" };
rpc DeleteShelves(google.protobuf.Empty) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete : "/shelves"
};
}

rpc GetShelf ( GetShelfParameters ) returns ( Shelf ) {
option (google.api.http) = { get:"/shelves/{shelf}" };
rpc GetShelf(GetShelfParameters) returns (Shelf) {
option (google.api.http) = {
get : "/shelves/{shelf}"
};
}

rpc DeleteShelf ( DeleteShelfParameters ) returns ( google.protobuf.Empty ) {
option (google.api.http) = { delete:"/shelves/{shelf}" };
rpc DeleteShelf(DeleteShelfParameters) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete : "/shelves/{shelf}"
};
}

rpc ListBooks ( ListBooksParameters ) returns ( ListBooksResponse ) {
option (google.api.http) = { get:"/shelves/{shelf}/books" };
rpc ListBooks(ListBooksParameters) returns (ListBooksResponse) {
option (google.api.http) = {
get : "/shelves/{shelf}/books"
};
}

rpc CreateBook ( CreateBookParameters ) returns ( Book ) {
option (google.api.http) = { post:"/shelves/{shelf}/books" body:"book" };
rpc CreateBook(CreateBookParameters) returns (Book) {
option (google.api.http) = {
post : "/shelves/{shelf}/books"
body : "book"
};
}

rpc GetBook ( GetBookParameters ) returns ( Book ) {
option (google.api.http) = { get:"/shelves/{shelf}/books/{book}" };
rpc GetBook(GetBookParameters) returns (Book) {
option (google.api.http) = {
get : "/shelves/{shelf}/books/{book}"
};
}

rpc DeleteBook ( DeleteBookParameters ) returns ( google.protobuf.Empty ) {
option (google.api.http) = { delete:"/shelves/{shelf}/books/{book}" };
rpc DeleteBook(DeleteBookParameters) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete : "/shelves/{shelf}/books/{book}"
};
}
}

Loading

0 comments on commit 9a7ac51

Please sign in to comment.