unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 332 Wiki Activity

fix import paths for v2 release

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2020-01-30 14:39:00 +03:00
parent 2b1e0a6fd6
commit f23638c036
347 changed files with 864 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/client.go
View File

@@ -5,7 +5,7 @@ import (
"context"
"time"
"github.com/micro/go-micro/codec"
"github.com/micro/go-micro/v2/codec"
)
// Client is the interface used to make requests to services.

2
client/common_test.go
View File

@@ -1,7 +1,7 @@
package client
import (
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
var (

4
client/grpc/codec.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
jsoniter "github.com/json-iterator/go"
"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"
"google.golang.org/grpc"
"google.golang.org/grpc/encoding"
)

2
client/grpc/error.go
View File

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

14
client/grpc/grpc.go
View File

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

8
client/grpc/grpc_test.go
View File

@@ -5,10 +5,10 @@ import (
"net"
"testing"
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/registry/memory"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/registry/memory"
pgrpc "google.golang.org/grpc"
pb "google.golang.org/grpc/examples/helloworld/helloworld"
)

2
client/grpc/message.go
View File

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

2
client/grpc/options.go
View File

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

4
client/grpc/request.go
View File

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

4
client/grpc/response.go
View File

@@ -3,8 +3,8 @@ package grpc
import (
"strings"
"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"
"google.golang.org/grpc"
"google.golang.org/grpc/encoding"
)

2
client/grpc/stream.go
View File

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

2
client/mucp/mucp.go
View File

@@ -2,7 +2,7 @@
package mucp
import (
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/v2/client"
)
// NewClient returns a new micro client interface

10
client/options.go
View File

@@ -4,11 +4,11 @@ import (
"context"
"time"
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/codec"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/transport"
)
type Options struct {

2
client/options_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/v2/transport"
)
func TestCallOptions(t *testing.T) {

2
client/retry.go
View File

@@ -3,7 +3,7 @@ package client
import (
"context"
"github.com/micro/go-micro/errors"
"github.com/micro/go-micro/v2/errors"
)
// note that returning either false or a non-nil error will result in the call not being retried

20
client/rpc_client.go
View File

@@ -9,16 +9,16 @@ import (
"time"
"github.com/google/uuid"
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/codec"
raw "github.com/micro/go-micro/codec/bytes"
"github.com/micro/go-micro/errors"
"github.com/micro/go-micro/metadata"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/util/buf"
"github.com/micro/go-micro/util/pool"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/codec"
raw "github.com/micro/go-micro/v2/codec/bytes"
"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/transport"
"github.com/micro/go-micro/v2/util/buf"
"github.com/micro/go-micro/v2/util/pool"
)
type rpcClient struct {

8
client/rpc_client_test.go
View File

@@ -5,10 +5,10 @@ import (
"fmt"
"testing"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/errors"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/registry/memory"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/registry/memory"
)
func newTestRegistry() registry.Registry {

20
client/rpc_codec.go
View File

@@ -4,16 +4,16 @@ import (
"bytes"
errs "errors"
"github.com/micro/go-micro/codec"
raw "github.com/micro/go-micro/codec/bytes"
"github.com/micro/go-micro/codec/grpc"
"github.com/micro/go-micro/codec/json"
"github.com/micro/go-micro/codec/jsonrpc"
"github.com/micro/go-micro/codec/proto"
"github.com/micro/go-micro/codec/protorpc"
"github.com/micro/go-micro/errors"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/v2/codec"
raw "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/v2/codec/grpc"
"github.com/micro/go-micro/v2/codec/json"
"github.com/micro/go-micro/v2/codec/jsonrpc"
"github.com/micro/go-micro/v2/codec/proto"
"github.com/micro/go-micro/v2/codec/protorpc"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/transport"
)
const (

2
client/rpc_request.go
View File

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

4
client/rpc_response.go
View File

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

2
client/rpc_stream.go
View File

@@ -5,7 +5,7 @@ import (
"io"
"sync"
"github.com/micro/go-micro/codec"
"github.com/micro/go-micro/v2/codec"
)
// Implements the streamer interface

2
client/selector/common_test.go
View File

@@ -1,7 +1,7 @@
package selector
import (
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
var (

4
client/selector/default.go
View File

@@ -3,8 +3,8 @@ package selector
import (
"time"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/registry/cache"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/registry/cache"
)
type registrySelector struct {

2
client/selector/default_test.go
View File

@@ -3,7 +3,7 @@ package selector
import (
"testing"
"github.com/micro/go-micro/registry/memory"
"github.com/micro/go-micro/v2/registry/memory"
)
func TestRegistrySelector(t *testing.T) {

4
client/selector/dns/dns.go
View File

@@ -6,8 +6,8 @@ import (
"net"
"strconv"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/registry"
)
type dnsSelector struct {

2
client/selector/filter.go
View File

@@ -1,7 +1,7 @@
package selector
import (
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
// FilterEndpoint is an endpoint based Select Filter which will

2
client/selector/filter_test.go
View File

@@ -3,7 +3,7 @@ package selector
import (
"testing"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
func TestFilterEndpoint(t *testing.T) {

2
client/selector/options.go
View File

@@ -3,7 +3,7 @@ package selector
import (
"context"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
type Options struct {

2
client/selector/registry/options.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/v2/client/selector"
)
// Set the registry cache ttl

2
client/selector/registry/registry.go
View File

@@ -2,7 +2,7 @@
package registry
import (
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/v2/client/selector"
)
// NewSelector returns a new registry selector

10
client/selector/router/router.go
View File

@@ -7,11 +7,11 @@ import (
"sort"
"sync"
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/router"
pb "github.com/micro/go-micro/router/service/proto"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/router"
pb "github.com/micro/go-micro/v2/router/service/proto"
)
type routerSelector struct {

2
client/selector/selector.go
View File

@@ -4,7 +4,7 @@ package selector
import (
"errors"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
// Selector builds on the registry as a mechanism to pick nodes

4
client/selector/static/static.go
View File

@@ -2,8 +2,8 @@
package static
import (
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/registry"
)
// staticSelector is a static selector

2
client/selector/strategy.go
View File

@@ -5,7 +5,7 @@ import (
"sync"
"time"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
func init() {

2
client/selector/strategy_test.go
View File

@@ -3,7 +3,7 @@ package selector
import (
"testing"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
func TestStrategies(t *testing.T) {

4
client/service/proto/client.pb.go
View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: github.com/micro/go-micro/client/proto/client.proto
// source: github.com/micro/go-micro/v2/client/proto/client.proto
package go_micro_client
@@ -184,7 +184,7 @@ func init() {
}
func init() {
proto.RegisterFile("github.com/micro/go-micro/client/proto/client.proto", fileDescriptor_d418333f021a3308)
proto.RegisterFile("github.com/micro/go-micro/v2/client/proto/client.proto", fileDescriptor_d418333f021a3308)
}
var fileDescriptor_d418333f021a3308 = []byte{

6
client/service/proto/client.pb.micro.go
View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-micro. DO NOT EDIT.
// source: github.com/micro/go-micro/client/proto/client.proto
// source: github.com/micro/go-micro/v2/client/proto/client.proto
package go_micro_client
@@ -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.

2
client/wrapper.go
View File

@@ -3,7 +3,7 @@ package client
import (
"context"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
// CallFunc represents the individual call func