From 2a6dbec2493b8e6ab504481cf0fdb0bd43afa9b2 Mon Sep 17 00:00:00 2001 From: Yuki Yugui Sonoda Date: Wed, 13 Jul 2016 14:37:56 +0900 Subject: [PATCH] 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) {