diff --git a/examples/bookstore/bookstore.proto b/examples/bookstore/bookstore.proto
index cde7f66..bed6d32 100644
--- a/examples/bookstore/bookstore.proto
+++ b/examples/bookstore/bookstore.proto
@@ -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;
@@ -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}"
+    };
   }
 }
-
diff --git a/examples/bookstore/bookstore.yaml b/examples/bookstore/bookstore.yaml
index d808955..345f9b7 100644
--- a/examples/bookstore/bookstore.yaml
+++ b/examples/bookstore/bookstore.yaml
@@ -53,7 +53,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: A shelf resource.
@@ -77,7 +77,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         default:
           description: An empty response body.
@@ -92,7 +92,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: List of books on the specified shelf.
@@ -116,7 +116,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: A newly created book resource.
@@ -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.
@@ -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.
diff --git a/examples/end-to-end-grpc-gateway/bookstore.proto b/examples/end-to-end-grpc-gateway/bookstore.proto
index 398d644..9fac134 100644
--- a/examples/end-to-end-grpc-gateway/bookstore.proto
+++ b/examples/end-to-end-grpc-gateway/bookstore.proto
@@ -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;
@@ -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}"
+    };
   }
 }
-
diff --git a/examples/end-to-end-grpc-gateway/bookstore.yaml b/examples/end-to-end-grpc-gateway/bookstore.yaml
index d808955..345f9b7 100644
--- a/examples/end-to-end-grpc-gateway/bookstore.yaml
+++ b/examples/end-to-end-grpc-gateway/bookstore.yaml
@@ -53,7 +53,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: A shelf resource.
@@ -77,7 +77,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         default:
           description: An empty response body.
@@ -92,7 +92,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: List of books on the specified shelf.
@@ -116,7 +116,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: A newly created book resource.
@@ -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.
@@ -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.
diff --git a/examples/end-to-end-grpc-gateway/bookstore/bookstore.pb.go b/examples/end-to-end-grpc-gateway/bookstore/bookstore.pb.go
index 78c86b8..01b4c59 100644
--- a/examples/end-to-end-grpc-gateway/bookstore/bookstore.pb.go
+++ b/examples/end-to-end-grpc-gateway/bookstore/bookstore.pb.go
@@ -294,7 +294,7 @@ func (m *CreateShelfParameters) GetShelf() *Shelf {
 }
 
 type GetShelfParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -325,7 +325,7 @@ func (m *GetShelfParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GetShelfParameters proto.InternalMessageInfo
 
-func (m *GetShelfParameters) GetShelf() int64 {
+func (m *GetShelfParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
@@ -333,7 +333,7 @@ func (m *GetShelfParameters) GetShelf() int64 {
 }
 
 type DeleteShelfParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -364,7 +364,7 @@ func (m *DeleteShelfParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_DeleteShelfParameters proto.InternalMessageInfo
 
-func (m *DeleteShelfParameters) GetShelf() int64 {
+func (m *DeleteShelfParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
@@ -372,7 +372,7 @@ func (m *DeleteShelfParameters) GetShelf() int64 {
 }
 
 type ListBooksParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -403,7 +403,7 @@ func (m *ListBooksParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ListBooksParameters proto.InternalMessageInfo
 
-func (m *ListBooksParameters) GetShelf() int64 {
+func (m *ListBooksParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
@@ -411,7 +411,7 @@ func (m *ListBooksParameters) GetShelf() int64 {
 }
 
 type CreateBookParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	Book                 *Book    `protobuf:"bytes,2,opt,name=book,proto3" json:"book,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -443,7 +443,7 @@ func (m *CreateBookParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_CreateBookParameters proto.InternalMessageInfo
 
-func (m *CreateBookParameters) GetShelf() int64 {
+func (m *CreateBookParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
@@ -458,8 +458,8 @@ func (m *CreateBookParameters) GetBook() *Book {
 }
 
 type GetBookParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
-	Book                 int64    `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Book                 int32    `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -490,14 +490,14 @@ func (m *GetBookParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GetBookParameters proto.InternalMessageInfo
 
-func (m *GetBookParameters) GetShelf() int64 {
+func (m *GetBookParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
 	return 0
 }
 
-func (m *GetBookParameters) GetBook() int64 {
+func (m *GetBookParameters) GetBook() int32 {
 	if m != nil {
 		return m.Book
 	}
@@ -505,8 +505,8 @@ func (m *GetBookParameters) GetBook() int64 {
 }
 
 type DeleteBookParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
-	Book                 int64    `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Book                 int32    `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -537,14 +537,14 @@ func (m *DeleteBookParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_DeleteBookParameters proto.InternalMessageInfo
 
-func (m *DeleteBookParameters) GetShelf() int64 {
+func (m *DeleteBookParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
 	return 0
 }
 
-func (m *DeleteBookParameters) GetBook() int64 {
+func (m *DeleteBookParameters) GetBook() int32 {
 	if m != nil {
 		return m.Book
 	}
diff --git a/examples/end-to-end-grpc-gateway/bookstore/bookstore.pb.gw.go b/examples/end-to-end-grpc-gateway/bookstore/bookstore.pb.gw.go
index 0c439ee..6f3346d 100644
--- a/examples/end-to-end-grpc-gateway/bookstore/bookstore.pb.gw.go
+++ b/examples/end-to-end-grpc-gateway/bookstore/bookstore.pb.gw.go
@@ -80,7 +80,7 @@ func request_Bookstore_GetShelf_0(ctx context.Context, marshaler runtime.Marshal
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "shelf")
 	}
 
-	protoReq.Shelf, err = runtime.Int64(val)
+	protoReq.Shelf, err = runtime.Int32(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "shelf", err)
@@ -107,7 +107,7 @@ func request_Bookstore_DeleteShelf_0(ctx context.Context, marshaler runtime.Mars
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "shelf")
 	}
 
-	protoReq.Shelf, err = runtime.Int64(val)
+	protoReq.Shelf, err = runtime.Int32(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "shelf", err)
@@ -134,7 +134,7 @@ func request_Bookstore_ListBooks_0(ctx context.Context, marshaler runtime.Marsha
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "shelf")
 	}
 
-	protoReq.Shelf, err = runtime.Int64(val)
+	protoReq.Shelf, err = runtime.Int32(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "shelf", err)
@@ -169,7 +169,7 @@ func request_Bookstore_CreateBook_0(ctx context.Context, marshaler runtime.Marsh
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "shelf")
 	}
 
-	protoReq.Shelf, err = runtime.Int64(val)
+	protoReq.Shelf, err = runtime.Int32(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "shelf", err)
@@ -196,7 +196,7 @@ func request_Bookstore_GetBook_0(ctx context.Context, marshaler runtime.Marshale
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "shelf")
 	}
 
-	protoReq.Shelf, err = runtime.Int64(val)
+	protoReq.Shelf, err = runtime.Int32(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "shelf", err)
@@ -207,7 +207,7 @@ func request_Bookstore_GetBook_0(ctx context.Context, marshaler runtime.Marshale
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "book")
 	}
 
-	protoReq.Book, err = runtime.Int64(val)
+	protoReq.Book, err = runtime.Int32(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "book", err)
@@ -234,7 +234,7 @@ func request_Bookstore_DeleteBook_0(ctx context.Context, marshaler runtime.Marsh
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "shelf")
 	}
 
-	protoReq.Shelf, err = runtime.Int64(val)
+	protoReq.Shelf, err = runtime.Int32(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "shelf", err)
@@ -245,7 +245,7 @@ func request_Bookstore_DeleteBook_0(ctx context.Context, marshaler runtime.Marsh
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "book")
 	}
 
-	protoReq.Book, err = runtime.Int64(val)
+	protoReq.Book, err = runtime.Int32(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "book", err)
diff --git a/examples/end-to-end-grpc-gateway/bookstore/server.go b/examples/end-to-end-grpc-gateway/bookstore/server.go
index 3cb8ef3..a7a4f1d 100644
--- a/examples/end-to-end-grpc-gateway/bookstore/server.go
+++ b/examples/end-to-end-grpc-gateway/bookstore/server.go
@@ -18,11 +18,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/golang/protobuf/ptypes/empty"
 	"log"
 	"net"
 	"sync"
 
+	"github.com/golang/protobuf/ptypes/empty"
+
 	"google.golang.org/grpc"
 )
 
@@ -38,10 +39,10 @@ const (
 type server struct {
 	// shelves are stored in a map keyed by shelf id
 	// books are stored in a two level map, keyed first by shelf id and then by book id
-	Shelves     map[int64]*Shelf
-	Books       map[int64]map[int64]*Book
-	LastShelfID int64      // the id of the last shelf that was added
-	LastBookID  int64      // the id of the last book that was added
+	Shelves     map[int32]*Shelf
+	Books       map[int32]map[int32]*Book
+	LastShelfID int32      // the id of the last shelf that was added
+	LastBookID  int32      // the id of the last book that was added
 	Mutex       sync.Mutex // global mutex to synchronize service access
 }
 
@@ -76,8 +77,8 @@ func (s *server) DeleteShelves(context.Context, *empty.Empty) (*empty.Empty, err
 	s.Mutex.Lock()
 	defer s.Mutex.Unlock()
 	// delete everything by reinitializing the Shelves and Books maps.
-	s.Shelves = make(map[int64]*Shelf)
-	s.Books = make(map[int64]map[int64]*Book)
+	s.Shelves = make(map[int32]*Shelf)
+	s.Books = make(map[int32]map[int32]*Book)
 	s.LastShelfID = 0
 	s.LastBookID = 0
 	return nil, nil
@@ -136,7 +137,7 @@ func (s *server) CreateBook(ctx context.Context, parameters *CreateBookParameter
 	bid := s.LastBookID
 	book := parameters.Book
 	if s.Books[parameters.Shelf] == nil {
-		s.Books[parameters.Shelf] = make(map[int64]*Book)
+		s.Books[parameters.Shelf] = make(map[int32]*Book)
 	}
 	s.Books[parameters.Shelf][bid] = book
 
@@ -164,7 +165,7 @@ func (s *server) DeleteBook(ctx context.Context, parameters *DeleteBookParameter
 }
 
 // internal helpers
-func (s *server) getShelf(sid int64) (shelf *Shelf, err error) {
+func (s *server) getShelf(sid int32) (shelf *Shelf, err error) {
 	shelf, ok := s.Shelves[sid]
 	if !ok {
 		return nil, errors.New(fmt.Sprintf("Couldn't find shelf %d", sid))
@@ -173,7 +174,7 @@ func (s *server) getShelf(sid int64) (shelf *Shelf, err error) {
 	}
 }
 
-func (s *server) getBook(sid int64, bid int64) (book *Book, err error) {
+func (s *server) getBook(sid int32, bid int32) (book *Book, err error) {
 	_, err = s.getShelf(sid)
 	if err != nil {
 		return nil, err
@@ -194,8 +195,8 @@ func RunServer() {
 	s := grpc.NewServer()
 	fmt.Printf("\nServer listening on port %v \n", port)
 	RegisterBookstoreServer(s, &server{
-		Shelves: map[int64]*Shelf{},
-		Books:   map[int64]map[int64]*Book{},
+		Shelves: map[int32]*Shelf{},
+		Books:   map[int32]map[int32]*Book{},
 	})
 	if err := s.Serve(lis); err != nil {
 		log.Fatalf("failed to serve: %v", err)
diff --git a/examples/end-to-end-grpc-gateway/third-party/googleapis/google/api/http.proto b/examples/end-to-end-grpc-gateway/third-party/googleapis/google/api/http.proto
index 2bd3a19..b88c8b8 100644
--- a/examples/end-to-end-grpc-gateway/third-party/googleapis/google/api/http.proto
+++ b/examples/end-to-end-grpc-gateway/third-party/googleapis/google/api/http.proto
@@ -23,7 +23,6 @@ option java_outer_classname = "HttpProto";
 option java_package = "com.google.api";
 option objc_class_prefix = "GAPI";
 
-
 // Defines the HTTP configuration for an API service. It contains a list of
 // [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
 // to one or more HTTP REST API methods.
@@ -57,7 +56,8 @@ message Http {
 //
 //     service Messaging {
 //       rpc GetMessage(GetMessageRequest) returns (Message) {
-//         option (google.api.http).get = "/v1/messages/{message_id}/{sub.subfield}";
+//         option (google.api.http).get =
+//         "/v1/messages/{message_id}/{sub.subfield}";
 //       }
 //     }
 //     message GetMessageRequest {
@@ -84,7 +84,8 @@ message Http {
 //
 // HTTP | RPC
 // -----|-----
-// `GET /v1/messages/123456/foo`  | `GetMessage(message_id: "123456" sub: SubMessage(subfield: "foo"))`
+// `GET /v1/messages/123456/foo`  | `GetMessage(message_id: "123456" sub:
+// SubMessage(subfield: "foo"))`
 //
 // In general, not only fields but also field paths can be referenced
 // from a path pattern. Fields mapped to the path pattern cannot be
@@ -105,7 +106,7 @@ message Http {
 //         string subfield = 1;
 //       }
 //       string message_id = 1; // mapped to the URL
-//       int64 revision = 2;    // becomes a parameter
+//       int32 revision = 2;    // becomes a parameter
 //       SubMessage sub = 3;    // `sub.subfield` becomes a parameter
 //     }
 //
@@ -114,7 +115,9 @@ message Http {
 //
 // HTTP | RPC
 // -----|-----
-// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: "foo"))`
+// `GET /v1/messages/123456?revision=2&sub.subfield=foo` |
+// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield:
+// "foo"))`
 //
 // Note that fields which are mapped to HTTP parameters must have a
 // primitive type or a repeated primitive type. Message types are not
@@ -146,7 +149,8 @@ message Http {
 //
 // HTTP | RPC
 // -----|-----
-// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })`
+// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
+// "123456" message { text: "Hi!" })`
 //
 // The special name `*` can be used in the body mapping to define that
 // every field not bound by the path template should be mapped to the
@@ -171,7 +175,8 @@ message Http {
 //
 // HTTP | RPC
 // -----|-----
-// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")`
+// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
+// "123456" text: "Hi!")`
 //
 // Note that when using `*` in the body mapping, it is not possible to
 // have HTTP parameters, as all fields not bound by the path end in
@@ -204,7 +209,8 @@ message Http {
 // HTTP | RPC
 // -----|-----
 // `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
-// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")`
+// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id:
+// "123456")`
 //
 // # Rules for HTTP mapping
 //
@@ -262,7 +268,8 @@ message Http {
 message HttpRule {
   // Selects methods to which this rule applies.
   //
-  // Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
+  // Refer to [selector][google.api.DocumentationRule.selector] for syntax
+  // details.
   string selector = 1;
 
   // Determines the URL pattern is matched by this rules. This pattern can be
diff --git a/examples/end-to-end/bookstore.proto b/examples/end-to-end/bookstore.proto
index 398d644..9fac134 100644
--- a/examples/end-to-end/bookstore.proto
+++ b/examples/end-to-end/bookstore.proto
@@ -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;
@@ -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}"
+    };
   }
 }
-
diff --git a/examples/end-to-end/bookstore.yaml b/examples/end-to-end/bookstore.yaml
index d808955..345f9b7 100644
--- a/examples/end-to-end/bookstore.yaml
+++ b/examples/end-to-end/bookstore.yaml
@@ -53,7 +53,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: A shelf resource.
@@ -77,7 +77,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         default:
           description: An empty response body.
@@ -92,7 +92,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: List of books on the specified shelf.
@@ -116,7 +116,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: A newly created book resource.
@@ -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.
@@ -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.
diff --git a/examples/end-to-end/bookstore/bookstore.pb.go b/examples/end-to-end/bookstore/bookstore.pb.go
index 78c86b8..01b4c59 100644
--- a/examples/end-to-end/bookstore/bookstore.pb.go
+++ b/examples/end-to-end/bookstore/bookstore.pb.go
@@ -294,7 +294,7 @@ func (m *CreateShelfParameters) GetShelf() *Shelf {
 }
 
 type GetShelfParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -325,7 +325,7 @@ func (m *GetShelfParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GetShelfParameters proto.InternalMessageInfo
 
-func (m *GetShelfParameters) GetShelf() int64 {
+func (m *GetShelfParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
@@ -333,7 +333,7 @@ func (m *GetShelfParameters) GetShelf() int64 {
 }
 
 type DeleteShelfParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -364,7 +364,7 @@ func (m *DeleteShelfParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_DeleteShelfParameters proto.InternalMessageInfo
 
-func (m *DeleteShelfParameters) GetShelf() int64 {
+func (m *DeleteShelfParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
@@ -372,7 +372,7 @@ func (m *DeleteShelfParameters) GetShelf() int64 {
 }
 
 type ListBooksParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -403,7 +403,7 @@ func (m *ListBooksParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ListBooksParameters proto.InternalMessageInfo
 
-func (m *ListBooksParameters) GetShelf() int64 {
+func (m *ListBooksParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
@@ -411,7 +411,7 @@ func (m *ListBooksParameters) GetShelf() int64 {
 }
 
 type CreateBookParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
 	Book                 *Book    `protobuf:"bytes,2,opt,name=book,proto3" json:"book,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -443,7 +443,7 @@ func (m *CreateBookParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_CreateBookParameters proto.InternalMessageInfo
 
-func (m *CreateBookParameters) GetShelf() int64 {
+func (m *CreateBookParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
@@ -458,8 +458,8 @@ func (m *CreateBookParameters) GetBook() *Book {
 }
 
 type GetBookParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
-	Book                 int64    `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Book                 int32    `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -490,14 +490,14 @@ func (m *GetBookParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GetBookParameters proto.InternalMessageInfo
 
-func (m *GetBookParameters) GetShelf() int64 {
+func (m *GetBookParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
 	return 0
 }
 
-func (m *GetBookParameters) GetBook() int64 {
+func (m *GetBookParameters) GetBook() int32 {
 	if m != nil {
 		return m.Book
 	}
@@ -505,8 +505,8 @@ func (m *GetBookParameters) GetBook() int64 {
 }
 
 type DeleteBookParameters struct {
-	Shelf                int64    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
-	Book                 int64    `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
+	Shelf                int32    `protobuf:"varint,1,opt,name=shelf,proto3" json:"shelf,omitempty"`
+	Book                 int32    `protobuf:"varint,2,opt,name=book,proto3" json:"book,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -537,14 +537,14 @@ func (m *DeleteBookParameters) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_DeleteBookParameters proto.InternalMessageInfo
 
-func (m *DeleteBookParameters) GetShelf() int64 {
+func (m *DeleteBookParameters) GetShelf() int32 {
 	if m != nil {
 		return m.Shelf
 	}
 	return 0
 }
 
-func (m *DeleteBookParameters) GetBook() int64 {
+func (m *DeleteBookParameters) GetBook() int32 {
 	if m != nil {
 		return m.Book
 	}
diff --git a/examples/end-to-end/bookstore/server.go b/examples/end-to-end/bookstore/server.go
index 3cb8ef3..a7a4f1d 100644
--- a/examples/end-to-end/bookstore/server.go
+++ b/examples/end-to-end/bookstore/server.go
@@ -18,11 +18,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/golang/protobuf/ptypes/empty"
 	"log"
 	"net"
 	"sync"
 
+	"github.com/golang/protobuf/ptypes/empty"
+
 	"google.golang.org/grpc"
 )
 
@@ -38,10 +39,10 @@ const (
 type server struct {
 	// shelves are stored in a map keyed by shelf id
 	// books are stored in a two level map, keyed first by shelf id and then by book id
-	Shelves     map[int64]*Shelf
-	Books       map[int64]map[int64]*Book
-	LastShelfID int64      // the id of the last shelf that was added
-	LastBookID  int64      // the id of the last book that was added
+	Shelves     map[int32]*Shelf
+	Books       map[int32]map[int32]*Book
+	LastShelfID int32      // the id of the last shelf that was added
+	LastBookID  int32      // the id of the last book that was added
 	Mutex       sync.Mutex // global mutex to synchronize service access
 }
 
@@ -76,8 +77,8 @@ func (s *server) DeleteShelves(context.Context, *empty.Empty) (*empty.Empty, err
 	s.Mutex.Lock()
 	defer s.Mutex.Unlock()
 	// delete everything by reinitializing the Shelves and Books maps.
-	s.Shelves = make(map[int64]*Shelf)
-	s.Books = make(map[int64]map[int64]*Book)
+	s.Shelves = make(map[int32]*Shelf)
+	s.Books = make(map[int32]map[int32]*Book)
 	s.LastShelfID = 0
 	s.LastBookID = 0
 	return nil, nil
@@ -136,7 +137,7 @@ func (s *server) CreateBook(ctx context.Context, parameters *CreateBookParameter
 	bid := s.LastBookID
 	book := parameters.Book
 	if s.Books[parameters.Shelf] == nil {
-		s.Books[parameters.Shelf] = make(map[int64]*Book)
+		s.Books[parameters.Shelf] = make(map[int32]*Book)
 	}
 	s.Books[parameters.Shelf][bid] = book
 
@@ -164,7 +165,7 @@ func (s *server) DeleteBook(ctx context.Context, parameters *DeleteBookParameter
 }
 
 // internal helpers
-func (s *server) getShelf(sid int64) (shelf *Shelf, err error) {
+func (s *server) getShelf(sid int32) (shelf *Shelf, err error) {
 	shelf, ok := s.Shelves[sid]
 	if !ok {
 		return nil, errors.New(fmt.Sprintf("Couldn't find shelf %d", sid))
@@ -173,7 +174,7 @@ func (s *server) getShelf(sid int64) (shelf *Shelf, err error) {
 	}
 }
 
-func (s *server) getBook(sid int64, bid int64) (book *Book, err error) {
+func (s *server) getBook(sid int32, bid int32) (book *Book, err error) {
 	_, err = s.getShelf(sid)
 	if err != nil {
 		return nil, err
@@ -194,8 +195,8 @@ func RunServer() {
 	s := grpc.NewServer()
 	fmt.Printf("\nServer listening on port %v \n", port)
 	RegisterBookstoreServer(s, &server{
-		Shelves: map[int64]*Shelf{},
-		Books:   map[int64]map[int64]*Book{},
+		Shelves: map[int32]*Shelf{},
+		Books:   map[int32]map[int32]*Book{},
 	})
 	if err := s.Serve(lis); err != nil {
 		log.Fatalf("failed to serve: %v", err)
diff --git a/examples/end-to-end/third-party/googleapis/google/api/http.proto b/examples/end-to-end/third-party/googleapis/google/api/http.proto
index 2bd3a19..b88c8b8 100644
--- a/examples/end-to-end/third-party/googleapis/google/api/http.proto
+++ b/examples/end-to-end/third-party/googleapis/google/api/http.proto
@@ -23,7 +23,6 @@ option java_outer_classname = "HttpProto";
 option java_package = "com.google.api";
 option objc_class_prefix = "GAPI";
 
-
 // Defines the HTTP configuration for an API service. It contains a list of
 // [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
 // to one or more HTTP REST API methods.
@@ -57,7 +56,8 @@ message Http {
 //
 //     service Messaging {
 //       rpc GetMessage(GetMessageRequest) returns (Message) {
-//         option (google.api.http).get = "/v1/messages/{message_id}/{sub.subfield}";
+//         option (google.api.http).get =
+//         "/v1/messages/{message_id}/{sub.subfield}";
 //       }
 //     }
 //     message GetMessageRequest {
@@ -84,7 +84,8 @@ message Http {
 //
 // HTTP | RPC
 // -----|-----
-// `GET /v1/messages/123456/foo`  | `GetMessage(message_id: "123456" sub: SubMessage(subfield: "foo"))`
+// `GET /v1/messages/123456/foo`  | `GetMessage(message_id: "123456" sub:
+// SubMessage(subfield: "foo"))`
 //
 // In general, not only fields but also field paths can be referenced
 // from a path pattern. Fields mapped to the path pattern cannot be
@@ -105,7 +106,7 @@ message Http {
 //         string subfield = 1;
 //       }
 //       string message_id = 1; // mapped to the URL
-//       int64 revision = 2;    // becomes a parameter
+//       int32 revision = 2;    // becomes a parameter
 //       SubMessage sub = 3;    // `sub.subfield` becomes a parameter
 //     }
 //
@@ -114,7 +115,9 @@ message Http {
 //
 // HTTP | RPC
 // -----|-----
-// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: "foo"))`
+// `GET /v1/messages/123456?revision=2&sub.subfield=foo` |
+// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield:
+// "foo"))`
 //
 // Note that fields which are mapped to HTTP parameters must have a
 // primitive type or a repeated primitive type. Message types are not
@@ -146,7 +149,8 @@ message Http {
 //
 // HTTP | RPC
 // -----|-----
-// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })`
+// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
+// "123456" message { text: "Hi!" })`
 //
 // The special name `*` can be used in the body mapping to define that
 // every field not bound by the path template should be mapped to the
@@ -171,7 +175,8 @@ message Http {
 //
 // HTTP | RPC
 // -----|-----
-// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")`
+// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
+// "123456" text: "Hi!")`
 //
 // Note that when using `*` in the body mapping, it is not possible to
 // have HTTP parameters, as all fields not bound by the path end in
@@ -204,7 +209,8 @@ message Http {
 // HTTP | RPC
 // -----|-----
 // `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
-// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")`
+// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id:
+// "123456")`
 //
 // # Rules for HTTP mapping
 //
@@ -262,7 +268,8 @@ message Http {
 message HttpRule {
   // Selects methods to which this rule applies.
   //
-  // Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
+  // Refer to [selector][google.api.DocumentationRule.selector] for syntax
+  // details.
   string selector = 1;
 
   // Determines the URL pattern is matched by this rules. This pattern can be
diff --git a/examples/petstore/petstore.proto b/examples/petstore/petstore.proto
index f2eafca..8f6894c 100644
--- a/examples/petstore/petstore.proto
+++ b/examples/petstore/petstore.proto
@@ -9,9 +9,9 @@ import "google/protobuf/descriptor.proto";
 import "google/protobuf/empty.proto";
 
 message Order {
-  int64 id = 1;
+  int32 id = 1;
 
-  int64 pet_id = 2;
+  int32 pet_id = 2;
 
   int32 quantity = 3;
 
@@ -31,13 +31,13 @@ message Order {
 }
 
 message Category {
-  int64 id = 1;
+  int32 id = 1;
 
   string name = 2;
 }
 
 message User {
-  int64 id = 1;
+  int32 id = 1;
 
   string username = 2;
 
@@ -55,13 +55,13 @@ message User {
 }
 
 message Tag {
-  int64 id = 1;
+  int32 id = 1;
 
   string name = 2;
 }
 
 message Pet {
-  int64 id = 1;
+  int32 id = 1;
 
   Category category = 2;
 
@@ -90,13 +90,9 @@ message ApiResponse {
   string message = 3;
 }
 
-message UpdatePetRequest {
-  Pet pet = 1;
-}
+message UpdatePetRequest { Pet pet = 1; }
 
-message AddPetRequest {
-  Pet pet = 1;
-}
+message AddPetRequest { Pet pet = 1; }
 
 message FindPetsByStatusRequest {
   repeated Status status = 1;
@@ -110,13 +106,9 @@ message FindPetsByStatusRequest {
   }
 }
 
-message FindPetsByTagsRequest {
-  repeated string tags = 1;
-}
+message FindPetsByTagsRequest { repeated string tags = 1; }
 
-message GetPetByIdRequest {
-  int64 pet_id = 1;
-}
+message GetPetByIdRequest { int32 pet_id = 1; }
 
 message UpdatePetWithFormRequestBodyapplicationXWwwFormUrlencoded {
   string name = 1;
@@ -125,50 +117,37 @@ message UpdatePetWithFormRequestBodyapplicationXWwwFormUrlencoded {
 }
 
 message UpdatePetWithFormRequest {
-  int64 pet_id = 1;
+  int32 pet_id = 1;
 
-  UpdatePetWithFormRequestBodyapplicationXWwwFormUrlencoded application_x_www_form_urlencoded = 2;
+  UpdatePetWithFormRequestBodyapplicationXWwwFormUrlencoded
+      application_x_www_form_urlencoded = 2;
 }
 
 message DeletePetRequest {
   string api_key = 1;
 
-  int64 pet_id = 2;
+  int32 pet_id = 2;
 }
 
 message UploadFileRequest {
-  int64 pet_id = 1;
+  int32 pet_id = 1;
 
   string application_octet_stream = 2;
 }
 
-message GetInventoryOK {
-  map<string, int32> additional_properties = 1;
-}
+message GetInventoryOK { map<string, int32> additional_properties = 1; }
 
-message PlaceOrderRequest {
-  Order order = 1;
-}
+message PlaceOrderRequest { Order order = 1; }
 
-message GetOrderByIdRequest {
-  int64 order_id = 1;
-}
+message GetOrderByIdRequest { int32 order_id = 1; }
 
-message DeleteOrderRequest {
-  int64 order_id = 1;
-}
+message DeleteOrderRequest { int32 order_id = 1; }
 
-message CreateUserRequest {
-  User user = 1;
-}
+message CreateUserRequest { User user = 1; }
 
-message CreateUsersWithArrayInputRequest {
-  User user = 1;
-}
+message CreateUsersWithArrayInputRequest { User user = 1; }
 
-message CreateUsersWithListInputRequest {
-  User user = 1;
-}
+message CreateUsersWithListInputRequest { User user = 1; }
 
 message LoginUserRequest {
   string username = 1;
@@ -176,9 +155,7 @@ message LoginUserRequest {
   string password = 2;
 }
 
-message GetUserByNameRequest {
-  string username = 1;
-}
+message GetUserByNameRequest { string username = 1; }
 
 message UpdateUserRequest {
   string username = 1;
@@ -186,89 +163,138 @@ message UpdateUserRequest {
   User user = 2;
 }
 
-message DeleteUserRequest {
-  string username = 1;
-}
+message DeleteUserRequest { string username = 1; }
 
 service Petstore {
-  rpc UpdatePet ( UpdatePetRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { put:"/pet" body:"pet"  };
+  rpc UpdatePet(UpdatePetRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      put : "/pet"
+      body : "pet"
+    };
   }
 
-  rpc AddPet ( AddPetRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { post:"/pet" body:"pet"  };
+  rpc AddPet(AddPetRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      post : "/pet"
+      body : "pet"
+    };
   }
 
-  rpc FindPetsByStatus ( FindPetsByStatusRequest ) returns ( Pet ) {
-    option (google.api.http) = { get:"/pet/findByStatus"  };
+  rpc FindPetsByStatus(FindPetsByStatusRequest) returns (Pet) {
+    option (google.api.http) = {
+      get : "/pet/findByStatus"
+    };
   }
 
-  rpc FindPetsByTags ( FindPetsByTagsRequest ) returns ( Pet ) {
-    option (google.api.http) = { get:"/pet/findByTags"  };
+  rpc FindPetsByTags(FindPetsByTagsRequest) returns (Pet) {
+    option (google.api.http) = {
+      get : "/pet/findByTags"
+    };
   }
 
-  rpc GetPetById ( GetPetByIdRequest ) returns ( Pet ) {
-    option (google.api.http) = { get:"/pet/{petId}"  };
+  rpc GetPetById(GetPetByIdRequest) returns (Pet) {
+    option (google.api.http) = {
+      get : "/pet/{petId}"
+    };
   }
 
-  rpc UpdatePetWithForm ( UpdatePetWithFormRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { post:"/pet/{petId}" body:"application_x_www_form_urlencoded"  };
+  rpc UpdatePetWithForm(UpdatePetWithFormRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      post : "/pet/{petId}"
+      body : "application_x_www_form_urlencoded"
+    };
   }
 
-  rpc DeletePet ( DeletePetRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { delete:"/pet/{petId}"  };
+  rpc DeletePet(DeletePetRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      delete : "/pet/{petId}"
+    };
   }
 
-  rpc UploadFile ( UploadFileRequest ) returns ( ApiResponse ) {
-    option (google.api.http) = { post:"/pet/{petId}/uploadImage" body:"application_octet_stream"  };
+  rpc UploadFile(UploadFileRequest) returns (ApiResponse) {
+    option (google.api.http) = {
+      post : "/pet/{petId}/uploadImage"
+      body : "application_octet_stream"
+    };
   }
 
-  rpc GetInventory ( google.protobuf.Empty ) returns ( GetInventoryOK ) {
-    option (google.api.http) = { get:"/store/inventory"  };
+  rpc GetInventory(google.protobuf.Empty) returns (GetInventoryOK) {
+    option (google.api.http) = {
+      get : "/store/inventory"
+    };
   }
 
-  rpc PlaceOrder ( PlaceOrderRequest ) returns ( Order ) {
-    option (google.api.http) = { post:"/store/order" body:"order"  };
+  rpc PlaceOrder(PlaceOrderRequest) returns (Order) {
+    option (google.api.http) = {
+      post : "/store/order"
+      body : "order"
+    };
   }
 
-  rpc GetOrderById ( GetOrderByIdRequest ) returns ( Order ) {
-    option (google.api.http) = { get:"/store/order/{orderId}"  };
+  rpc GetOrderById(GetOrderByIdRequest) returns (Order) {
+    option (google.api.http) = {
+      get : "/store/order/{orderId}"
+    };
   }
 
-  rpc DeleteOrder ( DeleteOrderRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { delete:"/store/order/{orderId}"  };
+  rpc DeleteOrder(DeleteOrderRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      delete : "/store/order/{orderId}"
+    };
   }
 
-  rpc CreateUser ( CreateUserRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { post:"/user" body:"user"  };
+  rpc CreateUser(CreateUserRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      post : "/user"
+      body : "user"
+    };
   }
 
-  rpc CreateUsersWithArrayInput ( CreateUsersWithArrayInputRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { post:"/user/createWithArray" body:"user"  };
+  rpc CreateUsersWithArrayInput(CreateUsersWithArrayInputRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      post : "/user/createWithArray"
+      body : "user"
+    };
   }
 
-  rpc CreateUsersWithListInput ( CreateUsersWithListInputRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { post:"/user/createWithList" body:"user"  };
+  rpc CreateUsersWithListInput(CreateUsersWithListInputRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      post : "/user/createWithList"
+      body : "user"
+    };
   }
 
-  rpc LoginUser ( LoginUserRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/user/login"  };
+  rpc LoginUser(LoginUserRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/user/login"
+    };
   }
 
-  rpc LogoutUser ( google.protobuf.Empty ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/user/logout"  };
+  rpc LogoutUser(google.protobuf.Empty) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/user/logout"
+    };
   }
 
-  rpc GetUserByName ( GetUserByNameRequest ) returns ( User ) {
-    option (google.api.http) = { get:"/user/{username}"  };
+  rpc GetUserByName(GetUserByNameRequest) returns (User) {
+    option (google.api.http) = {
+      get : "/user/{username}"
+    };
   }
 
-  rpc UpdateUser ( UpdateUserRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { put:"/user/{username}" body:"user"  };
+  rpc UpdateUser(UpdateUserRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      put : "/user/{username}"
+      body : "user"
+    };
   }
 
-  rpc DeleteUser ( DeleteUserRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { delete:"/user/{username}"  };
+  rpc DeleteUser(DeleteUserRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      delete : "/user/{username}"
+    };
   }
 }
-
diff --git a/examples/petstore/petstore.yaml b/examples/petstore/petstore.yaml
index df8f163..78b3b2b 100644
--- a/examples/petstore/petstore.yaml
+++ b/examples/petstore/petstore.yaml
@@ -160,7 +160,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: successful operation
@@ -189,7 +189,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '405':
           description: Invalid input
@@ -226,7 +226,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '400':
           description: Invalid ID supplied
@@ -249,7 +249,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
       responses:
         '200':
           description: successful operation
@@ -327,7 +327,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
             minimum: 1
             maximum: 10
       responses:
@@ -359,7 +359,7 @@ paths:
           required: true
           schema:
             type: integer
-            format: int64
+            format: int32
             minimum: 1
       responses:
         '400':
@@ -536,10 +536,10 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         petId:
           type: integer
-          format: int64
+          format: int32
         quantity:
           type: integer
           format: int32
@@ -563,7 +563,7 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         name:
           type: string
       xml:
@@ -573,7 +573,7 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         username:
           type: string
         firstName:
@@ -597,7 +597,7 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         name:
           type: string
       xml:
@@ -610,7 +610,7 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         category:
           $ref: '#/components/schemas/Category'
         name:
diff --git a/generator/generator.go b/generator/generator.go
index 53a55fa..4e32ead 100644
--- a/generator/generator.go
+++ b/generator/generator.go
@@ -15,7 +15,6 @@
 package generator
 
 import (
-	"google.golang.org/protobuf/types/descriptorpb"
 	"log"
 	"os/exec"
 	"path"
@@ -24,6 +23,8 @@ import (
 	"strconv"
 	"strings"
 
+	"google.golang.org/protobuf/types/descriptorpb"
+
 	"github.com/golang/protobuf/descriptor"
 	"github.com/golang/protobuf/proto"
 	dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
@@ -611,8 +612,8 @@ func getProtobufTypes() map[string]dpb.FieldDescriptorProto_Type {
 	typeMapping := make(map[string]dpb.FieldDescriptorProto_Type)
 	typeMapping["double"] = dpb.FieldDescriptorProto_TYPE_DOUBLE
 	typeMapping["float"] = dpb.FieldDescriptorProto_TYPE_FLOAT
-	typeMapping["int64"] = dpb.FieldDescriptorProto_TYPE_INT64
-	typeMapping["uint64"] = dpb.FieldDescriptorProto_TYPE_UINT64
+	typeMapping["int32"] = dpb.FieldDescriptorProto_TYPE_INT64
+	typeMapping["uint32"] = dpb.FieldDescriptorProto_TYPE_UINT64
 	typeMapping["int32"] = dpb.FieldDescriptorProto_TYPE_INT32
 	typeMapping["fixed64"] = dpb.FieldDescriptorProto_TYPE_FIXED64
 
@@ -624,7 +625,7 @@ func getProtobufTypes() map[string]dpb.FieldDescriptorProto_Type {
 	typeMapping["sfixed32"] = dpb.FieldDescriptorProto_TYPE_SFIXED32
 	typeMapping["sfixed64"] = dpb.FieldDescriptorProto_TYPE_SFIXED64
 	typeMapping["sint32"] = dpb.FieldDescriptorProto_TYPE_SINT32
-	typeMapping["sint64"] = dpb.FieldDescriptorProto_TYPE_SINT64
+	typeMapping["sint32"] = dpb.FieldDescriptorProto_TYPE_SINT64
 	return typeMapping
 }
 
diff --git a/generator/language.go b/generator/language.go
index ca3dcc7..a2b75fa 100644
--- a/generator/language.go
+++ b/generator/language.go
@@ -75,7 +75,7 @@ func findNativeType(fType string, fFormat string) string {
 		case "int64":
 			return "int64"
 		default:
-			return "int64"
+			return "int32"
 		}
 	case "object":
 		return "message"
diff --git a/generator/testfiles/errors/cyclic_dependency_1.yaml b/generator/testfiles/errors/cyclic_dependency_1.yaml
index a0d018c..9fc1f09 100644
--- a/generator/testfiles/errors/cyclic_dependency_1.yaml
+++ b/generator/testfiles/errors/cyclic_dependency_1.yaml
@@ -20,7 +20,7 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         age:
           type: integer
-          format: int64
\ No newline at end of file
+          format: int32
\ No newline at end of file
diff --git a/generator/testfiles/goldstandard/other.proto b/generator/testfiles/goldstandard/other.proto
index ca2d42f..c62df6e 100644
--- a/generator/testfiles/goldstandard/other.proto
+++ b/generator/testfiles/goldstandard/other.proto
@@ -13,9 +13,9 @@ import "parameters.proto";
 import "responses.proto";
 
 message Person {
-  int64 id = 1;
+  int32 id = 1;
 
-  int64 age = 2;
+  int32 age = 2;
 
   string name = 3;
 
@@ -28,10 +28,8 @@ message Person {
   float iq = 7;
 }
 
-//TestExernalReference2Parameters holds parameters to TestExernalReference2
-message TestExernalReference2Request {
-  parameters.Parameter2 parameter2 = 1;
-}
+// TestExernalReference2Parameters holds parameters to TestExernalReference2
+message TestExernalReference2Request { parameters.Parameter2 parameter2 = 1; }
 
 message TestAdditionalPropertiesOK {
   map<string, int32> additional_properties = 1;
@@ -41,28 +39,42 @@ message TestAdditionalPropertiesReferenceOK {
   map<string, Person> additional_properties = 1;
 }
 
-message TestAdditionalPropertiesArrayOK {
-}
+message TestAdditionalPropertiesArrayOK {}
 
 service Other {
-  rpc TestExternalReference ( google.protobuf.Empty ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testExternalReference"  };
+  rpc TestExternalReference(google.protobuf.Empty)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testExternalReference"
+    };
   }
 
-  rpc TestExernalReference2 ( TestExernalReference2Request ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testExternalReference2" body:"parameter2"  };
+  rpc TestExernalReference2(TestExernalReference2Request)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testExternalReference2"
+      body : "parameter2"
+    };
   }
 
-  rpc TestAdditionalProperties ( google.protobuf.Empty ) returns ( TestAdditionalPropertiesOK ) {
-    option (google.api.http) = { get:"/testAdditionalProperties"  };
+  rpc TestAdditionalProperties(google.protobuf.Empty)
+      returns (TestAdditionalPropertiesOK) {
+    option (google.api.http) = {
+      get : "/testAdditionalProperties"
+    };
   }
 
-  rpc TestAdditionalPropertiesReference ( google.protobuf.Empty ) returns ( TestAdditionalPropertiesReferenceOK ) {
-    option (google.api.http) = { get:"/testAdditionalPropertiesReference"  };
+  rpc TestAdditionalPropertiesReference(google.protobuf.Empty)
+      returns (TestAdditionalPropertiesReferenceOK) {
+    option (google.api.http) = {
+      get : "/testAdditionalPropertiesReference"
+    };
   }
 
-  rpc TestAdditionalPropertiesArray ( google.protobuf.Empty ) returns ( TestAdditionalPropertiesArrayOK ) {
-    option (google.api.http) = { get:"/testAdditionalPropertiesArray"  };
+  rpc TestAdditionalPropertiesArray(google.protobuf.Empty)
+      returns (TestAdditionalPropertiesArrayOK) {
+    option (google.api.http) = {
+      get : "/testAdditionalPropertiesArray"
+    };
   }
 }
-
diff --git a/generator/testfiles/goldstandard/parameters.proto b/generator/testfiles/goldstandard/parameters.proto
index c4b5312..956be04 100644
--- a/generator/testfiles/goldstandard/parameters.proto
+++ b/generator/testfiles/goldstandard/parameters.proto
@@ -8,20 +8,14 @@ import "google/protobuf/descriptor.proto";
 
 import "google/protobuf/empty.proto";
 
-message Parameter1 {
-  int64 param7 = 1;
-}
+message Parameter1 { int32 param7 = 1; }
 
-message Parameter2 {
-  int64 param8 = 1;
-}
+message Parameter2 { int32 param8 = 1; }
 
-//TestParameterQueryParameters holds parameters to TestParameterQuery
-message TestParameterQueryRequest {
-  int32 param1 = 1;
-}
+// TestParameterQueryParameters holds parameters to TestParameterQuery
+message TestParameterQueryRequest { int32 param1 = 1; }
 
-//TestParameterQueryEnumParameters holds parameters to TestParameterQueryEnum
+// TestParameterQueryEnumParameters holds parameters to TestParameterQueryEnum
 message TestParameterQueryEnumRequest {
   repeated Param2 param2 = 1;
 
@@ -34,12 +28,10 @@ message TestParameterQueryEnumRequest {
   }
 }
 
-//TestParameterPathParameters holds parameters to TestParameterPath
-message TestParameterPathRequest {
-  string param3 = 1;
-}
+// TestParameterPathParameters holds parameters to TestParameterPath
+message TestParameterPathRequest { string param3 = 1; }
 
-//TestParameterPathEnumParameters holds parameters to TestParameterPathEnum
+// TestParameterPathEnumParameters holds parameters to TestParameterPathEnum
 message TestParameterPathEnumRequest {
   Param4 param4 = 1;
 
@@ -50,41 +42,57 @@ message TestParameterPathEnumRequest {
   }
 }
 
-//TestParameterMultiplePathParameters holds parameters to TestParameterMultiplePath
+// TestParameterMultiplePathParameters holds parameters to
+// TestParameterMultiplePath
 message TestParameterMultiplePathRequest {
   string param5 = 1;
 
   string param6 = 2;
 }
 
-//TestParameterReferenceParameters holds parameters to TestParameterReference
-message TestParameterReferenceRequest {
-  Parameter1 parameter1 = 1;
-}
+// TestParameterReferenceParameters holds parameters to TestParameterReference
+message TestParameterReferenceRequest { Parameter1 parameter1 = 1; }
 
 service Parameters {
-  rpc TestParameterQuery ( TestParameterQueryRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testParameterQuery"  };
+  rpc TestParameterQuery(TestParameterQueryRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testParameterQuery"
+    };
   }
 
-  rpc TestParameterQueryEnum ( TestParameterQueryEnumRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testParameterQueryEnum"  };
+  rpc TestParameterQueryEnum(TestParameterQueryEnumRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testParameterQueryEnum"
+    };
   }
 
-  rpc TestParameterPath ( TestParameterPathRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testParameterPath/{param1}"  };
+  rpc TestParameterPath(TestParameterPathRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testParameterPath/{param1}"
+    };
   }
 
-  rpc TestParameterPathEnum ( TestParameterPathEnumRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testParameterPathEnum/{param1}"  };
+  rpc TestParameterPathEnum(TestParameterPathEnumRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testParameterPathEnum/{param1}"
+    };
   }
 
-  rpc TestParameterMultiplePath ( TestParameterMultiplePathRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testParameterMultiplePath/{param1}/{param2}"  };
+  rpc TestParameterMultiplePath(TestParameterMultiplePathRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testParameterMultiplePath/{param1}/{param2}"
+    };
   }
 
-  rpc TestParameterReference ( TestParameterReferenceRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testParameterReference"  };
+  rpc TestParameterReference(TestParameterReferenceRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testParameterReference"
+    };
   }
 }
-
diff --git a/generator/testfiles/goldstandard/requestbodies.proto b/generator/testfiles/goldstandard/requestbodies.proto
index dd9732e..c75e588 100644
--- a/generator/testfiles/goldstandard/requestbodies.proto
+++ b/generator/testfiles/goldstandard/requestbodies.proto
@@ -9,32 +9,35 @@ import "google/protobuf/descriptor.proto";
 import "google/protobuf/empty.proto";
 
 message Person {
-  int64 id = 1;
+  int32 id = 1;
 
-  int64 age = 2;
+  int32 age = 2;
 
   string name = 3;
 
   repeated string photo_urls = 4;
 }
 
-//TestRequestBodyParameters holds parameters to TestRequestBody
-message TestRequestBodyRequest {
-  Person person = 1;
-}
+// TestRequestBodyParameters holds parameters to TestRequestBody
+message TestRequestBodyRequest { Person person = 1; }
 
-//TestRequestBodyReferenceParameters holds parameters to TestRequestBodyReference
-message TestRequestBodyReferenceRequest {
-  Person person = 1;
-}
+// TestRequestBodyReferenceParameters holds parameters to
+// TestRequestBodyReference
+message TestRequestBodyReferenceRequest { Person person = 1; }
 
 service Requestbodies {
-  rpc TestRequestBody ( TestRequestBodyRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testRequestBody" body:"person"  };
+  rpc TestRequestBody(TestRequestBodyRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testRequestBody"
+      body : "person"
+    };
   }
 
-  rpc TestRequestBodyReference ( TestRequestBodyReferenceRequest ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testRequestBodyReference" body:"person"  };
+  rpc TestRequestBodyReference(TestRequestBodyReferenceRequest)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testRequestBodyReference"
+      body : "person"
+    };
   }
 }
-
diff --git a/generator/testfiles/goldstandard/responses.proto b/generator/testfiles/goldstandard/responses.proto
index 19e2b8e..b0377bb 100644
--- a/generator/testfiles/goldstandard/responses.proto
+++ b/generator/testfiles/goldstandard/responses.proto
@@ -15,9 +15,9 @@ message Error {
 }
 
 message Person {
-  int64 id = 1;
+  int32 id = 1;
 
-  int64 age = 2;
+  int32 age = 2;
 
   string name = 3;
 
@@ -25,24 +25,34 @@ message Person {
 }
 
 service Responses {
-  rpc TestResponseNative ( google.protobuf.Empty ) returns ( google.protobuf.Empty ) {
-    option (google.api.http) = { get:"/testResponseNative"  };
+  rpc TestResponseNative(google.protobuf.Empty)
+      returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      get : "/testResponseNative"
+    };
   }
 
-  rpc TestResponseReference ( google.protobuf.Empty ) returns ( Person ) {
-    option (google.api.http) = { get:"/testResponseReference"  };
+  rpc TestResponseReference(google.protobuf.Empty) returns (Person) {
+    option (google.api.http) = {
+      get : "/testResponseReference"
+    };
   }
 
-  rpc TestResponseMultipleContent ( google.protobuf.Empty ) returns ( Person ) {
-    option (google.api.http) = { get:"/testResponseMultipleContent"  };
+  rpc TestResponseMultipleContent(google.protobuf.Empty) returns (Person) {
+    option (google.api.http) = {
+      get : "/testResponseMultipleContent"
+    };
   }
 
-  rpc TestResponse400StatusCode ( google.protobuf.Empty ) returns ( Error ) {
-    option (google.api.http) = { get:"/testResponse400StatusCode"  };
+  rpc TestResponse400StatusCode(google.protobuf.Empty) returns (Error) {
+    option (google.api.http) = {
+      get : "/testResponse400StatusCode"
+    };
   }
 
-  rpc TestResponseComponentReference ( google.protobuf.Empty ) returns ( Person ) {
-    option (google.api.http) = { get:"/testResponseComponentReference"  };
+  rpc TestResponseComponentReference(google.protobuf.Empty) returns (Person) {
+    option (google.api.http) = {
+      get : "/testResponseComponentReference"
+    };
   }
 }
-
diff --git a/generator/testfiles/other.yaml b/generator/testfiles/other.yaml
index ddbd5ac..915c3d8 100644
--- a/generator/testfiles/other.yaml
+++ b/generator/testfiles/other.yaml
@@ -77,10 +77,10 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         age:
           type: integer
-          format: int64
+          format: int32
         name:
           type: string
           example: Peter
diff --git a/generator/testfiles/parameters.yaml b/generator/testfiles/parameters.yaml
index a1e4683..5014c61 100644
--- a/generator/testfiles/parameters.yaml
+++ b/generator/testfiles/parameters.yaml
@@ -102,10 +102,10 @@ components:
       in: query
       schema:
         type: integer
-        format: int64
+        format: int32
     Parameter2:
       name: param8
       in: path
       schema:
         type: integer
-        format: int64
\ No newline at end of file
+        format: int32
\ No newline at end of file
diff --git a/generator/testfiles/requestBodies.yaml b/generator/testfiles/requestBodies.yaml
index c26fd16..af7bcbf 100644
--- a/generator/testfiles/requestBodies.yaml
+++ b/generator/testfiles/requestBodies.yaml
@@ -43,10 +43,10 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         age:
           type: integer
-          format: int64
+          format: int32
         name:
           type: string
           example: Peter
diff --git a/generator/testfiles/responses.yaml b/generator/testfiles/responses.yaml
index 50d28bc..1da36ab 100644
--- a/generator/testfiles/responses.yaml
+++ b/generator/testfiles/responses.yaml
@@ -86,10 +86,10 @@ components:
       properties:
         id:
           type: integer
-          format: int64
+          format: int32
         age:
           type: integer
-          format: int64
+          format: int32
         name:
           type: string
           example: Peter