v3 refactor (#1868)

* Move to v3

Co-authored-by: Ben Toogood <bentoogood@gmail.com>
This commit is contained in:
Asim Aslam 2020-07-27 13:22:00 +01:00 committed by Vasiliy Tolstov
parent a384632c93
commit 046db9e178
9 changed files with 23 additions and 22 deletions

View File

@ -9,8 +9,8 @@ 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/v2/codec" "github.com/micro/go-micro/v3/codec"
"github.com/micro/go-micro/v2/codec/bytes" "github.com/micro/go-micro/v3/codec/bytes"
"github.com/oxtoacart/bpool" "github.com/oxtoacart/bpool"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"

View File

@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
"github.com/micro/go-micro/v2/errors" "github.com/micro/go-micro/v3/errors"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
) )

12
grpc.go
View File

@ -11,12 +11,12 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/micro/go-micro/v2/broker" "github.com/micro/go-micro/v3/broker"
"github.com/micro/go-micro/v2/client" "github.com/micro/go-micro/v3/client"
raw "github.com/micro/go-micro/v2/codec/bytes" raw "github.com/micro/go-micro/v3/codec/bytes"
"github.com/micro/go-micro/v2/errors" "github.com/micro/go-micro/v3/errors"
"github.com/micro/go-micro/v2/metadata" "github.com/micro/go-micro/v3/metadata"
"github.com/micro/go-micro/v2/registry" "github.com/micro/go-micro/v3/registry"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"

View File

@ -5,11 +5,12 @@ import (
"net" "net"
"testing" "testing"
"github.com/micro/go-micro/v2/client" "github.com/micro/go-micro/v3/client"
"github.com/micro/go-micro/v2/errors" "github.com/micro/go-micro/v3/errors"
"github.com/micro/go-micro/v2/registry" "github.com/micro/go-micro/v3/registry"
"github.com/micro/go-micro/v2/registry/memory" "github.com/micro/go-micro/v3/registry/memory"
"github.com/micro/go-micro/v2/router" "github.com/micro/go-micro/v3/router"
regRouter "github.com/micro/go-micro/v3/router/registry"
pgrpc "google.golang.org/grpc" pgrpc "google.golang.org/grpc"
pb "google.golang.org/grpc/examples/helloworld/helloworld" pb "google.golang.org/grpc/examples/helloworld/helloworld"
) )
@ -57,7 +58,7 @@ func TestGRPCClient(t *testing.T) {
}) })
// create router // create router
rtr := router.NewRouter(router.Registry(r)) rtr := regRouter.NewRouter(router.Registry(r))
// create client // create client
c := NewClient(client.Router(rtr)) c := NewClient(client.Router(rtr))

View File

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

View File

@ -5,7 +5,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"github.com/micro/go-micro/v2/client" "github.com/micro/go-micro/v3/client"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
) )

View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/micro/go-micro/v2/client" "github.com/micro/go-micro/v3/client"
"github.com/micro/go-micro/v2/codec" "github.com/micro/go-micro/v3/codec"
) )
type grpcRequest struct { type grpcRequest struct {

View File

@ -3,8 +3,8 @@ package grpc
import ( import (
"strings" "strings"
"github.com/micro/go-micro/v2/codec" "github.com/micro/go-micro/v3/codec"
"github.com/micro/go-micro/v2/codec/bytes" "github.com/micro/go-micro/v3/codec/bytes"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
) )

View File

@ -5,7 +5,7 @@ import (
"io" "io"
"sync" "sync"
"github.com/micro/go-micro/v2/client" "github.com/micro/go-micro/v3/client"
"google.golang.org/grpc" "google.golang.org/grpc"
) )