fix import paths for v2 release

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-01-30 14:39:00 +03:00
parent e45a20a7f3
commit 6b5eb3555b
14 changed files with 41 additions and 41 deletions

View File

@ -9,10 +9,10 @@ import (
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/codec/bytes" "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/codec/jsonrpc" "github.com/micro/go-micro/v2/codec/jsonrpc"
"github.com/micro/go-micro/codec/protorpc" "github.com/micro/go-micro/v2/codec/protorpc"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"

View File

@ -3,7 +3,7 @@ package grpc
import ( import (
"net/http" "net/http"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/v2/errors"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
) )

View File

@ -5,7 +5,7 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
func extractValue(v reflect.Type, d int) *registry.Value { func extractValue(v reflect.Type, d int) *registry.Value {

View File

@ -5,7 +5,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
) )
type testHandler struct{} type testHandler struct{}

20
grpc.go
View File

@ -14,16 +14,16 @@ import (
"sync" "sync"
"time" "time"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/v2/errors"
meta "github.com/micro/go-micro/metadata" meta "github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/util/addr" "github.com/micro/go-micro/v2/util/addr"
mgrpc "github.com/micro/go-micro/util/grpc" mgrpc "github.com/micro/go-micro/v2/util/grpc"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
mnet "github.com/micro/go-micro/util/net" mnet "github.com/micro/go-micro/v2/util/net"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

View File

@ -4,11 +4,11 @@ import (
"context" "context"
"testing" "testing"
"github.com/micro/go-micro/registry/memory" "github.com/micro/go-micro/v2/registry/memory"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
"google.golang.org/grpc" "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. // server is used to implement helloworld.GreeterServer.

View File

@ -3,8 +3,8 @@ package grpc
import ( import (
"reflect" "reflect"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
) )
type rpcHandler struct { type rpcHandler struct {

View File

@ -4,11 +4,11 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/v2/transport"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
) )

View File

@ -11,8 +11,8 @@ import (
import ( import (
context "context" context "context"
client "github.com/micro/go-micro/client" client "github.com/micro/go-micro/v2/client"
server "github.com/micro/go-micro/server" server "github.com/micro/go-micro/v2/server"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

View File

@ -1,8 +1,8 @@
package grpc package grpc
import ( import (
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/codec/bytes" "github.com/micro/go-micro/v2/codec/bytes"
) )
type rpcRequest struct { type rpcRequest struct {

View File

@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/v2/codec"
) )
type rpcResponse struct { type rpcResponse struct {

View File

@ -14,8 +14,8 @@ import (
"unicode" "unicode"
"unicode/utf8" "unicode/utf8"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
) )
var ( var (

View File

@ -3,7 +3,7 @@ package grpc
import ( import (
"context" "context"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

View File

@ -7,12 +7,12 @@ import (
"runtime/debug" "runtime/debug"
"strings" "strings"
"github.com/micro/go-micro/broker" "github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/errors" "github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/metadata" "github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/server" "github.com/micro/go-micro/v2/server"
"github.com/micro/go-micro/util/log" "github.com/micro/go-micro/v2/util/log"
) )
const ( const (