From 2a6dbec2493b8e6ab504481cf0fdb0bd43afa9b2 Mon Sep 17 00:00:00 2001 From: Yuki Yugui Sonoda Date: Wed, 13 Jul 2016 14:37:56 +0900 Subject: [PATCH 1/2] Rename packages to follow the repository transfer github.com/gengo/grpc-gateway was transferred to github.com/grpc-ecosystem/grpc-gateway. --- .travis.yml | 10 ++++----- Makefile | 2 +- README.md | 22 +++++++++---------- examples/browser/bower.json | 2 +- examples/browser/gulpfile.js | 4 ++-- examples/client_test.go | 4 ++-- examples/examplepb/a_bit_of_everything.proto | 4 ++-- examples/examplepb/echo_service.proto | 2 +- examples/examplepb/flow_combination.proto | 2 +- examples/examplepb/stream.proto | 4 ++-- examples/integration_test.go | 6 ++--- examples/main.go | 4 ++-- examples/main_test.go | 2 +- examples/server/a_bit_of_everything.go | 6 ++--- examples/server/echo.go | 2 +- examples/server/flow_combination.go | 2 +- examples/server/main.go | 2 +- examples/sub/message.proto | 2 +- examples/sub2/message.proto | 2 +- .../descriptor/services.go | 4 ++-- .../descriptor/services_test.go | 2 +- protoc-gen-grpc-gateway/descriptor/types.go | 2 +- .../descriptor/types_test.go | 6 ++--- .../generator/generator.go | 2 +- .../gengateway/generator.go | 8 +++---- .../gengateway/template.go | 4 ++-- .../gengateway/template_test.go | 4 ++-- protoc-gen-grpc-gateway/httprule/compile.go | 2 +- .../httprule/compile_test.go | 2 +- protoc-gen-grpc-gateway/main.go | 4 ++-- protoc-gen-swagger/genswagger/generator.go | 4 ++-- protoc-gen-swagger/genswagger/template.go | 2 +- .../genswagger/template_test.go | 4 ++-- protoc-gen-swagger/genswagger/types.go | 2 +- protoc-gen-swagger/main.go | 4 ++-- runtime/context_test.go | 2 +- runtime/errors_test.go | 2 +- runtime/handler.go | 2 +- runtime/internal/stream_chunk.proto | 2 +- runtime/marshal_json_test.go | 4 ++-- runtime/marshal_jsonpb_test.go | 4 ++-- runtime/marshaler_registry_test.go | 2 +- runtime/mux_test.go | 4 ++-- runtime/pattern.go | 2 +- runtime/pattern_test.go | 2 +- runtime/query.go | 2 +- runtime/query_test.go | 4 ++-- utilities/trie_test.go | 2 +- 48 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92008a5daa4..9d3b2a30eb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,16 +17,16 @@ before_install: - go get github.com/golang/lint/golint - go get github.com/dghubble/sling install: -- go get github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway -- go get github.com/gengo/grpc-gateway/runtime -- go get github.com/gengo/grpc-gateway/examples -- go get github.com/gengo/grpc-gateway/examples/server +- go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway +- go get github.com/grpc-ecosystem/grpc-gateway/runtime +- go get github.com/grpc-ecosystem/grpc-gateway/examples +- go get github.com/grpc-ecosystem/grpc-gateway/examples/server before_script: - sh -c 'cd examples/browser && npm install' script: - make realclean && make examples SWAGGER_CODEGEN="java -jar $HOME/local/swagger-codegen-cli.jar" - if ! go version | grep devel; then test -z "$(git status --porcelain)" || (git status; git diff; exit 1); fi -- env GLOG_logtostderr=1 go test -race -v github.com/gengo/grpc-gateway/... +- env GLOG_logtostderr=1 go test -race -v github.com/grpc-ecosystem/grpc-gateway/... - make lint - sh -c 'cd examples/browser && gulp' env: diff --git a/Makefile b/Makefile index f2c4a4d2a20..756f678aeaa 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # You don't have to rebuild these targets by yourself unless you develop # grpc-gateway itself. -PKG=github.com/gengo/grpc-gateway +PKG=github.com/grpc-ecosystem/grpc-gateway GO_PLUGIN=bin/protoc-gen-go GO_PLUGIN_PKG=github.com/golang/protobuf/protoc-gen-go SWAGGER_PLUGIN=bin/protoc-gen-swagger diff --git a/README.md b/README.md index 35ffba6e4bd..8701c15034f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # grpc-gateway -[![Build Status](https://travis-ci.org/gengo/grpc-gateway.svg?branch=master)](https://travis-ci.org/gengo/grpc-gateway) +[![Build Status](https://travis-ci.org/grpc-ecosystem/grpc-gateway.svg?branch=master)](https://travis-ci.org/grpc-ecosystem/grpc-gateway) grpc-gateway is a plugin of [protoc](http://github.com/google/protobuf). It reads [gRPC](http://github.com/grpc/grpc-common) service definition, @@ -38,8 +38,8 @@ sudo make install Then, `go get -u` as usual. ```sh -go get -u github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway -go get -u github.com/gengo/grpc-gateway/protoc-gen-swagger +go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway +go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger go get -u github.com/golang/protobuf/protoc-gen-go ``` @@ -88,8 +88,8 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`. ```sh protoc -I/usr/local/include -I. \ -I$GOPATH/src \ - -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \ - --go_out=Mgoogle/api/annotations.proto=github.com/gengo/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. \ + -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \ + --go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. \ path/to/your_service.proto ``` @@ -101,13 +101,13 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`. ```sh protoc -I/usr/local/include -I. \ -I$GOPATH/src \ - -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \ + -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \ --ruby_out=. \ path/to/your/service_proto protoc -I/usr/local/include -I. \ -I$GOPATH/src \ - -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \ + -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \ --plugin=protoc-gen-grpc-ruby=grpc_ruby_plugin \ --grpc-ruby_out=. \ path/to/your/service.proto @@ -118,7 +118,7 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`. ```sh protoc -I/usr/local/include -I. \ -I$GOPATH/src \ - -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \ + -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \ --grpc-gateway_out=logtostderr=true:. \ path/to/your_service.proto ``` @@ -135,7 +135,7 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`. "github.com/golang/glog" "golang.org/x/net/context" - "github.com/gengo/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/runtime" "google.golang.org/grpc" gw "path/to/your_service_package" @@ -176,7 +176,7 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`. ```sh protoc -I/usr/local/include -I. \ -I$GOPATH/src \ - -I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \ + -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \ --swagger_out=logtostderr=true:. \ path/to/your_service.proto ``` @@ -221,4 +221,4 @@ But patch is welcome. # License grpc-gateway is licensed under the BSD 3-Clause License. -See [LICENSE.txt](https://github.com/gengo/grpc-gateway/blob/master/LICENSE.txt) for more details. +See [LICENSE.txt](https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt) for more details. diff --git a/examples/browser/bower.json b/examples/browser/bower.json index eb2c258d6f2..2454691ae08 100644 --- a/examples/browser/bower.json +++ b/examples/browser/bower.json @@ -6,7 +6,7 @@ "Yuki Yugui Sonoda " ], "license": "SEE LICENSE IN LICENSE file", - "homepage": "https://github.com/gengo/grpc-gateway", + "homepage": "https://github.com/grpc-ecosystem/grpc-gateway", "private": true, "dependencies": { "swagger-js": "~> 2.1" diff --git a/examples/browser/gulpfile.js b/examples/browser/gulpfile.js index c095a3e6cbb..0d8e15864de 100644 --- a/examples/browser/gulpfile.js +++ b/examples/browser/gulpfile.js @@ -16,11 +16,11 @@ gulp.task('bower', function(){ }); gulp.task('server', shell.task([ - 'go build -o bin/example-server github.com/gengo/grpc-gateway/examples/server', + 'go build -o bin/example-server github.com/grpc-ecosystem/grpc-gateway/examples/server', ])); gulp.task('gateway', shell.task([ - 'go build -o bin/example-gw github.com/gengo/grpc-gateway/examples', + 'go build -o bin/example-gw github.com/grpc-ecosystem/grpc-gateway/examples', ])); gulp.task('serve-server', ['server'], function(){ diff --git a/examples/client_test.go b/examples/client_test.go index 41f29fc593f..0574d9fbb0c 100644 --- a/examples/client_test.go +++ b/examples/client_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/gengo/grpc-gateway/examples/clients/abe" - "github.com/gengo/grpc-gateway/examples/clients/echo" + "github.com/grpc-ecosystem/grpc-gateway/examples/clients/abe" + "github.com/grpc-ecosystem/grpc-gateway/examples/clients/echo" ) func TestClientIntegration(t *testing.T) { diff --git a/examples/examplepb/a_bit_of_everything.proto b/examples/examplepb/a_bit_of_everything.proto index addd2ebb3bd..05843baeeef 100644 --- a/examples/examplepb/a_bit_of_everything.proto +++ b/examples/examplepb/a_bit_of_everything.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = "examplepb"; -package gengo.grpc.gateway.examples.examplepb; +package grpc.gateway.examples.examplepb; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; @@ -94,7 +94,7 @@ service ABitOfEverythingService { delete: "/v1/example/a_bit_of_everything/{uuid}" }; } - rpc Echo(gengo.grpc.gateway.examples.sub.StringMessage) returns (gengo.grpc.gateway.examples.sub.StringMessage) { + rpc Echo(grpc.gateway.examples.sub.StringMessage) returns (grpc.gateway.examples.sub.StringMessage) { option (google.api.http) = { get: "/v1/example/a_bit_of_everything/echo/{value}" additional_bindings { diff --git a/examples/examplepb/echo_service.proto b/examples/examplepb/echo_service.proto index 0573f29f052..44555e8553f 100644 --- a/examples/examplepb/echo_service.proto +++ b/examples/examplepb/echo_service.proto @@ -5,7 +5,7 @@ option go_package = "examplepb"; // // Echo Service API consists of a single service which returns // a message. -package gengo.grpc.gateway.examples.examplepb; +package grpc.gateway.examples.examplepb; import "google/api/annotations.proto"; diff --git a/examples/examplepb/flow_combination.proto b/examples/examplepb/flow_combination.proto index 9c321fe0fba..60096081ee1 100644 --- a/examples/examplepb/flow_combination.proto +++ b/examples/examplepb/flow_combination.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = "examplepb"; -package gengo.grpc.gateway.examples.examplepb; +package grpc.gateway.examples.examplepb; import "google/api/annotations.proto"; diff --git a/examples/examplepb/stream.proto b/examples/examplepb/stream.proto index dbf5ac4633d..573a2f4d725 100644 --- a/examples/examplepb/stream.proto +++ b/examples/examplepb/stream.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = "examplepb"; -package gengo.grpc.gateway.examples.examplepb; +package grpc.gateway.examples.examplepb; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; @@ -20,7 +20,7 @@ service StreamService { get: "/v1/example/a_bit_of_everything" }; } - rpc BulkEcho(stream gengo.grpc.gateway.examples.sub.StringMessage) returns (stream gengo.grpc.gateway.examples.sub.StringMessage) { + rpc BulkEcho(stream grpc.gateway.examples.sub.StringMessage) returns (stream grpc.gateway.examples.sub.StringMessage) { option (google.api.http) = { post: "/v1/example/a_bit_of_everything/echo" body: "*" diff --git a/examples/integration_test.go b/examples/integration_test.go index 4681da37908..2d345540cfe 100644 --- a/examples/integration_test.go +++ b/examples/integration_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" - gw "github.com/gengo/grpc-gateway/examples/examplepb" - sub "github.com/gengo/grpc-gateway/examples/sub" - "github.com/gengo/grpc-gateway/runtime" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/empty" + gw "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb" + sub "github.com/grpc-ecosystem/grpc-gateway/examples/sub" + "github.com/grpc-ecosystem/grpc-gateway/runtime" "golang.org/x/net/context" "google.golang.org/grpc/codes" ) diff --git a/examples/main.go b/examples/main.go index 2d8a1a54aff..748ab36186b 100644 --- a/examples/main.go +++ b/examples/main.go @@ -6,9 +6,9 @@ import ( "path" "strings" - "github.com/gengo/grpc-gateway/examples/examplepb" - "github.com/gengo/grpc-gateway/runtime" "github.com/golang/glog" + "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb" + "github.com/grpc-ecosystem/grpc-gateway/runtime" "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/examples/main_test.go b/examples/main_test.go index c5ed4d46638..2742c385bb2 100644 --- a/examples/main_test.go +++ b/examples/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - server "github.com/gengo/grpc-gateway/examples/server" + server "github.com/grpc-ecosystem/grpc-gateway/examples/server" ) func runServers() <-chan error { diff --git a/examples/server/a_bit_of_everything.go b/examples/server/a_bit_of_everything.go index 64ae39c6387..37001d69dfe 100644 --- a/examples/server/a_bit_of_everything.go +++ b/examples/server/a_bit_of_everything.go @@ -5,11 +5,11 @@ import ( "io" "sync" - examples "github.com/gengo/grpc-gateway/examples/examplepb" - sub "github.com/gengo/grpc-gateway/examples/sub" - sub2 "github.com/gengo/grpc-gateway/examples/sub2" "github.com/golang/glog" "github.com/golang/protobuf/ptypes/empty" + examples "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb" + sub "github.com/grpc-ecosystem/grpc-gateway/examples/sub" + sub2 "github.com/grpc-ecosystem/grpc-gateway/examples/sub2" "github.com/rogpeppe/fastuuid" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/examples/server/echo.go b/examples/server/echo.go index 0f07fbbd496..92ac950a2c7 100644 --- a/examples/server/echo.go +++ b/examples/server/echo.go @@ -1,8 +1,8 @@ package main import ( - examples "github.com/gengo/grpc-gateway/examples/examplepb" "github.com/golang/glog" + examples "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/examples/server/flow_combination.go b/examples/server/flow_combination.go index b6aa0d92f01..2c9fcd99e68 100644 --- a/examples/server/flow_combination.go +++ b/examples/server/flow_combination.go @@ -3,7 +3,7 @@ package main import ( "io" - examples "github.com/gengo/grpc-gateway/examples/examplepb" + examples "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb" "golang.org/x/net/context" ) diff --git a/examples/server/main.go b/examples/server/main.go index 844ace623e3..136034ad83b 100644 --- a/examples/server/main.go +++ b/examples/server/main.go @@ -4,8 +4,8 @@ import ( "flag" "net" - examples "github.com/gengo/grpc-gateway/examples/examplepb" "github.com/golang/glog" + examples "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb" "google.golang.org/grpc" ) diff --git a/examples/sub/message.proto b/examples/sub/message.proto index 56e917804bc..7702a930d98 100644 --- a/examples/sub/message.proto +++ b/examples/sub/message.proto @@ -1,6 +1,6 @@ syntax = "proto2"; option go_package = "sub"; -package gengo.grpc.gateway.examples.sub; +package grpc.gateway.examples.sub; message StringMessage { required string value = 1; diff --git a/examples/sub2/message.proto b/examples/sub2/message.proto index 5d686d62c68..9c266430958 100644 --- a/examples/sub2/message.proto +++ b/examples/sub2/message.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/gengo/grpc-gateway/examples/sub2"; +option go_package = "github.com/grpc-ecosystem/grpc-gateway/examples/sub2"; package sub2; message IdMessage { diff --git a/protoc-gen-grpc-gateway/descriptor/services.go b/protoc-gen-grpc-gateway/descriptor/services.go index aa3dffe8156..8f7cb43c669 100644 --- a/protoc-gen-grpc-gateway/descriptor/services.go +++ b/protoc-gen-grpc-gateway/descriptor/services.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/httprule" - options "github.com/gengo/grpc-gateway/third_party/googleapis/google/api" "github.com/golang/glog" "github.com/golang/protobuf/proto" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule" + options "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api" ) // loadServices registers services and their methods from "targetFile" to "r". diff --git a/protoc-gen-grpc-gateway/descriptor/services_test.go b/protoc-gen-grpc-gateway/descriptor/services_test.go index f2df37011d5..7b4af4e6898 100644 --- a/protoc-gen-grpc-gateway/descriptor/services_test.go +++ b/protoc-gen-grpc-gateway/descriptor/services_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/httprule" "github.com/golang/protobuf/proto" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule" ) func compilePath(t *testing.T, path string) httprule.Template { diff --git a/protoc-gen-grpc-gateway/descriptor/types.go b/protoc-gen-grpc-gateway/descriptor/types.go index 1a3caf96220..248538e7bad 100644 --- a/protoc-gen-grpc-gateway/descriptor/types.go +++ b/protoc-gen-grpc-gateway/descriptor/types.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/httprule" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" gogen "github.com/golang/protobuf/protoc-gen-go/generator" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule" ) // GoPackage represents a golang package diff --git a/protoc-gen-grpc-gateway/descriptor/types_test.go b/protoc-gen-grpc-gateway/descriptor/types_test.go index 4b7caea6f3d..ef2162a61fb 100644 --- a/protoc-gen-grpc-gateway/descriptor/types_test.go +++ b/protoc-gen-grpc-gateway/descriptor/types_test.go @@ -29,7 +29,7 @@ func TestGoPackageStandard(t *testing.T) { want: false, }, { - pkg: GoPackage{Path: "github.com/gengo/grpc-gateway", Name: "main"}, + pkg: GoPackage{Path: "github.com/grpc-ecosystem/grpc-gateway", Name: "main"}, want: false, }, { @@ -65,8 +65,8 @@ func TestGoPackageString(t *testing.T) { want: `"golang.org/x/net/context"`, }, { - pkg: GoPackage{Path: "github.com/gengo/grpc-gateway", Name: "main"}, - want: `"github.com/gengo/grpc-gateway"`, + pkg: GoPackage{Path: "github.com/grpc-ecosystem/grpc-gateway", Name: "main"}, + want: `"github.com/grpc-ecosystem/grpc-gateway"`, }, { pkg: GoPackage{Path: "github.com/google/googleapis/google/api/http.pb", Name: "http_pb", Alias: "htpb"}, diff --git a/protoc-gen-grpc-gateway/generator/generator.go b/protoc-gen-grpc-gateway/generator/generator.go index b4de256c912..df55da44445 100644 --- a/protoc-gen-grpc-gateway/generator/generator.go +++ b/protoc-gen-grpc-gateway/generator/generator.go @@ -2,8 +2,8 @@ package generator import ( - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" ) // Generator is an abstraction of code generators. diff --git a/protoc-gen-grpc-gateway/gengateway/generator.go b/protoc-gen-grpc-gateway/gengateway/generator.go index 33cf6cc65f1..b4cce8695eb 100644 --- a/protoc-gen-grpc-gateway/gengateway/generator.go +++ b/protoc-gen-grpc-gateway/gengateway/generator.go @@ -8,11 +8,11 @@ import ( "path/filepath" "strings" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" - gen "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/generator" "github.com/golang/glog" "github.com/golang/protobuf/proto" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" + gen "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator" ) var ( @@ -30,8 +30,8 @@ func New(reg *descriptor.Registry) gen.Generator { for _, pkgpath := range []string{ "io", "net/http", - "github.com/gengo/grpc-gateway/runtime", - "github.com/gengo/grpc-gateway/utilities", + "github.com/grpc-ecosystem/grpc-gateway/runtime", + "github.com/grpc-ecosystem/grpc-gateway/utilities", "github.com/golang/protobuf/proto", "golang.org/x/net/context", "google.golang.org/grpc", diff --git a/protoc-gen-grpc-gateway/gengateway/template.go b/protoc-gen-grpc-gateway/gengateway/template.go index ff34f396584..5b760220210 100644 --- a/protoc-gen-grpc-gateway/gengateway/template.go +++ b/protoc-gen-grpc-gateway/gengateway/template.go @@ -6,9 +6,9 @@ import ( "strings" "text/template" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" - "github.com/gengo/grpc-gateway/utilities" "github.com/golang/glog" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/utilities" ) type param struct { diff --git a/protoc-gen-grpc-gateway/gengateway/template_test.go b/protoc-gen-grpc-gateway/gengateway/template_test.go index cfad4312fee..c5fb2f93e39 100644 --- a/protoc-gen-grpc-gateway/gengateway/template_test.go +++ b/protoc-gen-grpc-gateway/gengateway/template_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/httprule" "github.com/golang/protobuf/proto" protodescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule" ) func crossLinkFixture(f *descriptor.File) *descriptor.File { diff --git a/protoc-gen-grpc-gateway/httprule/compile.go b/protoc-gen-grpc-gateway/httprule/compile.go index 256477df933..437039a3dae 100644 --- a/protoc-gen-grpc-gateway/httprule/compile.go +++ b/protoc-gen-grpc-gateway/httprule/compile.go @@ -1,7 +1,7 @@ package httprule import ( - "github.com/gengo/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/utilities" ) const ( diff --git a/protoc-gen-grpc-gateway/httprule/compile_test.go b/protoc-gen-grpc-gateway/httprule/compile_test.go index 451ae2ad467..9ef297573f8 100644 --- a/protoc-gen-grpc-gateway/httprule/compile_test.go +++ b/protoc-gen-grpc-gateway/httprule/compile_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/gengo/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/utilities" ) const ( diff --git a/protoc-gen-grpc-gateway/main.go b/protoc-gen-grpc-gateway/main.go index f84742cadef..1c01d8756ce 100644 --- a/protoc-gen-grpc-gateway/main.go +++ b/protoc-gen-grpc-gateway/main.go @@ -15,11 +15,11 @@ import ( "os" "strings" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/gengateway" "github.com/golang/glog" "github.com/golang/protobuf/proto" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/gengateway" ) var ( diff --git a/protoc-gen-swagger/genswagger/generator.go b/protoc-gen-swagger/genswagger/generator.go index 01219b46330..697e540b4ae 100644 --- a/protoc-gen-swagger/genswagger/generator.go +++ b/protoc-gen-swagger/genswagger/generator.go @@ -8,11 +8,11 @@ import ( "path/filepath" "strings" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" - gen "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/generator" "github.com/golang/glog" "github.com/golang/protobuf/proto" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" + gen "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/generator" ) var ( diff --git a/protoc-gen-swagger/genswagger/template.go b/protoc-gen-swagger/genswagger/template.go index fd7b1dfe00d..e2bd125bda7 100644 --- a/protoc-gen-swagger/genswagger/template.go +++ b/protoc-gen-swagger/genswagger/template.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" pbdescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" ) // findServicesMessagesAndEnumerations discovers all messages and enums defined in the RPC methods of the service. diff --git a/protoc-gen-swagger/genswagger/template_test.go b/protoc-gen-swagger/genswagger/template_test.go index 270b38d3560..1c897be8acd 100644 --- a/protoc-gen-swagger/genswagger/template_test.go +++ b/protoc-gen-swagger/genswagger/template_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/httprule" "github.com/golang/protobuf/proto" protodescriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/httprule" ) func crossLinkFixture(f *descriptor.File) *descriptor.File { diff --git a/protoc-gen-swagger/genswagger/types.go b/protoc-gen-swagger/genswagger/types.go index 7dea2209a65..b91e457c006 100644 --- a/protoc-gen-swagger/genswagger/types.go +++ b/protoc-gen-swagger/genswagger/types.go @@ -1,7 +1,7 @@ package genswagger import ( - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" ) type param struct { diff --git a/protoc-gen-swagger/main.go b/protoc-gen-swagger/main.go index acad8854fa9..fc3a0030a11 100644 --- a/protoc-gen-swagger/main.go +++ b/protoc-gen-swagger/main.go @@ -7,11 +7,11 @@ import ( "os" "strings" - "github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/descriptor" - "github.com/gengo/grpc-gateway/protoc-gen-swagger/genswagger" "github.com/golang/glog" "github.com/golang/protobuf/proto" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor" + "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/genswagger" ) var ( diff --git a/runtime/context_test.go b/runtime/context_test.go index 403b733329c..abc1873fad9 100644 --- a/runtime/context_test.go +++ b/runtime/context_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/gengo/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/runtime" "golang.org/x/net/context" "google.golang.org/grpc/metadata" ) diff --git a/runtime/errors_test.go b/runtime/errors_test.go index 3cc9acfde35..2bdfca637c1 100644 --- a/runtime/errors_test.go +++ b/runtime/errors_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/gengo/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/runtime" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/runtime/handler.go b/runtime/handler.go index a9c48782cfa..bafa4285f91 100644 --- a/runtime/handler.go +++ b/runtime/handler.go @@ -6,8 +6,8 @@ import ( "net/http" "net/textproto" - "github.com/gengo/grpc-gateway/runtime/internal" "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime/internal" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/grpclog" diff --git a/runtime/internal/stream_chunk.proto b/runtime/internal/stream_chunk.proto index c076b9b3be8..f7fba56c35b 100644 --- a/runtime/internal/stream_chunk.proto +++ b/runtime/internal/stream_chunk.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package gengo.grpc.gateway.runtime; +package grpc.gateway.runtime; option go_package = "internal"; // StreamError is a response type which is returned when diff --git a/runtime/marshal_json_test.go b/runtime/marshal_json_test.go index e476db588d5..e6efa291072 100644 --- a/runtime/marshal_json_test.go +++ b/runtime/marshal_json_test.go @@ -7,13 +7,13 @@ import ( "strings" "testing" - "github.com/gengo/grpc-gateway/examples/examplepb" - "github.com/gengo/grpc-gateway/runtime" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/empty" structpb "github.com/golang/protobuf/ptypes/struct" "github.com/golang/protobuf/ptypes/timestamp" "github.com/golang/protobuf/ptypes/wrappers" + "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb" + "github.com/grpc-ecosystem/grpc-gateway/runtime" ) func TestJSONBuiltinMarshal(t *testing.T) { diff --git a/runtime/marshal_jsonpb_test.go b/runtime/marshal_jsonpb_test.go index 9b72f6d9ee3..01e7ce87251 100644 --- a/runtime/marshal_jsonpb_test.go +++ b/runtime/marshal_jsonpb_test.go @@ -6,8 +6,6 @@ import ( "strings" "testing" - "github.com/gengo/grpc-gateway/examples/examplepb" - "github.com/gengo/grpc-gateway/runtime" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/duration" @@ -15,6 +13,8 @@ import ( structpb "github.com/golang/protobuf/ptypes/struct" "github.com/golang/protobuf/ptypes/timestamp" "github.com/golang/protobuf/ptypes/wrappers" + "github.com/grpc-ecosystem/grpc-gateway/examples/examplepb" + "github.com/grpc-ecosystem/grpc-gateway/runtime" ) func TestJSONPbMarshal(t *testing.T) { diff --git a/runtime/marshaler_registry_test.go b/runtime/marshaler_registry_test.go index 206f6ed9a77..194de6fee11 100644 --- a/runtime/marshaler_registry_test.go +++ b/runtime/marshaler_registry_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "github.com/gengo/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/runtime" ) func TestMarshalerForRequest(t *testing.T) { diff --git a/runtime/mux_test.go b/runtime/mux_test.go index fcea9867874..bb90a7306a1 100644 --- a/runtime/mux_test.go +++ b/runtime/mux_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "github.com/gengo/grpc-gateway/runtime" - "github.com/gengo/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" ) func TestMuxServeHTTP(t *testing.T) { diff --git a/runtime/pattern.go b/runtime/pattern.go index 1c3aa1110db..3947dbea023 100644 --- a/runtime/pattern.go +++ b/runtime/pattern.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/gengo/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/utilities" "google.golang.org/grpc/grpclog" ) diff --git a/runtime/pattern_test.go b/runtime/pattern_test.go index 55d6cb8b161..8f5a664aba5 100644 --- a/runtime/pattern_test.go +++ b/runtime/pattern_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/gengo/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/utilities" ) const ( diff --git a/runtime/query.go b/runtime/query.go index 3455b2b728d..56a919a52f1 100644 --- a/runtime/query.go +++ b/runtime/query.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "github.com/gengo/grpc-gateway/utilities" "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/utilities" "google.golang.org/grpc/grpclog" ) diff --git a/runtime/query_test.go b/runtime/query_test.go index 968baa4149d..cf2d4285616 100644 --- a/runtime/query_test.go +++ b/runtime/query_test.go @@ -4,9 +4,9 @@ import ( "net/url" "testing" - "github.com/gengo/grpc-gateway/runtime" - "github.com/gengo/grpc-gateway/utilities" "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" ) func TestPopulateParameters(t *testing.T) { diff --git a/utilities/trie_test.go b/utilities/trie_test.go index e5d0271dc52..0178aa827a0 100644 --- a/utilities/trie_test.go +++ b/utilities/trie_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/gengo/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/utilities" ) func TestMaxCommonPrefix(t *testing.T) { From bd3e28b8fcb02c25597d099df30871c5a003c0b0 Mon Sep 17 00:00:00 2001 From: Yuki Yugui Sonoda Date: Wed, 13 Jul 2016 14:43:50 +0900 Subject: [PATCH 2/2] Regenerate automatically generated files --- examples/examplepb/a_bit_of_everything.pb.go | 212 +++++++++--------- .../examplepb/a_bit_of_everything.pb.gw.go | 8 +- examples/examplepb/echo_service.pb.go | 42 ++-- examples/examplepb/echo_service.pb.gw.go | 4 +- examples/examplepb/flow_combination.pb.go | 127 ++++++----- examples/examplepb/flow_combination.pb.gw.go | 4 +- examples/examplepb/stream.pb.go | 74 +++--- examples/examplepb/stream.pb.gw.go | 6 +- examples/sub/message.pb.go | 15 +- examples/sub2/message.pb.go | 10 +- runtime/internal/stream_chunk.pb.go | 28 +-- 11 files changed, 264 insertions(+), 266 deletions(-) diff --git a/examples/examplepb/a_bit_of_everything.pb.go b/examples/examplepb/a_bit_of_everything.pb.go index b5d656b7b05..3b919655a4c 100644 --- a/examples/examplepb/a_bit_of_everything.pb.go +++ b/examples/examplepb/a_bit_of_everything.pb.go @@ -7,10 +7,10 @@ package examplepb import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import _ "github.com/gengo/grpc-gateway/third_party/googleapis/google/api" +import _ "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api" import google_protobuf1 "github.com/golang/protobuf/ptypes/empty" -import gengo_grpc_gateway_examples_sub "github.com/gengo/grpc-gateway/examples/sub" -import sub2 "github.com/gengo/grpc-gateway/examples/sub2" +import grpc_gateway_examples_sub "github.com/grpc-ecosystem/grpc-gateway/examples/sub" +import sub2 "github.com/grpc-ecosystem/grpc-gateway/examples/sub2" import ( context "golang.org/x/net/context" @@ -89,7 +89,7 @@ type ABitOfEverything struct { StringValue string `protobuf:"bytes,11,opt,name=string_value,json=stringValue" json:"string_value,omitempty"` // TODO(yugui) add bytes_value Uint32Value uint32 `protobuf:"varint,13,opt,name=uint32_value,json=uint32Value" json:"uint32_value,omitempty"` - EnumValue NumericEnum `protobuf:"varint,14,opt,name=enum_value,json=enumValue,enum=gengo.grpc.gateway.examples.examplepb.NumericEnum" json:"enum_value,omitempty"` + EnumValue NumericEnum `protobuf:"varint,14,opt,name=enum_value,json=enumValue,enum=grpc.gateway.examples.examplepb.NumericEnum" json:"enum_value,omitempty"` Sfixed32Value int32 `protobuf:"fixed32,15,opt,name=sfixed32_value,json=sfixed32Value" json:"sfixed32_value,omitempty"` Sfixed64Value int64 `protobuf:"fixed64,16,opt,name=sfixed64_value,json=sfixed64Value" json:"sfixed64_value,omitempty"` Sint32Value int32 `protobuf:"zigzag32,17,opt,name=sint32_value,json=sint32Value" json:"sint32_value,omitempty"` @@ -99,7 +99,7 @@ type ABitOfEverything struct { // *ABitOfEverything_OneofEmpty // *ABitOfEverything_OneofString OneofValue isABitOfEverything_OneofValue `protobuf_oneof:"oneof_value"` - MapValue map[string]NumericEnum `protobuf:"bytes,22,rep,name=map_value,json=mapValue" json:"map_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=gengo.grpc.gateway.examples.examplepb.NumericEnum"` + MapValue map[string]NumericEnum `protobuf:"bytes,22,rep,name=map_value,json=mapValue" json:"map_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=grpc.gateway.examples.examplepb.NumericEnum"` MappedStringValue map[string]string `protobuf:"bytes,23,rep,name=mapped_string_value,json=mappedStringValue" json:"mapped_string_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` MappedNestedValue map[string]*ABitOfEverything_Nested `protobuf:"bytes,24,rep,name=mapped_nested_value,json=mappedNestedValue" json:"mapped_nested_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` NonConventionalNameValue string `protobuf:"bytes,26,opt,name=nonConventionalNameValue" json:"nonConventionalNameValue,omitempty"` @@ -255,7 +255,7 @@ type ABitOfEverything_Nested struct { // name is nested field. Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` Amount uint32 `protobuf:"varint,2,opt,name=amount" json:"amount,omitempty"` - Ok ABitOfEverything_Nested_DeepEnum `protobuf:"varint,3,opt,name=ok,enum=gengo.grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum" json:"ok,omitempty"` + Ok ABitOfEverything_Nested_DeepEnum `protobuf:"varint,3,opt,name=ok,enum=grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum" json:"ok,omitempty"` } func (m *ABitOfEverything_Nested) Reset() { *m = ABitOfEverything_Nested{} } @@ -264,10 +264,10 @@ func (*ABitOfEverything_Nested) ProtoMessage() {} func (*ABitOfEverything_Nested) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} } func init() { - proto.RegisterType((*ABitOfEverything)(nil), "gengo.grpc.gateway.examples.examplepb.ABitOfEverything") - proto.RegisterType((*ABitOfEverything_Nested)(nil), "gengo.grpc.gateway.examples.examplepb.ABitOfEverything.Nested") - proto.RegisterEnum("gengo.grpc.gateway.examples.examplepb.NumericEnum", NumericEnum_name, NumericEnum_value) - proto.RegisterEnum("gengo.grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum", ABitOfEverything_Nested_DeepEnum_name, ABitOfEverything_Nested_DeepEnum_value) + proto.RegisterType((*ABitOfEverything)(nil), "grpc.gateway.examples.examplepb.ABitOfEverything") + proto.RegisterType((*ABitOfEverything_Nested)(nil), "grpc.gateway.examples.examplepb.ABitOfEverything.Nested") + proto.RegisterEnum("grpc.gateway.examples.examplepb.NumericEnum", NumericEnum_name, NumericEnum_value) + proto.RegisterEnum("grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum", ABitOfEverything_Nested_DeepEnum_name, ABitOfEverything_Nested_DeepEnum_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -286,7 +286,7 @@ type ABitOfEverythingServiceClient interface { Lookup(ctx context.Context, in *sub2.IdMessage, opts ...grpc.CallOption) (*ABitOfEverything, error) Update(ctx context.Context, in *ABitOfEverything, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) Delete(ctx context.Context, in *sub2.IdMessage, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) - Echo(ctx context.Context, in *gengo_grpc_gateway_examples_sub.StringMessage, opts ...grpc.CallOption) (*gengo_grpc_gateway_examples_sub.StringMessage, error) + Echo(ctx context.Context, in *grpc_gateway_examples_sub.StringMessage, opts ...grpc.CallOption) (*grpc_gateway_examples_sub.StringMessage, error) DeepPathEcho(ctx context.Context, in *ABitOfEverything, opts ...grpc.CallOption) (*ABitOfEverything, error) Timeout(ctx context.Context, in *google_protobuf1.Empty, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) } @@ -301,7 +301,7 @@ func NewABitOfEverythingServiceClient(cc *grpc.ClientConn) ABitOfEverythingServi func (c *aBitOfEverythingServiceClient) Create(ctx context.Context, in *ABitOfEverything, opts ...grpc.CallOption) (*ABitOfEverything, error) { out := new(ABitOfEverything) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Create", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Create", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -310,7 +310,7 @@ func (c *aBitOfEverythingServiceClient) Create(ctx context.Context, in *ABitOfEv func (c *aBitOfEverythingServiceClient) CreateBody(ctx context.Context, in *ABitOfEverything, opts ...grpc.CallOption) (*ABitOfEverything, error) { out := new(ABitOfEverything) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/CreateBody", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/CreateBody", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -319,7 +319,7 @@ func (c *aBitOfEverythingServiceClient) CreateBody(ctx context.Context, in *ABit func (c *aBitOfEverythingServiceClient) Lookup(ctx context.Context, in *sub2.IdMessage, opts ...grpc.CallOption) (*ABitOfEverything, error) { out := new(ABitOfEverything) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Lookup", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Lookup", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -328,7 +328,7 @@ func (c *aBitOfEverythingServiceClient) Lookup(ctx context.Context, in *sub2.IdM func (c *aBitOfEverythingServiceClient) Update(ctx context.Context, in *ABitOfEverything, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) { out := new(google_protobuf1.Empty) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Update", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Update", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -337,16 +337,16 @@ func (c *aBitOfEverythingServiceClient) Update(ctx context.Context, in *ABitOfEv func (c *aBitOfEverythingServiceClient) Delete(ctx context.Context, in *sub2.IdMessage, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) { out := new(google_protobuf1.Empty) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Delete", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Delete", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *aBitOfEverythingServiceClient) Echo(ctx context.Context, in *gengo_grpc_gateway_examples_sub.StringMessage, opts ...grpc.CallOption) (*gengo_grpc_gateway_examples_sub.StringMessage, error) { - out := new(gengo_grpc_gateway_examples_sub.StringMessage) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Echo", in, out, c.cc, opts...) +func (c *aBitOfEverythingServiceClient) Echo(ctx context.Context, in *grpc_gateway_examples_sub.StringMessage, opts ...grpc.CallOption) (*grpc_gateway_examples_sub.StringMessage, error) { + out := new(grpc_gateway_examples_sub.StringMessage) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Echo", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -355,7 +355,7 @@ func (c *aBitOfEverythingServiceClient) Echo(ctx context.Context, in *gengo_grpc func (c *aBitOfEverythingServiceClient) DeepPathEcho(ctx context.Context, in *ABitOfEverything, opts ...grpc.CallOption) (*ABitOfEverything, error) { out := new(ABitOfEverything) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/DeepPathEcho", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/DeepPathEcho", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -364,7 +364,7 @@ func (c *aBitOfEverythingServiceClient) DeepPathEcho(ctx context.Context, in *AB func (c *aBitOfEverythingServiceClient) Timeout(ctx context.Context, in *google_protobuf1.Empty, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) { out := new(google_protobuf1.Empty) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Timeout", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Timeout", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -379,7 +379,7 @@ type ABitOfEverythingServiceServer interface { Lookup(context.Context, *sub2.IdMessage) (*ABitOfEverything, error) Update(context.Context, *ABitOfEverything) (*google_protobuf1.Empty, error) Delete(context.Context, *sub2.IdMessage) (*google_protobuf1.Empty, error) - Echo(context.Context, *gengo_grpc_gateway_examples_sub.StringMessage) (*gengo_grpc_gateway_examples_sub.StringMessage, error) + Echo(context.Context, *grpc_gateway_examples_sub.StringMessage) (*grpc_gateway_examples_sub.StringMessage, error) DeepPathEcho(context.Context, *ABitOfEverything) (*ABitOfEverything, error) Timeout(context.Context, *google_protobuf1.Empty) (*google_protobuf1.Empty, error) } @@ -398,7 +398,7 @@ func _ABitOfEverythingService_Create_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Create", + FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Create", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABitOfEverythingServiceServer).Create(ctx, req.(*ABitOfEverything)) @@ -416,7 +416,7 @@ func _ABitOfEverythingService_CreateBody_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/CreateBody", + FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/CreateBody", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABitOfEverythingServiceServer).CreateBody(ctx, req.(*ABitOfEverything)) @@ -434,7 +434,7 @@ func _ABitOfEverythingService_Lookup_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Lookup", + FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Lookup", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABitOfEverythingServiceServer).Lookup(ctx, req.(*sub2.IdMessage)) @@ -452,7 +452,7 @@ func _ABitOfEverythingService_Update_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Update", + FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Update", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABitOfEverythingServiceServer).Update(ctx, req.(*ABitOfEverything)) @@ -470,7 +470,7 @@ func _ABitOfEverythingService_Delete_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Delete", + FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Delete", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABitOfEverythingServiceServer).Delete(ctx, req.(*sub2.IdMessage)) @@ -479,7 +479,7 @@ func _ABitOfEverythingService_Delete_Handler(srv interface{}, ctx context.Contex } func _ABitOfEverythingService_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(gengo_grpc_gateway_examples_sub.StringMessage) + in := new(grpc_gateway_examples_sub.StringMessage) if err := dec(in); err != nil { return nil, err } @@ -488,10 +488,10 @@ func _ABitOfEverythingService_Echo_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Echo", + FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Echo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ABitOfEverythingServiceServer).Echo(ctx, req.(*gengo_grpc_gateway_examples_sub.StringMessage)) + return srv.(ABitOfEverythingServiceServer).Echo(ctx, req.(*grpc_gateway_examples_sub.StringMessage)) } return interceptor(ctx, in, info, handler) } @@ -506,7 +506,7 @@ func _ABitOfEverythingService_DeepPathEcho_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/DeepPathEcho", + FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/DeepPathEcho", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABitOfEverythingServiceServer).DeepPathEcho(ctx, req.(*ABitOfEverything)) @@ -524,7 +524,7 @@ func _ABitOfEverythingService_Timeout_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService/Timeout", + FullMethod: "/grpc.gateway.examples.examplepb.ABitOfEverythingService/Timeout", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABitOfEverythingServiceServer).Timeout(ctx, req.(*google_protobuf1.Empty)) @@ -533,7 +533,7 @@ func _ABitOfEverythingService_Timeout_Handler(srv interface{}, ctx context.Conte } var _ABitOfEverythingService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "gengo.grpc.gateway.examples.examplepb.ABitOfEverythingService", + ServiceName: "grpc.gateway.examples.examplepb.ABitOfEverythingService", HandlerType: (*ABitOfEverythingServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -576,77 +576,77 @@ var _ABitOfEverythingService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("examples/examplepb/a_bit_of_everything.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 1150 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0xee, 0xda, 0x89, 0x13, 0x9f, 0x8d, 0x53, 0x67, 0xd2, 0xa4, 0xae, 0x0b, 0x4a, 0x30, 0x14, - 0x55, 0xa1, 0xda, 0x55, 0x37, 0x15, 0xd0, 0x48, 0x80, 0x9a, 0xc6, 0x50, 0xa4, 0x36, 0x81, 0x4d, - 0x1a, 0xa4, 0x48, 0xc8, 0x5a, 0xdb, 0x13, 0x67, 0x15, 0xef, 0xce, 0x6a, 0x7f, 0x4c, 0xad, 0x28, - 0x5c, 0x54, 0x5c, 0x72, 0xc7, 0x23, 0x20, 0x71, 0x51, 0x09, 0xde, 0x81, 0x6b, 0x2e, 0xe9, 0x23, - 0xf0, 0x20, 0x9c, 0x9d, 0xd9, 0xdd, 0xcc, 0x3a, 0x31, 0x09, 0x49, 0x05, 0x57, 0xde, 0x39, 0xe7, - 0x9b, 0xef, 0xfc, 0xcd, 0x39, 0x33, 0x86, 0x7b, 0xf4, 0x85, 0xe5, 0x78, 0x7d, 0x1a, 0xe8, 0xc9, - 0x87, 0xd7, 0xd6, 0xad, 0x56, 0xdb, 0x0e, 0x5b, 0x6c, 0xbf, 0x45, 0x07, 0xd4, 0x1f, 0x86, 0x07, - 0xb6, 0xdb, 0xd3, 0x3c, 0x9f, 0x85, 0x8c, 0xdc, 0xe9, 0x51, 0xb7, 0xc7, 0xb4, 0x9e, 0xef, 0x75, - 0xb4, 0x9e, 0x15, 0xd2, 0xef, 0xac, 0xa1, 0x96, 0x12, 0x68, 0x19, 0x41, 0xfd, 0xad, 0x1e, 0x63, - 0xbd, 0x3e, 0xd5, 0x2d, 0xcf, 0xd6, 0x2d, 0xd7, 0x65, 0xa1, 0x15, 0xda, 0xcc, 0x0d, 0x04, 0x49, - 0xfd, 0x76, 0xa2, 0xe5, 0xab, 0x76, 0xb4, 0xaf, 0x53, 0xc7, 0x0b, 0x87, 0x89, 0xb2, 0x9e, 0xf9, - 0x13, 0x44, 0x6d, 0xdd, 0xa1, 0x41, 0x60, 0xf5, 0x68, 0xba, 0x51, 0xd6, 0x19, 0x79, 0x65, 0xe3, - 0xf5, 0x2c, 0x54, 0x1f, 0xad, 0xdb, 0xe1, 0xd6, 0x7e, 0x33, 0xf3, 0x9a, 0x74, 0xa0, 0x12, 0xe0, - 0x6f, 0x9f, 0xb6, 0x5c, 0x1a, 0x84, 0xb4, 0x5b, 0xbb, 0xb5, 0xac, 0xdc, 0x55, 0x8d, 0x4f, 0xb5, - 0x0b, 0xc5, 0xa1, 0x8d, 0xf2, 0x69, 0x9b, 0x9c, 0xc5, 0x9c, 0x11, 0xa4, 0x62, 0x45, 0x08, 0x4c, - 0x44, 0x91, 0xdd, 0xad, 0x29, 0xc8, 0x5d, 0x36, 0xf9, 0x37, 0xd9, 0x85, 0x52, 0x62, 0xb1, 0xb0, - 0x5c, 0x7c, 0x03, 0x16, 0x13, 0x36, 0xb2, 0x04, 0xea, 0x7e, 0x9f, 0x59, 0x61, 0x6b, 0x60, 0xf5, - 0x23, 0x5a, 0x2b, 0xa2, 0xc9, 0x82, 0x09, 0x5c, 0xb4, 0x1b, 0x4b, 0xc8, 0x3b, 0x30, 0xd3, 0x65, - 0x51, 0x1b, 0x23, 0x16, 0x88, 0x09, 0x44, 0x28, 0xa6, 0x2a, 0x64, 0x02, 0x82, 0x1c, 0xb6, 0x1b, - 0x7e, 0xf8, 0x20, 0x41, 0x4c, 0x22, 0xa2, 0x68, 0x02, 0x17, 0x65, 0x1c, 0x91, 0x8c, 0x28, 0x21, - 0x62, 0xc2, 0x54, 0x23, 0x09, 0x22, 0x38, 0x56, 0x8d, 0x04, 0x31, 0x85, 0x88, 0x49, 0xce, 0xb1, - 0x6a, 0x08, 0xc0, 0xbb, 0x50, 0xd9, 0xb7, 0x5f, 0xd0, 0x6e, 0x46, 0x32, 0x8d, 0x90, 0x92, 0x39, - 0x93, 0x08, 0xf3, 0xa0, 0x8c, 0xa7, 0x8c, 0xa0, 0xa9, 0x04, 0x94, 0x32, 0xbd, 0x0d, 0xd0, 0x66, - 0xac, 0x9f, 0x20, 0x00, 0x11, 0xd3, 0x66, 0x39, 0x96, 0x64, 0xce, 0x06, 0xa1, 0x8f, 0xa9, 0x4a, - 0x00, 0x2a, 0xaf, 0x82, 0x2a, 0x64, 0xb9, 0x78, 0x32, 0x2b, 0x15, 0x84, 0x54, 0x44, 0x3c, 0xa9, - 0x91, 0xaf, 0x01, 0xa8, 0x1b, 0x39, 0x09, 0x60, 0x16, 0x01, 0xb3, 0x86, 0x71, 0xc1, 0x9a, 0x6d, - 0x46, 0x0e, 0xf5, 0xed, 0x4e, 0x13, 0xf7, 0x9b, 0xe5, 0x98, 0x45, 0x50, 0xde, 0x81, 0xd9, 0x20, - 0x1f, 0xdd, 0x75, 0xa4, 0xbd, 0x6e, 0x56, 0x82, 0x5c, 0x78, 0x19, 0x2c, 0xcb, 0x54, 0x15, 0x61, - 0xd5, 0x14, 0x26, 0xd5, 0x24, 0x90, 0x63, 0x98, 0x43, 0xd0, 0x1c, 0x86, 0x29, 0xc5, 0x90, 0x40, - 0x32, 0x1e, 0x82, 0x10, 0x22, 0x20, 0x29, 0x8b, 0x01, 0x0b, 0x3e, 0xf5, 0x28, 0xc6, 0xd2, 0x6d, - 0xe5, 0xb2, 0x36, 0x8f, 0xa7, 0xb4, 0x6c, 0xce, 0xa7, 0xca, 0x6d, 0x29, 0x7b, 0x0f, 0x41, 0x65, - 0x2e, 0x8d, 0xa7, 0x41, 0xdc, 0xa6, 0xb5, 0x1b, 0xbc, 0x83, 0x16, 0x35, 0xd1, 0xc4, 0x5a, 0xda, - 0xc4, 0x5a, 0x33, 0xd6, 0x3e, 0xb9, 0x66, 0x02, 0x07, 0xf3, 0x15, 0xd6, 0x77, 0x46, 0x6c, 0x15, - 0xb6, 0x6a, 0x0b, 0x71, 0x6d, 0x10, 0x23, 0x08, 0x85, 0x11, 0xd2, 0x86, 0xb2, 0x63, 0x79, 0x89, - 0x1f, 0x8b, 0xbc, 0x5b, 0x9a, 0x97, 0xed, 0x96, 0x67, 0x96, 0xc7, 0x9d, 0x6e, 0xba, 0xa1, 0x3f, - 0x34, 0xa7, 0x9d, 0x64, 0x49, 0xbe, 0x87, 0x79, 0xfc, 0xf6, 0x46, 0xa3, 0xbe, 0xc9, 0xad, 0x6d, - 0x5e, 0xc1, 0x9a, 0x97, 0xcb, 0x95, 0x30, 0x3b, 0xe7, 0x8c, 0xca, 0x25, 0xfb, 0xa2, 0x8f, 0x13, - 0xfb, 0xb5, 0x37, 0x61, 0x5f, 0x4c, 0x88, 0xd3, 0xf6, 0x25, 0x39, 0x59, 0x83, 0x9a, 0xcb, 0xdc, - 0xc7, 0xcc, 0x1d, 0x50, 0x37, 0x1e, 0xc5, 0x56, 0x7f, 0xd3, 0x72, 0xc4, 0x38, 0xa8, 0xd5, 0x79, - 0xc3, 0x8c, 0xd5, 0xd7, 0x7f, 0x53, 0xa0, 0x74, 0x32, 0xe9, 0x5c, 0x94, 0xa7, 0x93, 0x2e, 0xfe, - 0x26, 0x8b, 0x50, 0xb2, 0x1c, 0x16, 0xb9, 0x21, 0x4e, 0xba, 0xb8, 0xad, 0x92, 0x15, 0xf9, 0x06, - 0x0a, 0xec, 0x90, 0x0f, 0xa8, 0x59, 0xe3, 0x8b, 0xab, 0x4d, 0x3f, 0x6d, 0x83, 0x52, 0x8f, 0xb7, - 0x17, 0x52, 0x36, 0x96, 0x60, 0x3a, 0x5d, 0x93, 0x32, 0x4c, 0x7e, 0xfe, 0xe8, 0xe9, 0x76, 0xb3, - 0x7a, 0x8d, 0x4c, 0xc3, 0xc4, 0x8e, 0xf9, 0xbc, 0x59, 0x55, 0xea, 0x0c, 0x2a, 0xb9, 0x73, 0x40, - 0xaa, 0x50, 0x3c, 0xa4, 0xc3, 0xc4, 0xeb, 0xf8, 0x93, 0x3c, 0x81, 0x49, 0x51, 0x81, 0xc2, 0xa5, - 0x3b, 0x5d, 0x10, 0xac, 0x15, 0x3e, 0x56, 0xea, 0x1b, 0xb0, 0x78, 0xf6, 0x51, 0x38, 0xc3, 0xf2, - 0x0d, 0xd9, 0x72, 0x59, 0x66, 0xf9, 0x41, 0x49, 0x69, 0x46, 0x2b, 0x7a, 0x06, 0xcd, 0x8e, 0x4c, - 0x73, 0xf5, 0xeb, 0xe5, 0xc4, 0x8d, 0xf5, 0x4a, 0xda, 0xee, 0x5c, 0xb4, 0xb2, 0x0c, 0xaa, 0x14, - 0x75, 0x9c, 0xe5, 0xbd, 0xa6, 0xb9, 0x85, 0xf9, 0x9e, 0x82, 0xe2, 0xd6, 0x26, 0xa6, 0xdb, 0x78, - 0xad, 0xc2, 0xcd, 0x51, 0xde, 0x6d, 0xea, 0x0f, 0xec, 0x0e, 0x25, 0xaf, 0x8a, 0x50, 0x7a, 0xec, - 0xc7, 0x23, 0x85, 0x7c, 0x74, 0x49, 0x17, 0xeb, 0x97, 0xdd, 0xd8, 0xf8, 0xb5, 0xf0, 0xf2, 0xcf, - 0xbf, 0x7e, 0x2a, 0xfc, 0x52, 0x68, 0xfc, 0x5c, 0xd0, 0x07, 0xf7, 0xd3, 0x07, 0xce, 0x59, 0xcf, - 0x1b, 0xfd, 0x48, 0xba, 0x55, 0x8f, 0xf5, 0x23, 0xf9, 0x0a, 0xc5, 0xa5, 0x34, 0x55, 0x8f, 0xf5, - 0x80, 0x7a, 0x96, 0x6f, 0x85, 0xcc, 0xd7, 0x8f, 0xa2, 0x9c, 0xe2, 0x48, 0x9a, 0xcf, 0xb8, 0xca, - 0x0d, 0xf5, 0x74, 0x2d, 0xe9, 0x4f, 0x2e, 0x35, 0x5c, 0xc8, 0x63, 0xe9, 0x13, 0x5c, 0x78, 0x3e, - 0x45, 0xbc, 0xbe, 0x72, 0x2c, 0x8c, 0x48, 0xdb, 0x82, 0x51, 0x9e, 0x60, 0xd4, 0x50, 0x30, 0xb2, - 0x21, 0xef, 0xe4, 0xb8, 0x3e, 0x3f, 0x26, 0xaf, 0x14, 0x00, 0x51, 0xac, 0x75, 0xd6, 0x1d, 0xfe, - 0x0f, 0x05, 0x5b, 0xe1, 0xf5, 0x7a, 0xaf, 0xb1, 0x74, 0x4e, 0xb5, 0xd6, 0x94, 0x15, 0xf2, 0x12, - 0xa7, 0xd2, 0x53, 0xc6, 0x0e, 0x23, 0x8f, 0x5c, 0xd7, 0xe2, 0xe7, 0xa0, 0xf6, 0x65, 0xf7, 0x99, - 0x78, 0x10, 0x5e, 0xde, 0x01, 0x8d, 0x3b, 0x70, 0x97, 0xbc, 0x7f, 0xee, 0x71, 0x89, 0x1f, 0x79, - 0xc7, 0xe4, 0x47, 0x74, 0xe2, 0xb9, 0xd7, 0xbd, 0xd2, 0xf1, 0x1e, 0x73, 0x93, 0x36, 0xee, 0x73, - 0x5f, 0x3e, 0xa8, 0x5f, 0xd0, 0x97, 0x38, 0x27, 0x16, 0x94, 0x36, 0x68, 0x9f, 0xa2, 0x37, 0xa7, - 0x52, 0x32, 0xce, 0x4a, 0x12, 0xf1, 0xca, 0x45, 0x23, 0xfe, 0x43, 0x81, 0x89, 0x66, 0xe7, 0x80, - 0x11, 0xed, 0x1f, 0xe3, 0x45, 0xeb, 0x9a, 0x18, 0x86, 0xa9, 0x03, 0xff, 0x12, 0xdf, 0xe8, 0x70, - 0xc7, 0xbe, 0x25, 0xf7, 0xce, 0x73, 0x8c, 0xa2, 0x37, 0xfa, 0x91, 0x38, 0xdd, 0x7b, 0xb7, 0x1a, - 0x55, 0x7d, 0x60, 0x64, 0xf8, 0x58, 0xb7, 0x26, 0x66, 0xdb, 0x1e, 0x21, 0xa7, 0x54, 0xe4, 0x77, - 0x05, 0x66, 0xe2, 0xbb, 0xe4, 0x2b, 0x2b, 0x3c, 0xe0, 0x51, 0xfd, 0xf7, 0x67, 0xfe, 0x33, 0x1e, - 0xe7, 0xc3, 0xc6, 0x83, 0x73, 0x0b, 0x90, 0xfb, 0x23, 0xa3, 0xc5, 0x77, 0x2f, 0x2f, 0xfa, 0x2e, - 0x4c, 0xed, 0xd8, 0x0e, 0x65, 0x51, 0x48, 0xc6, 0x14, 0x79, 0x6c, 0xf1, 0x6f, 0x73, 0xdb, 0x0b, - 0x64, 0x5e, 0x4e, 0x4c, 0x28, 0xc8, 0xd6, 0xd5, 0xbd, 0x72, 0xe6, 0x76, 0xbb, 0xc4, 0x77, 0xae, - 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x03, 0x1c, 0x09, 0x2e, 0x0e, 0x00, 0x00, + // 1144 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x57, 0x4d, 0x4f, 0x1b, 0x47, + 0x18, 0xce, 0xda, 0x60, 0xf0, 0xbb, 0x18, 0xcc, 0x10, 0x88, 0xe3, 0xb4, 0x82, 0xba, 0x1f, 0x42, + 0x14, 0xed, 0x0a, 0x13, 0x55, 0x09, 0x52, 0x15, 0x41, 0x70, 0x95, 0xaa, 0x09, 0xa4, 0x4b, 0x92, + 0x03, 0x6a, 0x64, 0xad, 0xf1, 0x60, 0x56, 0x78, 0x77, 0x56, 0xfb, 0xe1, 0x62, 0x51, 0x7a, 0xe8, + 0xa1, 0x7f, 0xa0, 0x87, 0x9e, 0x9a, 0x4b, 0xa5, 0xaa, 0x97, 0x1e, 0x7b, 0xee, 0x8f, 0xe8, 0x5f, + 0xe8, 0x0f, 0xe9, 0xbb, 0x33, 0xbb, 0xcb, 0xac, 0xc1, 0x32, 0x1f, 0x52, 0x4e, 0xde, 0x99, 0x79, + 0xde, 0xe7, 0x79, 0x3f, 0xf6, 0x7d, 0x67, 0x0d, 0xab, 0xf4, 0xc4, 0xb4, 0xdd, 0x2e, 0xf5, 0xf5, + 0xf8, 0xc1, 0x6d, 0xe9, 0x66, 0xb3, 0x65, 0x05, 0x4d, 0x76, 0xd8, 0xa4, 0x3d, 0xea, 0xf5, 0x83, + 0x23, 0xcb, 0xe9, 0x68, 0xae, 0xc7, 0x02, 0x46, 0x16, 0x3b, 0x9e, 0x7b, 0xa0, 0x75, 0xcc, 0x80, + 0x7e, 0x6f, 0xf6, 0xb5, 0xc4, 0x54, 0x4b, 0x4d, 0xab, 0x1f, 0x74, 0x18, 0xeb, 0x74, 0xa9, 0x6e, + 0xba, 0x96, 0x6e, 0x3a, 0x0e, 0x0b, 0xcc, 0xc0, 0x62, 0x8e, 0x2f, 0xcc, 0xab, 0x0f, 0xe2, 0x53, + 0xbe, 0x6a, 0x85, 0x87, 0x3a, 0xb5, 0xdd, 0xa0, 0x1f, 0x1f, 0x56, 0x53, 0x4f, 0xfc, 0xb0, 0xa5, + 0xdb, 0xd4, 0xf7, 0xcd, 0x0e, 0x4d, 0x0c, 0xe5, 0xb3, 0x7a, 0xf6, 0xb0, 0xf6, 0xdb, 0x34, 0x94, + 0x37, 0xb7, 0xac, 0x60, 0xf7, 0xb0, 0x91, 0xfa, 0x4b, 0xde, 0x42, 0xc9, 0xc7, 0xdf, 0x2e, 0x6d, + 0x3a, 0xd4, 0x0f, 0x68, 0xbb, 0x72, 0x7f, 0x49, 0x59, 0x56, 0xeb, 0x8f, 0xb4, 0x11, 0x11, 0x68, + 0x83, 0x4c, 0xda, 0x0e, 0xb7, 0x37, 0xa6, 0x04, 0x9d, 0x58, 0x11, 0x02, 0x63, 0x61, 0x68, 0xb5, + 0x2b, 0x0a, 0xb2, 0x16, 0x0d, 0xfe, 0x4c, 0x5e, 0x42, 0x21, 0xd6, 0xca, 0x2d, 0xe5, 0x6f, 0xa5, + 0x15, 0xf3, 0x90, 0x45, 0x50, 0x0f, 0xbb, 0xcc, 0x0c, 0x9a, 0x3d, 0xb3, 0x1b, 0xd2, 0x4a, 0x1e, + 0xc5, 0x72, 0x06, 0xf0, 0xad, 0x37, 0xd1, 0x0e, 0xf9, 0x08, 0xa6, 0xda, 0x2c, 0x6c, 0x61, 0x94, + 0x02, 0x31, 0x86, 0x08, 0xc5, 0x50, 0xc5, 0x9e, 0x80, 0x20, 0x87, 0xe5, 0x04, 0x5f, 0x3c, 0x8c, + 0x11, 0xe3, 0x88, 0xc8, 0x1b, 0xc0, 0xb7, 0x52, 0x8e, 0x50, 0x46, 0x14, 0x10, 0x31, 0x66, 0xa8, + 0xa1, 0x04, 0x11, 0x1c, 0xeb, 0xf5, 0x18, 0x31, 0x81, 0x88, 0x71, 0xce, 0xb1, 0x5e, 0x17, 0x80, + 0x8f, 0xa1, 0x74, 0x68, 0x9d, 0xd0, 0x76, 0x4a, 0x32, 0x89, 0x90, 0x82, 0x31, 0x15, 0x6f, 0x66, + 0x41, 0x29, 0x4f, 0x11, 0x41, 0x13, 0x31, 0x28, 0x61, 0xfa, 0x10, 0xa0, 0xc5, 0x58, 0x37, 0x46, + 0x00, 0x22, 0x26, 0x8d, 0x62, 0xb4, 0x93, 0x3a, 0xeb, 0x07, 0x1e, 0xa6, 0x2a, 0x06, 0xa8, 0x3c, + 0xff, 0xaa, 0xd8, 0xcb, 0xc4, 0x93, 0xaa, 0x94, 0x10, 0x52, 0x12, 0xf1, 0x24, 0x22, 0xdf, 0x00, + 0x50, 0x27, 0xb4, 0x63, 0xc0, 0x34, 0x02, 0xa6, 0xeb, 0xab, 0x23, 0xab, 0xb5, 0x13, 0xda, 0xd4, + 0xb3, 0x0e, 0x1a, 0x68, 0x69, 0x14, 0x23, 0x7b, 0x41, 0xf6, 0x29, 0x4c, 0xfb, 0xd9, 0xb8, 0x66, + 0x90, 0x70, 0xc6, 0x28, 0xf9, 0x99, 0xc0, 0x52, 0x58, 0x9a, 0xa3, 0x32, 0xc2, 0xca, 0x09, 0x4c, + 0xaa, 0x86, 0x2f, 0x7b, 0x3f, 0x8b, 0xa0, 0x59, 0x0c, 0x50, 0xf2, 0x3e, 0x86, 0xa4, 0x3c, 0x04, + 0x21, 0x44, 0x40, 0x12, 0x96, 0x3a, 0xcc, 0x7b, 0xd4, 0xa5, 0x18, 0x4b, 0xbb, 0x99, 0xc9, 0xd7, + 0x1c, 0xbe, 0x99, 0x45, 0x63, 0x2e, 0x39, 0xdc, 0x93, 0xf2, 0xf6, 0x18, 0x54, 0xe6, 0xd0, 0xa8, + 0xeb, 0xa3, 0xa6, 0xac, 0xdc, 0xe5, 0xfd, 0xb2, 0xa0, 0x89, 0x96, 0xd5, 0x92, 0x96, 0xd5, 0x1a, + 0xd1, 0xe9, 0xb3, 0x3b, 0x06, 0x70, 0x30, 0x5f, 0x61, 0x65, 0xa7, 0x84, 0xa9, 0xd0, 0xaa, 0xcc, + 0x47, 0x55, 0x41, 0x8c, 0x20, 0x14, 0x22, 0xe4, 0x3b, 0x28, 0xda, 0xa6, 0x1b, 0xfb, 0xb1, 0xc0, + 0x3b, 0xe4, 0xc9, 0xf5, 0x3b, 0xe4, 0x85, 0xe9, 0x72, 0x77, 0x1b, 0x4e, 0xe0, 0xf5, 0x8d, 0x49, + 0x3b, 0x5e, 0x92, 0x13, 0x98, 0xc3, 0x67, 0x77, 0x30, 0xde, 0x7b, 0x5c, 0xe7, 0xd9, 0x8d, 0x74, + 0xdc, 0x4c, 0x7e, 0x84, 0xe0, 0xac, 0x3d, 0xb8, 0x2f, 0x29, 0x8b, 0xae, 0x8d, 0x95, 0x2b, 0xb7, + 0x53, 0x16, 0x93, 0xe0, 0xa2, 0xb2, 0xb4, 0x4f, 0x36, 0xa0, 0xe2, 0x30, 0xe7, 0x29, 0x73, 0x7a, + 0xd4, 0x89, 0xc6, 0xac, 0xd9, 0xdd, 0x31, 0x6d, 0xd1, 0xf6, 0x95, 0x2a, 0x6f, 0x8c, 0xa1, 0xe7, + 0xd5, 0x3f, 0x15, 0x28, 0x9c, 0xcf, 0x32, 0x07, 0xf7, 0x93, 0x59, 0x16, 0x3d, 0x93, 0x05, 0x28, + 0x98, 0x36, 0x0b, 0x9d, 0x00, 0x67, 0x59, 0xd4, 0x3e, 0xf1, 0x8a, 0x7c, 0x0b, 0x39, 0x76, 0xcc, + 0x07, 0xd1, 0x74, 0x7d, 0xf3, 0xa6, 0xf3, 0x4d, 0xdb, 0xa6, 0xd4, 0xe5, 0x6d, 0x84, 0x64, 0xb5, + 0x45, 0x98, 0x4c, 0xd6, 0xa4, 0x08, 0xe3, 0x5f, 0x6d, 0x3e, 0xdf, 0x6b, 0x94, 0xef, 0x90, 0x49, + 0x18, 0x7b, 0x65, 0xbc, 0x6e, 0x94, 0x95, 0xaa, 0x05, 0xa5, 0x4c, 0xd5, 0x49, 0x19, 0xf2, 0xc7, + 0xb4, 0x1f, 0xfb, 0x1b, 0x3d, 0x92, 0x2d, 0x18, 0x17, 0x59, 0xcf, 0xdd, 0xa0, 0x97, 0x85, 0xe9, + 0x46, 0xee, 0x91, 0x52, 0xdd, 0x86, 0x85, 0xcb, 0x0b, 0x7f, 0x89, 0xe6, 0x5d, 0x59, 0xb3, 0x28, + 0xb3, 0xfc, 0x98, 0xb0, 0x0c, 0x16, 0xf1, 0x12, 0x96, 0x1d, 0x99, 0xe5, 0x36, 0x77, 0xc6, 0xb9, + 0xfe, 0x56, 0x29, 0xe9, 0x64, 0xbe, 0xb5, 0xb2, 0x04, 0xaa, 0x14, 0x6e, 0x94, 0xd8, 0xfd, 0x86, + 0xb1, 0x8b, 0x29, 0x9e, 0x80, 0xfc, 0xee, 0x0e, 0x66, 0xb8, 0xfe, 0xab, 0x0a, 0xf7, 0x06, 0x79, + 0xf7, 0xa8, 0xd7, 0xb3, 0x0e, 0x28, 0x79, 0x97, 0x87, 0xc2, 0x53, 0x2f, 0x9a, 0x16, 0x64, 0xed, + 0xda, 0xce, 0x55, 0xaf, 0x6f, 0x52, 0xfb, 0x2b, 0xf7, 0xd3, 0xbf, 0xff, 0xfd, 0x92, 0xfb, 0x23, + 0x57, 0xfb, 0x3d, 0xa7, 0xf7, 0xd6, 0x92, 0xef, 0x92, 0xcb, 0xbe, 0x4a, 0xf4, 0x53, 0xe9, 0x7a, + 0x3c, 0xd3, 0x4f, 0xe5, 0xbb, 0x10, 0x97, 0xd2, 0x90, 0x3c, 0xd3, 0x7d, 0xea, 0x9a, 0x9e, 0x19, + 0x30, 0x4f, 0x3f, 0x0d, 0x33, 0x07, 0xa7, 0xd2, 0xb8, 0xc5, 0x55, 0x66, 0x46, 0x27, 0x6b, 0xe9, + 0xfc, 0xfc, 0x76, 0xc2, 0x85, 0x3c, 0x6b, 0xbe, 0xc4, 0x85, 0xeb, 0x51, 0xc4, 0xeb, 0x2b, 0x67, + 0x42, 0x44, 0x32, 0xf3, 0x07, 0x79, 0xfc, 0x41, 0x21, 0x7f, 0xc0, 0x20, 0xeb, 0xe4, 0xb0, 0x46, + 0x3e, 0x23, 0xef, 0x14, 0x00, 0x51, 0xa0, 0x2d, 0xd6, 0xee, 0xbf, 0xa7, 0x22, 0xad, 0xf0, 0x1a, + 0x7d, 0x52, 0x5b, 0x1c, 0x51, 0xa1, 0x0d, 0x65, 0x85, 0xfc, 0x00, 0x85, 0xe7, 0x8c, 0x1d, 0x87, + 0x2e, 0x99, 0xd1, 0xa2, 0xcf, 0x37, 0xed, 0xeb, 0xf6, 0x0b, 0xf1, 0x01, 0x77, 0x13, 0x65, 0x8d, + 0x2b, 0x2f, 0x93, 0xcf, 0x46, 0xbe, 0x1b, 0xd1, 0x47, 0xd9, 0x19, 0xf9, 0x19, 0x07, 0xdd, 0x6b, + 0xb7, 0x7d, 0xc3, 0xf7, 0x77, 0xc8, 0xfd, 0x57, 0x5b, 0xe3, 0x5e, 0x7c, 0x5e, 0xbd, 0xa2, 0x17, + 0x51, 0x1a, 0x4c, 0x28, 0x6c, 0xd3, 0x2e, 0x45, 0x3f, 0x2e, 0xa4, 0x61, 0x98, 0x4a, 0x1c, 0xeb, + 0xca, 0x55, 0x63, 0xfd, 0x47, 0x81, 0xb1, 0xc6, 0xc1, 0x11, 0x23, 0xcb, 0x43, 0x22, 0x45, 0x5d, + 0x4d, 0x8c, 0xb6, 0x44, 0xfa, 0xca, 0xc8, 0xda, 0x01, 0x77, 0xe6, 0x2d, 0x59, 0x1d, 0xe5, 0x0c, + 0x45, 0x0f, 0xf4, 0x53, 0xf1, 0xe2, 0xee, 0xdf, 0xaf, 0x95, 0xf5, 0x5e, 0x3d, 0xc5, 0x47, 0x67, + 0x1b, 0x62, 0x54, 0xed, 0x13, 0x72, 0xe1, 0x88, 0xfc, 0xad, 0xc0, 0x54, 0x74, 0x1b, 0xbc, 0x34, + 0x83, 0x23, 0x1e, 0xc9, 0xfb, 0x79, 0x9d, 0x9f, 0xf0, 0xd8, 0x1e, 0xd7, 0x1e, 0x8e, 0x4c, 0x74, + 0xe6, 0x4f, 0x85, 0x16, 0xdd, 0x95, 0xbc, 0xb8, 0x6f, 0x60, 0xe2, 0x95, 0x65, 0x53, 0x16, 0x06, + 0x64, 0x48, 0x31, 0x87, 0x16, 0xf9, 0x01, 0xd7, 0x9e, 0x27, 0x73, 0x72, 0x32, 0x02, 0x41, 0xb6, + 0xa5, 0xee, 0x17, 0x53, 0xb7, 0x5b, 0x05, 0x6e, 0xb9, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x7f, 0xc8, 0x3e, 0x80, 0xb4, 0x0d, 0x00, 0x00, } diff --git a/examples/examplepb/a_bit_of_everything.pb.gw.go b/examples/examplepb/a_bit_of_everything.pb.gw.go index ae91750b167..213f5415fcd 100644 --- a/examples/examplepb/a_bit_of_everything.pb.gw.go +++ b/examples/examplepb/a_bit_of_everything.pb.gw.go @@ -13,12 +13,12 @@ import ( "io" "net/http" - "github.com/gengo/grpc-gateway/examples/sub" - "github.com/gengo/grpc-gateway/examples/sub2" - "github.com/gengo/grpc-gateway/runtime" - "github.com/gengo/grpc-gateway/utilities" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/empty" + "github.com/grpc-ecosystem/grpc-gateway/examples/sub" + "github.com/grpc-ecosystem/grpc-gateway/examples/sub2" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/examples/examplepb/echo_service.pb.go b/examples/examplepb/echo_service.pb.go index 4bafb938354..fa882fb5196 100644 --- a/examples/examplepb/echo_service.pb.go +++ b/examples/examplepb/echo_service.pb.go @@ -30,7 +30,7 @@ package examplepb import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import _ "github.com/gengo/grpc-gateway/third_party/googleapis/google/api" +import _ "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api" import ( context "golang.org/x/net/context" @@ -60,7 +60,7 @@ func (*SimpleMessage) ProtoMessage() {} func (*SimpleMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func init() { - proto.RegisterType((*SimpleMessage)(nil), "gengo.grpc.gateway.examples.examplepb.SimpleMessage") + proto.RegisterType((*SimpleMessage)(nil), "grpc.gateway.examples.examplepb.SimpleMessage") } // Reference imports to suppress errors if they are not otherwise used. @@ -93,7 +93,7 @@ func NewEchoServiceClient(cc *grpc.ClientConn) EchoServiceClient { func (c *echoServiceClient) Echo(ctx context.Context, in *SimpleMessage, opts ...grpc.CallOption) (*SimpleMessage, error) { out := new(SimpleMessage) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.EchoService/Echo", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.EchoService/Echo", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -102,7 +102,7 @@ func (c *echoServiceClient) Echo(ctx context.Context, in *SimpleMessage, opts .. func (c *echoServiceClient) EchoBody(ctx context.Context, in *SimpleMessage, opts ...grpc.CallOption) (*SimpleMessage, error) { out := new(SimpleMessage) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.EchoService/EchoBody", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.EchoService/EchoBody", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -135,7 +135,7 @@ func _EchoService_Echo_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.EchoService/Echo", + FullMethod: "/grpc.gateway.examples.examplepb.EchoService/Echo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EchoServiceServer).Echo(ctx, req.(*SimpleMessage)) @@ -153,7 +153,7 @@ func _EchoService_EchoBody_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.EchoService/EchoBody", + FullMethod: "/grpc.gateway.examples.examplepb.EchoService/EchoBody", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EchoServiceServer).EchoBody(ctx, req.(*SimpleMessage)) @@ -162,7 +162,7 @@ func _EchoService_EchoBody_Handler(srv interface{}, ctx context.Context, dec fun } var _EchoService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "gengo.grpc.gateway.examples.examplepb.EchoService", + ServiceName: "grpc.gateway.examples.examplepb.EchoService", HandlerType: (*EchoServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -181,20 +181,20 @@ var _EchoService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("examples/examplepb/echo_service.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 233 bytes of a gzipped FileDescriptorProto + // 226 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x4d, 0xad, 0x48, 0xcc, 0x2d, 0xc8, 0x49, 0x2d, 0xd6, 0x87, 0x32, 0x0a, 0x92, 0xf4, 0x53, 0x93, 0x33, 0xf2, 0xe3, 0x8b, - 0x53, 0x8b, 0xca, 0x32, 0x93, 0x53, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x54, 0xd3, 0x53, - 0xf3, 0xd2, 0xf3, 0xf5, 0xd2, 0x8b, 0x0a, 0x92, 0xf5, 0xd2, 0x13, 0x4b, 0x52, 0xcb, 0x13, 0x2b, - 0xf5, 0x60, 0x3a, 0xf5, 0xe0, 0x3a, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13, - 0x0b, 0x32, 0xf5, 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0x21, 0x86, - 0x28, 0xc9, 0x73, 0xf1, 0x06, 0x67, 0x82, 0x54, 0xfa, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a, - 0xf1, 0x71, 0x31, 0x65, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x01, 0x59, 0x46, 0x7b, - 0x98, 0xb8, 0xb8, 0x5d, 0x81, 0x96, 0x07, 0x43, 0xec, 0x16, 0x9a, 0xc8, 0xc8, 0xc5, 0x02, 0xe2, - 0x0b, 0x99, 0xe8, 0x11, 0x65, 0xbf, 0x1e, 0x8a, 0xf1, 0x52, 0x64, 0xe9, 0x52, 0x92, 0x6d, 0xba, - 0xfc, 0x64, 0x32, 0x93, 0xb8, 0x92, 0xa8, 0x7e, 0x99, 0x21, 0x2c, 0x50, 0xc0, 0x41, 0xa2, 0x5f, - 0x9d, 0x99, 0x52, 0x2b, 0x34, 0x83, 0x91, 0x8b, 0x03, 0xe4, 0x26, 0xa7, 0xfc, 0x94, 0x4a, 0xba, - 0xba, 0x4b, 0x01, 0xec, 0x2e, 0x29, 0x4c, 0x77, 0xc5, 0x27, 0x01, 0x9d, 0x62, 0xc5, 0xa8, 0xe5, - 0xc4, 0x1d, 0xc5, 0x09, 0xd7, 0x9c, 0xc4, 0x06, 0x0e, 0x73, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x2a, 0x5f, 0x67, 0x79, 0xe1, 0x01, 0x00, 0x00, + 0x53, 0x8b, 0xca, 0x32, 0x93, 0x53, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xe4, 0xd3, 0x8b, + 0x0a, 0x92, 0xf5, 0xd2, 0x13, 0x4b, 0x52, 0xcb, 0x13, 0x2b, 0xf5, 0x60, 0x7a, 0xf4, 0xe0, 0x7a, + 0xa4, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13, 0x0b, 0x32, 0xf5, 0x13, 0xf3, 0xf2, + 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0x21, 0xda, 0x95, 0xe4, 0xb9, 0x78, 0x83, 0x33, + 0x41, 0x2a, 0x7d, 0x53, 0x8b, 0x8b, 0x13, 0xd3, 0x53, 0x85, 0xf8, 0xb8, 0x98, 0x32, 0x53, 0x24, + 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x80, 0x2c, 0xa3, 0x25, 0x4c, 0x5c, 0xdc, 0xae, 0x40, 0x6b, + 0x83, 0x21, 0xb6, 0x0a, 0xb5, 0x32, 0x72, 0xb1, 0x80, 0xf8, 0x42, 0x7a, 0x7a, 0x04, 0x6c, 0xd6, + 0x43, 0x31, 0x58, 0x8a, 0x44, 0xf5, 0x4a, 0xb2, 0x4d, 0x97, 0x9f, 0x4c, 0x66, 0x12, 0x57, 0x12, + 0xd5, 0x2f, 0x33, 0x84, 0x05, 0x01, 0x38, 0x00, 0xf4, 0xab, 0x33, 0x53, 0x6a, 0x85, 0x7a, 0x18, + 0xb9, 0x38, 0x40, 0xee, 0x70, 0xca, 0x4f, 0xa9, 0xa4, 0xb9, 0x5b, 0x14, 0xc0, 0x6e, 0x91, 0xc2, + 0x74, 0x4b, 0x7c, 0x12, 0xd0, 0x7a, 0x2b, 0x46, 0x2d, 0x27, 0xee, 0x28, 0x4e, 0xb8, 0xe6, 0x24, + 0x36, 0x70, 0xd8, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x26, 0x96, 0x37, 0xac, 0xc3, 0x01, + 0x00, 0x00, } diff --git a/examples/examplepb/echo_service.pb.gw.go b/examples/examplepb/echo_service.pb.gw.go index 5d4693784f1..19130064d5c 100644 --- a/examples/examplepb/echo_service.pb.gw.go +++ b/examples/examplepb/echo_service.pb.gw.go @@ -13,9 +13,9 @@ import ( "io" "net/http" - "github.com/gengo/grpc-gateway/runtime" - "github.com/gengo/grpc-gateway/utilities" "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/examples/examplepb/flow_combination.pb.go b/examples/examplepb/flow_combination.pb.go index 020e2225667..0a115f5d93c 100644 --- a/examples/examplepb/flow_combination.pb.go +++ b/examples/examplepb/flow_combination.pb.go @@ -7,7 +7,7 @@ package examplepb import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import _ "github.com/gengo/grpc-gateway/third_party/googleapis/google/api" +import _ "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api" import ( context "golang.org/x/net/context" @@ -82,11 +82,11 @@ func (m *SingleNestedProto) GetA() *UnaryProto { } func init() { - proto.RegisterType((*EmptyProto)(nil), "gengo.grpc.gateway.examples.examplepb.EmptyProto") - proto.RegisterType((*NonEmptyProto)(nil), "gengo.grpc.gateway.examples.examplepb.NonEmptyProto") - proto.RegisterType((*UnaryProto)(nil), "gengo.grpc.gateway.examples.examplepb.UnaryProto") - proto.RegisterType((*NestedProto)(nil), "gengo.grpc.gateway.examples.examplepb.NestedProto") - proto.RegisterType((*SingleNestedProto)(nil), "gengo.grpc.gateway.examples.examplepb.SingleNestedProto") + proto.RegisterType((*EmptyProto)(nil), "grpc.gateway.examples.examplepb.EmptyProto") + proto.RegisterType((*NonEmptyProto)(nil), "grpc.gateway.examples.examplepb.NonEmptyProto") + proto.RegisterType((*UnaryProto)(nil), "grpc.gateway.examples.examplepb.UnaryProto") + proto.RegisterType((*NestedProto)(nil), "grpc.gateway.examples.examplepb.NestedProto") + proto.RegisterType((*SingleNestedProto)(nil), "grpc.gateway.examples.examplepb.SingleNestedProto") } // Reference imports to suppress errors if they are not otherwise used. @@ -122,7 +122,7 @@ func NewFlowCombinationClient(cc *grpc.ClientConn) FlowCombinationClient { func (c *flowCombinationClient) RpcEmptyRpc(ctx context.Context, in *EmptyProto, opts ...grpc.CallOption) (*EmptyProto, error) { out := new(EmptyProto) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcEmptyRpc", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.FlowCombination/RpcEmptyRpc", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -130,7 +130,7 @@ func (c *flowCombinationClient) RpcEmptyRpc(ctx context.Context, in *EmptyProto, } func (c *flowCombinationClient) RpcEmptyStream(ctx context.Context, in *EmptyProto, opts ...grpc.CallOption) (FlowCombination_RpcEmptyStreamClient, error) { - stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[0], c.cc, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcEmptyStream", opts...) + stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[0], c.cc, "/grpc.gateway.examples.examplepb.FlowCombination/RpcEmptyStream", opts...) if err != nil { return nil, err } @@ -162,7 +162,7 @@ func (x *flowCombinationRpcEmptyStreamClient) Recv() (*EmptyProto, error) { } func (c *flowCombinationClient) StreamEmptyRpc(ctx context.Context, opts ...grpc.CallOption) (FlowCombination_StreamEmptyRpcClient, error) { - stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[1], c.cc, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/StreamEmptyRpc", opts...) + stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[1], c.cc, "/grpc.gateway.examples.examplepb.FlowCombination/StreamEmptyRpc", opts...) if err != nil { return nil, err } @@ -196,7 +196,7 @@ func (x *flowCombinationStreamEmptyRpcClient) CloseAndRecv() (*EmptyProto, error } func (c *flowCombinationClient) StreamEmptyStream(ctx context.Context, opts ...grpc.CallOption) (FlowCombination_StreamEmptyStreamClient, error) { - stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[2], c.cc, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/StreamEmptyStream", opts...) + stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[2], c.cc, "/grpc.gateway.examples.examplepb.FlowCombination/StreamEmptyStream", opts...) if err != nil { return nil, err } @@ -228,7 +228,7 @@ func (x *flowCombinationStreamEmptyStreamClient) Recv() (*EmptyProto, error) { func (c *flowCombinationClient) RpcBodyRpc(ctx context.Context, in *NonEmptyProto, opts ...grpc.CallOption) (*EmptyProto, error) { out := new(EmptyProto) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcBodyRpc", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.FlowCombination/RpcBodyRpc", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -237,7 +237,7 @@ func (c *flowCombinationClient) RpcBodyRpc(ctx context.Context, in *NonEmptyProt func (c *flowCombinationClient) RpcPathSingleNestedRpc(ctx context.Context, in *SingleNestedProto, opts ...grpc.CallOption) (*EmptyProto, error) { out := new(EmptyProto) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcPathSingleNestedRpc", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.FlowCombination/RpcPathSingleNestedRpc", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -246,7 +246,7 @@ func (c *flowCombinationClient) RpcPathSingleNestedRpc(ctx context.Context, in * func (c *flowCombinationClient) RpcPathNestedRpc(ctx context.Context, in *NestedProto, opts ...grpc.CallOption) (*EmptyProto, error) { out := new(EmptyProto) - err := grpc.Invoke(ctx, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcPathNestedRpc", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/grpc.gateway.examples.examplepb.FlowCombination/RpcPathNestedRpc", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -254,7 +254,7 @@ func (c *flowCombinationClient) RpcPathNestedRpc(ctx context.Context, in *Nested } func (c *flowCombinationClient) RpcBodyStream(ctx context.Context, in *NonEmptyProto, opts ...grpc.CallOption) (FlowCombination_RpcBodyStreamClient, error) { - stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[3], c.cc, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcBodyStream", opts...) + stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[3], c.cc, "/grpc.gateway.examples.examplepb.FlowCombination/RpcBodyStream", opts...) if err != nil { return nil, err } @@ -286,7 +286,7 @@ func (x *flowCombinationRpcBodyStreamClient) Recv() (*EmptyProto, error) { } func (c *flowCombinationClient) RpcPathSingleNestedStream(ctx context.Context, in *SingleNestedProto, opts ...grpc.CallOption) (FlowCombination_RpcPathSingleNestedStreamClient, error) { - stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[4], c.cc, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcPathSingleNestedStream", opts...) + stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[4], c.cc, "/grpc.gateway.examples.examplepb.FlowCombination/RpcPathSingleNestedStream", opts...) if err != nil { return nil, err } @@ -318,7 +318,7 @@ func (x *flowCombinationRpcPathSingleNestedStreamClient) Recv() (*EmptyProto, er } func (c *flowCombinationClient) RpcPathNestedStream(ctx context.Context, in *NestedProto, opts ...grpc.CallOption) (FlowCombination_RpcPathNestedStreamClient, error) { - stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[5], c.cc, "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcPathNestedStream", opts...) + stream, err := grpc.NewClientStream(ctx, &_FlowCombination_serviceDesc.Streams[5], c.cc, "/grpc.gateway.examples.examplepb.FlowCombination/RpcPathNestedStream", opts...) if err != nil { return nil, err } @@ -378,7 +378,7 @@ func _FlowCombination_RpcEmptyRpc_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcEmptyRpc", + FullMethod: "/grpc.gateway.examples.examplepb.FlowCombination/RpcEmptyRpc", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FlowCombinationServer).RpcEmptyRpc(ctx, req.(*EmptyProto)) @@ -469,7 +469,7 @@ func _FlowCombination_RpcBodyRpc_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcBodyRpc", + FullMethod: "/grpc.gateway.examples.examplepb.FlowCombination/RpcBodyRpc", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FlowCombinationServer).RpcBodyRpc(ctx, req.(*NonEmptyProto)) @@ -487,7 +487,7 @@ func _FlowCombination_RpcPathSingleNestedRpc_Handler(srv interface{}, ctx contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcPathSingleNestedRpc", + FullMethod: "/grpc.gateway.examples.examplepb.FlowCombination/RpcPathSingleNestedRpc", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FlowCombinationServer).RpcPathSingleNestedRpc(ctx, req.(*SingleNestedProto)) @@ -505,7 +505,7 @@ func _FlowCombination_RpcPathNestedRpc_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gengo.grpc.gateway.examples.examplepb.FlowCombination/RpcPathNestedRpc", + FullMethod: "/grpc.gateway.examples.examplepb.FlowCombination/RpcPathNestedRpc", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FlowCombinationServer).RpcPathNestedRpc(ctx, req.(*NestedProto)) @@ -577,7 +577,7 @@ func (x *flowCombinationRpcPathNestedStreamServer) Send(m *EmptyProto) error { } var _FlowCombination_serviceDesc = grpc.ServiceDesc{ - ServiceName: "gengo.grpc.gateway.examples.examplepb.FlowCombination", + ServiceName: "grpc.gateway.examples.examplepb.FlowCombination", HandlerType: (*FlowCombinationServer)(nil), Methods: []grpc.MethodDesc{ { @@ -636,47 +636,46 @@ var _FlowCombination_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("examples/examplepb/flow_combination.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 658 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x96, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0x75, 0xa9, 0x84, 0xd4, 0x4b, 0x53, 0x52, 0x07, 0x85, 0x24, 0x84, 0xfe, 0x38, 0x8a, - 0x08, 0x48, 0xd8, 0x25, 0x30, 0x00, 0x0b, 0x52, 0x11, 0x8c, 0x55, 0xd5, 0xc2, 0xe2, 0x05, 0x9d, - 0x5d, 0xe3, 0x06, 0x25, 0x3e, 0xd7, 0x31, 0x0a, 0x55, 0xd5, 0x85, 0x95, 0xb1, 0x23, 0x7f, 0x02, - 0x23, 0x13, 0x6c, 0x0c, 0xcc, 0x0c, 0x95, 0xf8, 0x0b, 0x58, 0xf8, 0x0b, 0x58, 0xb9, 0x7b, 0x77, - 0xf6, 0xc5, 0x90, 0x10, 0x53, 0x90, 0x87, 0xaa, 0xf7, 0xeb, 0x3d, 0x7f, 0xde, 0xf7, 0x7d, 0xef, - 0x14, 0x7c, 0xdd, 0x7b, 0x45, 0x07, 0x61, 0xdf, 0x1b, 0x5a, 0x6a, 0x10, 0x3a, 0xd6, 0xf3, 0x3e, - 0x1b, 0x3d, 0x73, 0xd9, 0xc0, 0xe9, 0x05, 0x34, 0xee, 0xb1, 0xc0, 0x0c, 0x23, 0x16, 0x33, 0xe3, - 0xaa, 0xef, 0x05, 0x3e, 0x33, 0xfd, 0x28, 0x74, 0x4d, 0x9f, 0xc6, 0xde, 0x88, 0x1e, 0x9a, 0x49, - 0xb4, 0x99, 0x46, 0xb7, 0xda, 0x3e, 0x63, 0x7e, 0xdf, 0xb3, 0x68, 0xd8, 0xb3, 0x68, 0x10, 0xb0, - 0x18, 0x72, 0x0c, 0x65, 0x12, 0xb2, 0x80, 0xf1, 0xa3, 0x41, 0x18, 0x1f, 0x6e, 0xc3, 0xec, 0x1e, - 0xae, 0x6c, 0xb1, 0x40, 0x2f, 0x18, 0x0b, 0x18, 0xd1, 0x06, 0x5a, 0x45, 0x9d, 0xf9, 0x1d, 0x44, - 0xc5, 0xcc, 0x69, 0x94, 0xe4, 0xcc, 0x11, 0x33, 0xb7, 0x31, 0x27, 0x67, 0x2e, 0x59, 0xc6, 0xf8, - 0x69, 0x40, 0x23, 0x15, 0x57, 0xc5, 0x73, 0xc3, 0x38, 0x52, 0x91, 0x62, 0x48, 0x5e, 0xe0, 0xf2, - 0x96, 0x37, 0x8c, 0xbd, 0x3d, 0x79, 0xe0, 0x41, 0x92, 0xb8, 0xdc, 0xbd, 0x65, 0xe6, 0x2a, 0xc4, - 0xd4, 0xe9, 0x67, 0xb1, 0x3c, 0xc1, 0x4b, 0xbb, 0xbd, 0x80, 0x17, 0xfd, 0x3f, 0xbf, 0xd8, 0xfd, - 0x5c, 0xc5, 0xe7, 0x1f, 0xf3, 0x56, 0x3c, 0xd4, 0x9d, 0x30, 0xde, 0x20, 0x5c, 0xde, 0x09, 0x5d, - 0x50, 0x8c, 0xff, 0x37, 0xf2, 0x66, 0xd6, 0x12, 0xb7, 0xfe, 0x3e, 0x84, 0xd4, 0x5f, 0x9f, 0x7e, - 0x3b, 0x29, 0x55, 0xc9, 0xa2, 0xc5, 0x63, 0x2c, 0x4f, 0x6c, 0x88, 0x91, 0x71, 0x82, 0xf0, 0x62, - 0x42, 0xb3, 0x1b, 0x47, 0x1e, 0x1d, 0x14, 0x04, 0xd4, 0x04, 0xa0, 0x1a, 0x59, 0x1a, 0x03, 0x1a, - 0x02, 0xc0, 0x06, 0x02, 0x2a, 0x49, 0x53, 0xb0, 0x4c, 0x9a, 0x4a, 0xb2, 0x68, 0xa5, 0x3a, 0xc8, - 0x78, 0x8b, 0xb8, 0x49, 0x34, 0x55, 0xa1, 0x72, 0xb5, 0x01, 0xac, 0x4e, 0x2e, 0x64, 0xc1, 0xe4, - 0xa4, 0x83, 0xb8, 0x66, 0x1f, 0x4a, 0x18, 0x73, 0xa1, 0x36, 0xd9, 0x1e, 0xe8, 0x75, 0x27, 0xe7, - 0x37, 0x32, 0x97, 0xf7, 0x2c, 0x64, 0x9f, 0x10, 0xa0, 0x7d, 0x44, 0xa4, 0x02, 0xad, 0x74, 0x38, - 0x80, 0x18, 0xdc, 0x47, 0x37, 0xec, 0x4b, 0xa4, 0x09, 0x6b, 0x21, 0x8d, 0xf7, 0xad, 0x23, 0x7a, - 0x6c, 0x1d, 0x39, 0xfc, 0xcf, 0x3d, 0x16, 0x8b, 0x76, 0x62, 0xc6, 0x83, 0x97, 0x5e, 0x04, 0x11, - 0xf6, 0x0a, 0x69, 0xe9, 0x14, 0x99, 0x18, 0xc8, 0xe7, 0xda, 0x0d, 0x52, 0xd3, 0x07, 0xd2, 0x38, - 0xb1, 0xb3, 0x46, 0xda, 0x13, 0x42, 0x33, 0x47, 0x9a, 0xe4, 0x62, 0x16, 0x26, 0xdd, 0x35, 0xde, - 0x21, 0x5c, 0xe7, 0xa2, 0x6d, 0xf3, 0x9d, 0xf1, 0x57, 0x40, 0xe8, 0x78, 0x37, 0xa7, 0x22, 0xbf, - 0xbd, 0x1e, 0x67, 0xd1, 0x72, 0x1d, 0xa4, 0x5c, 0x56, 0xb5, 0x08, 0xd0, 0x9b, 0x01, 0x64, 0xe4, - 0xbc, 0x26, 0xef, 0x35, 0x08, 0x61, 0x7c, 0x47, 0xb8, 0xaa, 0x68, 0x35, 0x67, 0x37, 0x6f, 0xbf, - 0xff, 0x8d, 0x30, 0x00, 0xc2, 0x7d, 0xb2, 0x3a, 0x95, 0x70, 0xac, 0x5d, 0x33, 0x0a, 0x49, 0x9b, - 0x36, 0x65, 0x9f, 0xa7, 0x30, 0x4e, 0x4b, 0xb8, 0xa2, 0x5c, 0xad, 0xee, 0x5b, 0x61, 0xc6, 0xfe, - 0x2a, 0x8d, 0xfd, 0x05, 0x91, 0xaa, 0xb6, 0x96, 0xbc, 0x70, 0xc2, 0xdb, 0xe3, 0xc5, 0x65, 0xbc, - 0x2d, 0x8f, 0xd8, 0xc9, 0xd3, 0x26, 0x5d, 0xa6, 0x16, 0x09, 0xb9, 0x3c, 0xc5, 0xe1, 0x49, 0x62, - 0x97, 0x5f, 0x9a, 0xfa, 0xaf, 0x26, 0xd7, 0x9b, 0xeb, 0x64, 0x65, 0xaa, 0xcf, 0xf5, 0xa9, 0xb6, - 0xba, 0x48, 0x13, 0x0f, 0xf0, 0xb7, 0xe2, 0x3d, 0xc2, 0xcd, 0x09, 0x7e, 0x57, 0x0a, 0x17, 0x6a, - 0xf9, 0x6b, 0x20, 0xf2, 0x9a, 0x2a, 0x6b, 0x92, 0x13, 0x52, 0xea, 0x1f, 0x08, 0xd7, 0x32, 0xbe, - 0x57, 0xbc, 0x05, 0x59, 0x7f, 0x04, 0xa4, 0x07, 0xe4, 0xca, 0x1f, 0xad, 0xaf, 0x9b, 0x30, 0xbb, - 0xa6, 0xb4, 0x9b, 0xd3, 0x8f, 0xf0, 0x44, 0x1b, 0x68, 0xb3, 0x6c, 0xcf, 0xa7, 0x48, 0xce, 0x39, - 0xf8, 0x19, 0x76, 0xfb, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x90, 0xd0, 0xd7, 0xf8, 0x09, - 0x00, 0x00, + // 652 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x96, 0x3f, 0x6f, 0x13, 0x4d, + 0x10, 0xc6, 0xb5, 0x8e, 0xf4, 0x4a, 0x19, 0xc7, 0x89, 0x73, 0x7e, 0x65, 0x6c, 0x63, 0xe2, 0x64, + 0x89, 0x84, 0xf9, 0x77, 0x17, 0x99, 0x2a, 0x94, 0x41, 0x50, 0x5a, 0x51, 0x22, 0x9a, 0x6b, 0xd0, + 0xde, 0xf9, 0x70, 0x2c, 0xd9, 0x77, 0x97, 0xf3, 0x21, 0x13, 0x45, 0x11, 0x12, 0x0d, 0x25, 0x05, + 0x1f, 0x80, 0x92, 0x8a, 0x2f, 0x40, 0x47, 0x45, 0x83, 0x44, 0x81, 0x44, 0x47, 0x47, 0xc7, 0x97, + 0x60, 0x77, 0x76, 0xef, 0xd6, 0x07, 0x36, 0x27, 0x23, 0x4c, 0x11, 0xe5, 0x76, 0x77, 0x66, 0xf6, + 0xb7, 0xcf, 0x3c, 0x13, 0x05, 0xae, 0x7b, 0x4f, 0xd9, 0x28, 0x1c, 0x7a, 0x63, 0x4b, 0x7d, 0x84, + 0x8e, 0xf5, 0x78, 0x18, 0x4c, 0x1e, 0xb9, 0xc1, 0xc8, 0x19, 0xf8, 0x2c, 0x1e, 0x04, 0xbe, 0x19, + 0x46, 0x41, 0x1c, 0x18, 0xad, 0x7e, 0x14, 0xba, 0x66, 0x9f, 0xc5, 0xde, 0x84, 0x9d, 0x99, 0x49, + 0x9e, 0x99, 0xe6, 0x35, 0x9a, 0xfd, 0x20, 0xe8, 0x0f, 0x3d, 0x8b, 0x85, 0x03, 0x8b, 0xf9, 0x7e, + 0x10, 0x63, 0xf6, 0x58, 0xa6, 0xd3, 0x35, 0x80, 0xfb, 0xa3, 0x30, 0x3e, 0x3b, 0xc4, 0xd5, 0x3e, + 0x94, 0xba, 0x81, 0xaf, 0x37, 0x8c, 0x35, 0x20, 0xac, 0x46, 0xb6, 0x49, 0x7b, 0xf5, 0x88, 0x30, + 0xb1, 0x72, 0x6a, 0x05, 0xb9, 0x72, 0xc4, 0xca, 0xad, 0xad, 0xc8, 0x95, 0x4b, 0xb7, 0x00, 0x1e, + 0xfa, 0x2c, 0x52, 0x79, 0x65, 0x58, 0x19, 0xc7, 0x91, 0xca, 0x14, 0x9f, 0xb4, 0x07, 0xc5, 0xae, + 0x37, 0x8e, 0xbd, 0x9e, 0x0c, 0xd8, 0x4f, 0x0a, 0x17, 0x3b, 0x37, 0xcd, 0x9c, 0x27, 0x98, 0xba, + 0x70, 0x1e, 0x45, 0x17, 0x36, 0x8f, 0x07, 0x3e, 0x7f, 0xee, 0xdf, 0xb9, 0xab, 0xf3, 0x71, 0x03, + 0x36, 0x1e, 0x70, 0xe1, 0xef, 0x69, 0xdd, 0x8d, 0x67, 0x50, 0x3c, 0x0a, 0x5d, 0x14, 0x89, 0xff, + 0x36, 0xf2, 0x4b, 0x6a, 0x3d, 0x1b, 0x8b, 0x04, 0xd3, 0xea, 0xf3, 0xcf, 0xdf, 0x5e, 0x15, 0xca, + 0x74, 0xdd, 0xe2, 0x39, 0x96, 0x27, 0x0e, 0xc4, 0x97, 0xf1, 0x82, 0xc0, 0x7a, 0x42, 0x70, 0x1c, + 0x47, 0x1e, 0x1b, 0x2d, 0x11, 0xa2, 0x8e, 0x10, 0x15, 0xba, 0x39, 0x05, 0x31, 0xc6, 0x4b, 0xf7, + 0x08, 0x92, 0x48, 0x82, 0x7f, 0x20, 0x87, 0x26, 0x91, 0xf7, 0x6b, 0x45, 0xda, 0xc4, 0x78, 0x49, + 0x78, 0xe7, 0x35, 0xc9, 0xd2, 0x65, 0x69, 0x22, 0x4c, 0x95, 0xfe, 0x9f, 0x85, 0x91, 0x8b, 0x36, + 0xe1, 0xda, 0xbc, 0x2d, 0x00, 0x70, 0x41, 0x0e, 0x82, 0x1e, 0xea, 0x62, 0xe6, 0x56, 0xcf, 0x4c, + 0xde, 0x62, 0x34, 0xef, 0x09, 0xe2, 0xbc, 0x23, 0xb4, 0x84, 0x6d, 0x72, 0xf8, 0xa5, 0xe2, 0xe3, + 0x2e, 0xb9, 0x61, 0x5f, 0xa6, 0x75, 0xdc, 0x0b, 0x59, 0x7c, 0x62, 0x9d, 0xb3, 0x0b, 0xeb, 0xdc, + 0xe1, 0x3f, 0xee, 0x85, 0xd8, 0xb4, 0x13, 0x73, 0x9d, 0x3e, 0xf1, 0x22, 0xcc, 0xb0, 0x5b, 0xb4, + 0xa1, 0x4b, 0x64, 0x72, 0xb0, 0x9e, 0x6b, 0xd7, 0x68, 0x45, 0x07, 0xa4, 0x79, 0xe2, 0x64, 0x87, + 0x36, 0x67, 0xa4, 0x66, 0x42, 0xea, 0xf4, 0x52, 0x16, 0x26, 0x3d, 0x35, 0x5e, 0x13, 0xa8, 0x72, + 0xa1, 0x0e, 0xf9, 0xc9, 0xf4, 0x08, 0x0b, 0xed, 0x3a, 0xb9, 0x5a, 0xfc, 0x32, 0xf4, 0x8b, 0xe9, + 0xb7, 0x8b, 0xf2, 0x6d, 0x29, 0x7e, 0x01, 0x77, 0xdb, 0xc7, 0x5a, 0x9c, 0xd1, 0xe4, 0x3d, 0xc5, + 0xc7, 0x1b, 0x5f, 0x09, 0x94, 0x15, 0xa1, 0x66, 0xbb, 0x95, 0xdf, 0xd7, 0x3f, 0xa5, 0xf2, 0x91, + 0xea, 0x84, 0x6e, 0xcf, 0xa5, 0x9a, 0x6a, 0x4b, 0x0e, 0x7c, 0xda, 0x9c, 0x39, 0xe7, 0xbc, 0x84, + 0xf1, 0xa1, 0x00, 0x25, 0xe5, 0x58, 0x35, 0x3f, 0x4b, 0x35, 0xed, 0x17, 0x69, 0xda, 0x4f, 0x84, + 0x96, 0xb5, 0x6d, 0xe4, 0x00, 0x09, 0xdf, 0x4e, 0x3f, 0x28, 0xe3, 0x5b, 0x19, 0x62, 0x27, 0x7f, + 0x92, 0xa4, 0x83, 0xd4, 0x26, 0xa5, 0x57, 0xe6, 0xb8, 0x37, 0x29, 0xec, 0xf2, 0x81, 0xa8, 0xfe, + 0x6c, 0x60, 0x7d, 0xb8, 0x4b, 0x5b, 0x73, 0x3d, 0xac, 0xa3, 0x9a, 0x6a, 0x48, 0x66, 0x06, 0xf0, + 0xd9, 0x7f, 0x43, 0xa0, 0x3e, 0xc3, 0xcb, 0x4a, 0xd5, 0xa5, 0xdb, 0xf9, 0x1a, 0x0a, 0xbb, 0xa3, + 0x9e, 0x32, 0xab, 0xe3, 0x29, 0xe9, 0x77, 0x02, 0x95, 0x8c, 0xa7, 0x15, 0xe3, 0x12, 0x6d, 0x3d, + 0x41, 0xba, 0x53, 0x7a, 0xf5, 0xb7, 0xb6, 0xd6, 0x62, 0xe7, 0xbf, 0x23, 0xed, 0xda, 0xfc, 0x10, + 0x5e, 0x68, 0x8f, 0x1c, 0x14, 0xed, 0xd5, 0x14, 0xc9, 0xf9, 0x0f, 0xff, 0x03, 0xba, 0xf3, 0x23, + 0x00, 0x00, 0xff, 0xff, 0xaf, 0x85, 0xaf, 0x3c, 0x6d, 0x09, 0x00, 0x00, } diff --git a/examples/examplepb/flow_combination.pb.gw.go b/examples/examplepb/flow_combination.pb.gw.go index 9901591b3a4..e6569a963b5 100644 --- a/examples/examplepb/flow_combination.pb.gw.go +++ b/examples/examplepb/flow_combination.pb.gw.go @@ -13,9 +13,9 @@ import ( "io" "net/http" - "github.com/gengo/grpc-gateway/runtime" - "github.com/gengo/grpc-gateway/utilities" "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/examples/examplepb/stream.pb.go b/examples/examplepb/stream.pb.go index 190a7487160..a9c870c64f3 100644 --- a/examples/examplepb/stream.pb.go +++ b/examples/examplepb/stream.pb.go @@ -7,9 +7,9 @@ package examplepb import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import _ "github.com/gengo/grpc-gateway/third_party/googleapis/google/api" +import _ "github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api" import google_protobuf1 "github.com/golang/protobuf/ptypes/empty" -import gengo_grpc_gateway_examples_sub "github.com/gengo/grpc-gateway/examples/sub" +import grpc_gateway_examples_sub "github.com/grpc-ecosystem/grpc-gateway/examples/sub" import ( context "golang.org/x/net/context" @@ -46,7 +46,7 @@ func NewStreamServiceClient(cc *grpc.ClientConn) StreamServiceClient { } func (c *streamServiceClient) BulkCreate(ctx context.Context, opts ...grpc.CallOption) (StreamService_BulkCreateClient, error) { - stream, err := grpc.NewClientStream(ctx, &_StreamService_serviceDesc.Streams[0], c.cc, "/gengo.grpc.gateway.examples.examplepb.StreamService/BulkCreate", opts...) + stream, err := grpc.NewClientStream(ctx, &_StreamService_serviceDesc.Streams[0], c.cc, "/grpc.gateway.examples.examplepb.StreamService/BulkCreate", opts...) if err != nil { return nil, err } @@ -80,7 +80,7 @@ func (x *streamServiceBulkCreateClient) CloseAndRecv() (*google_protobuf1.Empty, } func (c *streamServiceClient) List(ctx context.Context, in *google_protobuf1.Empty, opts ...grpc.CallOption) (StreamService_ListClient, error) { - stream, err := grpc.NewClientStream(ctx, &_StreamService_serviceDesc.Streams[1], c.cc, "/gengo.grpc.gateway.examples.examplepb.StreamService/List", opts...) + stream, err := grpc.NewClientStream(ctx, &_StreamService_serviceDesc.Streams[1], c.cc, "/grpc.gateway.examples.examplepb.StreamService/List", opts...) if err != nil { return nil, err } @@ -112,7 +112,7 @@ func (x *streamServiceListClient) Recv() (*ABitOfEverything, error) { } func (c *streamServiceClient) BulkEcho(ctx context.Context, opts ...grpc.CallOption) (StreamService_BulkEchoClient, error) { - stream, err := grpc.NewClientStream(ctx, &_StreamService_serviceDesc.Streams[2], c.cc, "/gengo.grpc.gateway.examples.examplepb.StreamService/BulkEcho", opts...) + stream, err := grpc.NewClientStream(ctx, &_StreamService_serviceDesc.Streams[2], c.cc, "/grpc.gateway.examples.examplepb.StreamService/BulkEcho", opts...) if err != nil { return nil, err } @@ -121,8 +121,8 @@ func (c *streamServiceClient) BulkEcho(ctx context.Context, opts ...grpc.CallOpt } type StreamService_BulkEchoClient interface { - Send(*gengo_grpc_gateway_examples_sub.StringMessage) error - Recv() (*gengo_grpc_gateway_examples_sub.StringMessage, error) + Send(*grpc_gateway_examples_sub.StringMessage) error + Recv() (*grpc_gateway_examples_sub.StringMessage, error) grpc.ClientStream } @@ -130,12 +130,12 @@ type streamServiceBulkEchoClient struct { grpc.ClientStream } -func (x *streamServiceBulkEchoClient) Send(m *gengo_grpc_gateway_examples_sub.StringMessage) error { +func (x *streamServiceBulkEchoClient) Send(m *grpc_gateway_examples_sub.StringMessage) error { return x.ClientStream.SendMsg(m) } -func (x *streamServiceBulkEchoClient) Recv() (*gengo_grpc_gateway_examples_sub.StringMessage, error) { - m := new(gengo_grpc_gateway_examples_sub.StringMessage) +func (x *streamServiceBulkEchoClient) Recv() (*grpc_gateway_examples_sub.StringMessage, error) { + m := new(grpc_gateway_examples_sub.StringMessage) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err } @@ -206,8 +206,8 @@ func _StreamService_BulkEcho_Handler(srv interface{}, stream grpc.ServerStream) } type StreamService_BulkEchoServer interface { - Send(*gengo_grpc_gateway_examples_sub.StringMessage) error - Recv() (*gengo_grpc_gateway_examples_sub.StringMessage, error) + Send(*grpc_gateway_examples_sub.StringMessage) error + Recv() (*grpc_gateway_examples_sub.StringMessage, error) grpc.ServerStream } @@ -215,12 +215,12 @@ type streamServiceBulkEchoServer struct { grpc.ServerStream } -func (x *streamServiceBulkEchoServer) Send(m *gengo_grpc_gateway_examples_sub.StringMessage) error { +func (x *streamServiceBulkEchoServer) Send(m *grpc_gateway_examples_sub.StringMessage) error { return x.ServerStream.SendMsg(m) } -func (x *streamServiceBulkEchoServer) Recv() (*gengo_grpc_gateway_examples_sub.StringMessage, error) { - m := new(gengo_grpc_gateway_examples_sub.StringMessage) +func (x *streamServiceBulkEchoServer) Recv() (*grpc_gateway_examples_sub.StringMessage, error) { + m := new(grpc_gateway_examples_sub.StringMessage) if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err } @@ -228,7 +228,7 @@ func (x *streamServiceBulkEchoServer) Recv() (*gengo_grpc_gateway_examples_sub.S } var _StreamService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "gengo.grpc.gateway.examples.examplepb.StreamService", + ServiceName: "grpc.gateway.examples.examplepb.StreamService", HandlerType: (*StreamServiceServer)(nil), Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{ @@ -255,25 +255,25 @@ var _StreamService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("examples/examplepb/stream.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 320 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x90, 0x3b, 0x4e, 0x2b, 0x31, - 0x14, 0x86, 0xe5, 0x7b, 0x11, 0x02, 0x23, 0x1a, 0x17, 0x14, 0x06, 0x29, 0x22, 0x02, 0xf1, 0x10, - 0x3a, 0x0e, 0x50, 0x20, 0xd1, 0x11, 0x94, 0x0e, 0x44, 0x91, 0x8e, 0x26, 0xb2, 0xa3, 0x13, 0xc7, - 0x22, 0x33, 0xb6, 0xc6, 0x4e, 0x20, 0x6d, 0x56, 0x80, 0xc4, 0x02, 0x58, 0x0f, 0x35, 0x5b, 0x60, - 0x21, 0x38, 0xf3, 0xaa, 0x02, 0x04, 0xba, 0x19, 0x9f, 0xd7, 0xf7, 0x7f, 0xb4, 0x81, 0x4f, 0x32, - 0x71, 0x23, 0xf4, 0xa2, 0xfc, 0x70, 0x4a, 0xf8, 0x90, 0xa1, 0x4c, 0xc0, 0x65, 0x36, 0x58, 0xb6, - 0xaf, 0x31, 0xd5, 0x16, 0x74, 0xe6, 0xfa, 0xa0, 0x65, 0xc0, 0x47, 0x39, 0x85, 0x6a, 0x06, 0xea, - 0x19, 0xbe, 0xa3, 0xad, 0xd5, 0x23, 0x14, 0xd2, 0x19, 0x21, 0xd3, 0xd4, 0x06, 0x19, 0x8c, 0x4d, - 0x7d, 0xb1, 0x84, 0x6f, 0x97, 0xd5, 0xfc, 0x4f, 0x8d, 0x07, 0x02, 0x13, 0x17, 0xa6, 0x65, 0xf1, - 0x64, 0x01, 0x82, 0xec, 0x29, 0x13, 0x7a, 0x76, 0xd0, 0xc3, 0x09, 0x66, 0xd3, 0x30, 0x34, 0xa9, - 0x2e, 0xbb, 0x79, 0xdd, 0xed, 0xc7, 0x4a, 0x24, 0xe8, 0xbd, 0xd4, 0x58, 0xd4, 0xce, 0xde, 0xfe, - 0xd3, 0xcd, 0x6e, 0x0e, 0xdf, 0xc5, 0x6c, 0x62, 0xfa, 0xc8, 0x9e, 0x09, 0xa5, 0xed, 0xf1, 0xe8, - 0xe1, 0x3a, 0x3e, 0x06, 0x64, 0x17, 0xb0, 0x54, 0x1a, 0xb8, 0x6a, 0x9b, 0x70, 0x37, 0xe8, 0xd4, - 0xb7, 0xf9, 0x16, 0x14, 0x09, 0xa0, 0x4a, 0x00, 0x9d, 0x79, 0x82, 0xa6, 0x98, 0xbd, 0x7f, 0xbc, - 0xfc, 0x3b, 0x6a, 0xee, 0x89, 0xc9, 0x69, 0x85, 0xbf, 0x08, 0x5e, 0xa8, 0x08, 0x71, 0x49, 0x8e, - 0x0f, 0x09, 0x9b, 0x11, 0xba, 0x72, 0x63, 0x7c, 0x60, 0x5f, 0xec, 0xe4, 0x7f, 0x85, 0x6c, 0x1e, - 0xe4, 0x30, 0xbb, 0xac, 0xf1, 0x03, 0x4c, 0x8b, 0xb0, 0x57, 0x42, 0xd7, 0xe6, 0x5e, 0x3a, 0xfd, - 0xa1, 0x65, 0xf0, 0xed, 0xc1, 0xa8, 0x19, 0xa2, 0xd4, 0x38, 0x77, 0x5b, 0xc8, 0xe6, 0xbf, 0xec, - 0x5f, 0x5e, 0x12, 0x46, 0x9a, 0x5c, 0x52, 0x8b, 0xb4, 0x37, 0xee, 0xd7, 0xeb, 0xa8, 0x6a, 0x35, - 0x57, 0x74, 0xfe, 0x19, 0x00, 0x00, 0xff, 0xff, 0xde, 0x54, 0xd1, 0xb6, 0xae, 0x02, 0x00, 0x00, + // 314 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x90, 0xbd, 0x4e, 0xf3, 0x30, + 0x14, 0x86, 0xe5, 0xef, 0x43, 0x08, 0x8c, 0x58, 0x3c, 0x30, 0x18, 0xa4, 0x8a, 0x0a, 0x89, 0x82, + 0x90, 0xdd, 0xc2, 0xc6, 0x46, 0x51, 0x37, 0x10, 0x43, 0x37, 0x96, 0xca, 0xae, 0x4e, 0x5d, 0x8b, + 0x24, 0xb6, 0x62, 0x27, 0x10, 0x89, 0x89, 0x91, 0xb5, 0x37, 0xc2, 0xbd, 0x70, 0x0b, 0x5c, 0x08, + 0x6e, 0xfe, 0xa6, 0x56, 0x2d, 0x5b, 0x92, 0xf3, 0x9e, 0xbc, 0xcf, 0x79, 0x70, 0x07, 0xde, 0x44, + 0x6c, 0x23, 0x70, 0xbc, 0x7e, 0xb0, 0x92, 0x3b, 0x9f, 0x82, 0x88, 0x99, 0x4d, 0x8d, 0x37, 0xa4, + 0xa3, 0x52, 0x3b, 0x65, 0x4a, 0x78, 0x78, 0x15, 0x05, 0x6b, 0xd2, 0xac, 0x4d, 0xd3, 0x13, 0x65, + 0x8c, 0x8a, 0x80, 0x0b, 0xab, 0xb9, 0x48, 0x12, 0xe3, 0x85, 0xd7, 0x26, 0x71, 0xd5, 0x3a, 0x3d, + 0xae, 0xa7, 0xe5, 0x9b, 0xcc, 0x66, 0x1c, 0x62, 0xeb, 0x8b, 0x7a, 0x78, 0xb5, 0xa2, 0x5c, 0x4c, + 0xa4, 0xf6, 0x13, 0x33, 0x9b, 0x40, 0x0e, 0x69, 0xe1, 0xe7, 0x3a, 0x51, 0x75, 0x9a, 0xb6, 0x69, + 0x97, 0x49, 0x1e, 0x83, 0x73, 0x42, 0x41, 0x35, 0xbb, 0xfe, 0xfa, 0x8f, 0x0f, 0xc7, 0x25, 0xf6, + 0x18, 0xd2, 0x5c, 0x4f, 0x81, 0x7c, 0x22, 0x8c, 0x87, 0x59, 0xf4, 0x72, 0x1f, 0x3e, 0x7a, 0x20, + 0x03, 0xb6, 0xe1, 0x0e, 0x76, 0x37, 0xd4, 0xfe, 0x69, 0x36, 0x6a, 0x5b, 0xe9, 0x11, 0xab, 0xd8, + 0x59, 0xc3, 0xce, 0x46, 0x4b, 0xf6, 0x2e, 0xff, 0xf8, 0xfe, 0x59, 0xfc, 0xbb, 0xe8, 0x9e, 0xf1, + 0x7c, 0xd0, 0x80, 0xaf, 0xc2, 0xe6, 0x32, 0xd4, 0xdf, 0xa2, 0xcb, 0x1e, 0x22, 0xef, 0x78, 0xe7, + 0x41, 0x3b, 0x4f, 0xd6, 0xfc, 0x92, 0xfe, 0x9d, 0xae, 0x7b, 0x5e, 0x52, 0x9c, 0x92, 0xce, 0x06, + 0x8a, 0x3e, 0x22, 0x0b, 0x84, 0xf7, 0x96, 0x2a, 0x46, 0xd3, 0xb9, 0x21, 0xbd, 0x35, 0x55, 0xc1, + 0x29, 0x0b, 0x06, 0xc3, 0xc6, 0x63, 0x65, 0x96, 0x6e, 0x9d, 0xdc, 0xde, 0x08, 0x04, 0x82, 0xd2, + 0x48, 0x1f, 0x0d, 0x0f, 0x9e, 0xf7, 0xdb, 0xf3, 0xe4, 0x6e, 0x29, 0xe4, 0xe6, 0x37, 0x00, 0x00, + 0xff, 0xff, 0xbc, 0x52, 0x49, 0x85, 0x8f, 0x02, 0x00, 0x00, } diff --git a/examples/examplepb/stream.pb.gw.go b/examples/examplepb/stream.pb.gw.go index c6fcebe55ab..f0baafe8f4d 100644 --- a/examples/examplepb/stream.pb.gw.go +++ b/examples/examplepb/stream.pb.gw.go @@ -13,11 +13,11 @@ import ( "io" "net/http" - "github.com/gengo/grpc-gateway/examples/sub" - "github.com/gengo/grpc-gateway/runtime" - "github.com/gengo/grpc-gateway/utilities" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/empty" + "github.com/grpc-ecosystem/grpc-gateway/examples/sub" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/examples/sub/message.pb.go b/examples/sub/message.pb.go index 8ac5568bbf0..e5c1e15dfb9 100644 --- a/examples/sub/message.pb.go +++ b/examples/sub/message.pb.go @@ -46,19 +46,18 @@ func (m *StringMessage) GetValue() string { } func init() { - proto.RegisterType((*StringMessage)(nil), "gengo.grpc.gateway.examples.sub.StringMessage") + proto.RegisterType((*StringMessage)(nil), "grpc.gateway.examples.sub.StringMessage") } func init() { proto.RegisterFile("examples/sub/message.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 115 bytes of a gzipped FileDescriptorProto + // 109 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xad, 0x48, 0xcc, 0x2d, 0xc8, 0x49, 0x2d, 0xd6, 0x2f, 0x2e, 0x4d, 0xd2, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, - 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4f, 0x4f, 0xcd, 0x4b, 0xcf, 0xd7, 0x4b, 0x2f, - 0x2a, 0x48, 0xd6, 0x4b, 0x4f, 0x2c, 0x49, 0x2d, 0x4f, 0xac, 0xd4, 0x83, 0x29, 0xd7, 0x03, 0x2a, - 0x57, 0x52, 0xe5, 0xe2, 0x0d, 0x2e, 0x29, 0xca, 0xcc, 0x4b, 0xf7, 0x85, 0xe8, 0x13, 0x12, 0xe1, - 0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x0c, 0x82, 0x70, 0x9c, - 0x58, 0xa3, 0x98, 0x81, 0xaa, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x7f, 0x95, 0xcd, 0x6b, - 0x00, 0x00, 0x00, + 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4c, 0x2f, 0x2a, 0x48, 0xd6, 0x4b, 0x4f, 0x2c, + 0x49, 0x2d, 0x4f, 0xac, 0xd4, 0x83, 0x29, 0xd4, 0x03, 0x2a, 0x54, 0x52, 0xe5, 0xe2, 0x0d, 0x2e, + 0x29, 0xca, 0xcc, 0x4b, 0xf7, 0x85, 0xe8, 0x10, 0x12, 0xe1, 0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, + 0x95, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x0c, 0x82, 0x70, 0x9c, 0x58, 0xa3, 0x98, 0x81, 0xaa, 0x01, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x10, 0x60, 0xa9, 0x65, 0x00, 0x00, 0x00, } diff --git a/examples/sub2/message.pb.go b/examples/sub2/message.pb.go index 8f6f432b49a..37d6ee759fb 100644 --- a/examples/sub2/message.pb.go +++ b/examples/sub2/message.pb.go @@ -44,13 +44,13 @@ func init() { func init() { proto.RegisterFile("examples/sub2/message.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 124 bytes of a gzipped FileDescriptorProto + // 128 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xad, 0x48, 0xcc, 0x2d, 0xc8, 0x49, 0x2d, 0xd6, 0x2f, 0x2e, 0x4d, 0x32, 0xd2, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x01, 0x89, 0x29, 0xc9, 0x73, 0x71, 0x7a, 0xa6, 0xf8, 0x42, 0x24, 0x84, 0x84, 0xb8, 0x58, 0x4a, 0x4b, 0x33, 0x53, 0x24, 0x18, 0x15, 0x18, - 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x27, 0xdd, 0x28, 0xed, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, - 0xe4, 0xfc, 0x5c, 0xfd, 0xf4, 0xd4, 0xbc, 0xf4, 0x7c, 0xfd, 0xf4, 0xa2, 0x82, 0x64, 0xdd, 0xf4, - 0xc4, 0x92, 0xd4, 0xf2, 0xc4, 0x4a, 0x7d, 0x14, 0x3b, 0x92, 0xd8, 0xc0, 0x86, 0x1b, 0x03, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x98, 0xc9, 0xee, 0x80, 0x7b, 0x00, 0x00, 0x00, + 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x27, 0xb3, 0x28, 0x93, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, + 0xe4, 0xfc, 0x5c, 0xfd, 0xf4, 0xa2, 0x82, 0x64, 0xdd, 0xd4, 0xe4, 0xfc, 0xe2, 0xca, 0xe2, 0x92, + 0x54, 0x28, 0x37, 0x3d, 0xb1, 0x24, 0xb5, 0x3c, 0xb1, 0x52, 0x1f, 0xc5, 0xb2, 0x24, 0x36, 0xb0, + 0x2d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x53, 0x75, 0xef, 0xe0, 0x84, 0x00, 0x00, 0x00, } diff --git a/runtime/internal/stream_chunk.pb.go b/runtime/internal/stream_chunk.pb.go index b5e9069e5c0..524e0d3c34c 100644 --- a/runtime/internal/stream_chunk.pb.go +++ b/runtime/internal/stream_chunk.pb.go @@ -43,23 +43,23 @@ func (*StreamError) ProtoMessage() {} func (*StreamError) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func init() { - proto.RegisterType((*StreamError)(nil), "gengo.grpc.gateway.runtime.StreamError") + proto.RegisterType((*StreamError)(nil), "grpc.gateway.runtime.StreamError") } func init() { proto.RegisterFile("runtime/internal/stream_chunk.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 182 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x34, 0x8e, 0x3d, 0xef, 0x82, 0x30, - 0x10, 0x87, 0xc3, 0xff, 0x15, 0x8e, 0x8d, 0xa9, 0xd1, 0x41, 0xa3, 0x8b, 0x53, 0x19, 0xfc, 0x06, - 0x1a, 0xbf, 0x00, 0x6c, 0x2e, 0xa4, 0xe2, 0xa5, 0x10, 0xa5, 0x25, 0xd7, 0x23, 0xc6, 0xd5, 0x4f, - 0x2e, 0x2d, 0x32, 0xde, 0xf3, 0xdc, 0x93, 0xfc, 0x60, 0x4b, 0x83, 0xe1, 0xb6, 0xc3, 0xbc, 0x35, - 0x8c, 0x64, 0xd4, 0x3d, 0x77, 0x4c, 0xa8, 0xba, 0xaa, 0x6e, 0x06, 0x73, 0x93, 0x3d, 0x59, 0xb6, - 0xd9, 0x42, 0xa3, 0xd1, 0x56, 0x6a, 0xea, 0x6b, 0xa9, 0x15, 0xe3, 0x43, 0x3d, 0xe5, 0xa7, 0xdb, - 0xbc, 0x22, 0x48, 0xcb, 0x90, 0x9c, 0x88, 0x2c, 0x65, 0x4b, 0x48, 0xfc, 0x5f, 0x55, 0xdb, 0x2b, - 0x8a, 0x68, 0x1d, 0xed, 0x7e, 0x8b, 0xd8, 0x83, 0xe3, 0x78, 0x7b, 0xd9, 0x30, 0xf7, 0x93, 0xfc, - 0x9a, 0xa4, 0x07, 0x41, 0x0a, 0xf8, 0xef, 0xd0, 0x39, 0xa5, 0x51, 0x7c, 0x8f, 0x2a, 0x29, 0xe6, - 0x33, 0x5b, 0x41, 0x1a, 0x32, 0xc7, 0x8a, 0x07, 0x27, 0x7e, 0x82, 0x05, 0x8f, 0xca, 0x40, 0x0e, - 0x70, 0x8e, 0xe7, 0xfd, 0x97, 0xbf, 0xb0, 0x79, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x7f, - 0x7d, 0x56, 0xda, 0x00, 0x00, 0x00, + // 180 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2e, 0x2a, 0xcd, 0x2b, + 0xc9, 0xcc, 0x4d, 0xd5, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0xcc, 0xd1, 0x2f, 0x2e, 0x29, + 0x4a, 0x4d, 0xcc, 0x8d, 0x4f, 0xce, 0x28, 0xcd, 0xcb, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, + 0x12, 0x49, 0x2f, 0x2a, 0x48, 0xd6, 0x4b, 0x4f, 0x2c, 0x49, 0x2d, 0x4f, 0xac, 0xd4, 0x83, 0xea, + 0x50, 0x6a, 0x62, 0xe4, 0xe2, 0x0e, 0x06, 0x2b, 0x76, 0x2d, 0x2a, 0xca, 0x2f, 0x12, 0x92, 0xe6, + 0xe2, 0x04, 0xa9, 0x8b, 0x4f, 0xce, 0x4f, 0x49, 0x95, 0x60, 0x54, 0x60, 0xd4, 0x60, 0x0d, 0xe2, + 0x00, 0x09, 0x38, 0x03, 0xf9, 0x20, 0xc9, 0x8c, 0x92, 0x92, 0x02, 0x88, 0x24, 0x13, 0x44, 0x12, + 0x24, 0x00, 0x96, 0x94, 0xe0, 0x62, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x95, 0x60, 0x06, + 0x4a, 0x71, 0x06, 0xc1, 0xb8, 0x42, 0xf2, 0x5c, 0xdc, 0x60, 0x6d, 0xc5, 0x25, 0x89, 0x25, 0xa5, + 0xc5, 0x12, 0x2c, 0x60, 0x59, 0x2e, 0x90, 0x50, 0x30, 0x58, 0xc4, 0x89, 0x2b, 0x8a, 0x03, 0xe6, + 0xf2, 0x24, 0x36, 0xb0, 0x6b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x07, 0x92, 0xb6, + 0xd4, 0x00, 0x00, 0x00, }