From 6b5eb3555b76f6e3ec6b51859a3163f61394ff33 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Thu, 30 Jan 2020 14:39:00 +0300 Subject: [PATCH] fix import paths for v2 release Signed-off-by: Vasiliy Tolstov --- codec.go | 8 ++++---- error.go | 2 +- extractor.go | 2 +- extractor_test.go | 2 +- grpc.go | 20 ++++++++++---------- grpc_test.go | 6 +++--- handler.go | 4 ++-- options.go | 10 +++++----- proto/test.micro.go | 4 ++-- request.go | 4 ++-- response.go | 2 +- server.go | 4 ++-- stream.go | 2 +- subscriber.go | 12 ++++++------ 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/codec.go b/codec.go index dff9f60..cb27ec6 100644 --- a/codec.go +++ b/codec.go @@ -9,10 +9,10 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/bytes" - "github.com/micro/go-micro/codec/jsonrpc" - "github.com/micro/go-micro/codec/protorpc" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/codec/bytes" + "github.com/micro/go-micro/v2/codec/jsonrpc" + "github.com/micro/go-micro/v2/codec/protorpc" "google.golang.org/grpc" "google.golang.org/grpc/encoding" "google.golang.org/grpc/metadata" diff --git a/error.go b/error.go index 4001622..4556415 100644 --- a/error.go +++ b/error.go @@ -3,7 +3,7 @@ package grpc import ( "net/http" - "github.com/micro/go-micro/errors" + "github.com/micro/go-micro/v2/errors" "google.golang.org/grpc/codes" ) diff --git a/extractor.go b/extractor.go index 875bb1c..5576182 100644 --- a/extractor.go +++ b/extractor.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) func extractValue(v reflect.Type, d int) *registry.Value { diff --git a/extractor_test.go b/extractor_test.go index ebbd0e2..ccf9942 100644 --- a/extractor_test.go +++ b/extractor_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/micro/go-micro/registry" + "github.com/micro/go-micro/v2/registry" ) type testHandler struct{} diff --git a/grpc.go b/grpc.go index 53674aa..7a098e8 100644 --- a/grpc.go +++ b/grpc.go @@ -14,16 +14,16 @@ import ( "sync" "time" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/errors" - meta "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/addr" - mgrpc "github.com/micro/go-micro/util/grpc" - "github.com/micro/go-micro/util/log" - mnet "github.com/micro/go-micro/util/net" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/errors" + meta "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/util/addr" + mgrpc "github.com/micro/go-micro/v2/util/grpc" + "github.com/micro/go-micro/v2/util/log" + mnet "github.com/micro/go-micro/v2/util/net" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/grpc_test.go b/grpc_test.go index dcf7350..5d218cc 100644 --- a/grpc_test.go +++ b/grpc_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/micro/go-micro/registry/memory" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/registry/memory" + "github.com/micro/go-micro/v2/server" "google.golang.org/grpc" - pb "github.com/micro/go-micro/server/grpc/proto" + pb "github.com/micro/go-micro/v2/server/grpc/proto" ) // server is used to implement helloworld.GreeterServer. diff --git a/handler.go b/handler.go index f41a1fe..fb4e2bb 100644 --- a/handler.go +++ b/handler.go @@ -3,8 +3,8 @@ package grpc import ( "reflect" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" ) type rpcHandler struct { diff --git a/options.go b/options.go index c57c022..b411b88 100644 --- a/options.go +++ b/options.go @@ -4,11 +4,11 @@ import ( "context" "crypto/tls" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/transport" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/transport" "google.golang.org/grpc" "google.golang.org/grpc/encoding" ) diff --git a/proto/test.micro.go b/proto/test.micro.go index b00e7ea..5cc8a4e 100644 --- a/proto/test.micro.go +++ b/proto/test.micro.go @@ -11,8 +11,8 @@ import ( import ( context "context" - client "github.com/micro/go-micro/client" - server "github.com/micro/go-micro/server" + client "github.com/micro/go-micro/v2/client" + server "github.com/micro/go-micro/v2/server" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/request.go b/request.go index adfed48..1261bbc 100644 --- a/request.go +++ b/request.go @@ -1,8 +1,8 @@ package grpc import ( - "github.com/micro/go-micro/codec" - "github.com/micro/go-micro/codec/bytes" + "github.com/micro/go-micro/v2/codec" + "github.com/micro/go-micro/v2/codec/bytes" ) type rpcRequest struct { diff --git a/response.go b/response.go index f13ad89..e5c74fc 100644 --- a/response.go +++ b/response.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/micro/go-micro/codec" + "github.com/micro/go-micro/v2/codec" ) type rpcResponse struct { diff --git a/server.go b/server.go index 140d7e5..6d43ba1 100644 --- a/server.go +++ b/server.go @@ -14,8 +14,8 @@ import ( "unicode" "unicode/utf8" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/util/log" ) var ( diff --git a/stream.go b/stream.go index ae31a0b..9216586 100644 --- a/stream.go +++ b/stream.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/micro/go-micro/server" + "github.com/micro/go-micro/v2/server" "google.golang.org/grpc" ) diff --git a/subscriber.go b/subscriber.go index 9dd071c..c628a6e 100644 --- a/subscriber.go +++ b/subscriber.go @@ -7,12 +7,12 @@ import ( "runtime/debug" "strings" - "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/errors" - "github.com/micro/go-micro/metadata" - "github.com/micro/go-micro/registry" - "github.com/micro/go-micro/server" - "github.com/micro/go-micro/util/log" + "github.com/micro/go-micro/v2/broker" + "github.com/micro/go-micro/v2/errors" + "github.com/micro/go-micro/v2/metadata" + "github.com/micro/go-micro/v2/registry" + "github.com/micro/go-micro/v2/server" + "github.com/micro/go-micro/v2/util/log" ) const (