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 2b1e0a6fd6
commit f23638c036
347 changed files with 864 additions and 820 deletions

View File

@@ -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 {

View File

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

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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 {

View File

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

View File

@@ -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"

View File

@@ -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.

View File

@@ -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 {

View File

@@ -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"
)

View File

@@ -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.

View File

@@ -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 {

View File

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

View File

@@ -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 (

View File

@@ -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"
)

View File

@@ -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 (

View File

@@ -5,7 +5,7 @@ import (
"sync"
"github.com/google/uuid"
"github.com/micro/go-micro/server"
"github.com/micro/go-micro/v2/server"
)
type MockServer struct {

View File

@@ -1,8 +1,8 @@
package mock
import (
"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 MockHandler struct {

View File

@@ -1,8 +1,8 @@
package mock
import (
"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 MockSubscriber struct {

View File

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

View File

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

View File

@@ -5,11 +5,11 @@ import (
"sync"
"time"
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/codec"
"github.com/micro/go-micro/debug/trace"
"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/codec"
"github.com/micro/go-micro/v2/debug/trace"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/transport"
)
type Options struct {

View File

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

View File

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

View File

@@ -4,14 +4,14 @@ import (
"bytes"
"sync"
"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/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/transport"
"github.com/oxtoacart/bpool"
"github.com/pkg/errors"
)

View File

@@ -5,8 +5,8 @@ import (
"errors"
"testing"
"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"
)
// testCodec is a dummy codec that only knows how to encode nil bodies

View File

@@ -1,8 +1,8 @@
package server
import (
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/transport"
)
// event is a broker event we handle on the server transport

View File

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

View File

@@ -3,9 +3,9 @@ package server
import (
"bytes"
"github.com/micro/go-micro/codec"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/util/buf"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v2/transport"
"github.com/micro/go-micro/v2/util/buf"
)
type rpcRequest struct {

View File

@@ -3,8 +3,8 @@ package server
import (
"net/http"
"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 {

View File

@@ -18,9 +18,9 @@ import (
"unicode"
"unicode/utf8"
"github.com/micro/go-micro/codec"
merrors "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/codec"
merrors "github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/util/log"
)
var (

View File

@@ -12,16 +12,16 @@ import (
"sync"
"time"
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/codec"
raw "github.com/micro/go-micro/codec/bytes"
"github.com/micro/go-micro/metadata"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/util/addr"
log "github.com/micro/go-micro/util/log"
mnet "github.com/micro/go-micro/util/net"
"github.com/micro/go-micro/util/socket"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/codec"
raw "github.com/micro/go-micro/v2/codec/bytes"
"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/addr"
log "github.com/micro/go-micro/v2/util/log"
mnet "github.com/micro/go-micro/v2/util/net"
"github.com/micro/go-micro/v2/util/socket"
)
type rpcServer struct {

View File

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

View File

@@ -10,8 +10,8 @@ import (
"time"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/codec/json"
protoCodec "github.com/micro/go-micro/codec/proto"
"github.com/micro/go-micro/v2/codec/json"
protoCodec "github.com/micro/go-micro/v2/codec/proto"
)
// protoStruct implements proto.Message

View File

@@ -9,9 +9,9 @@ import (
"time"
"github.com/google/uuid"
"github.com/micro/go-micro/codec"
"github.com/micro/go-micro/registry"
log "github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v2/registry"
log "github.com/micro/go-micro/v2/util/log"
)
// Server is a simple micro server abstraction

View File

@@ -4,7 +4,7 @@ import (
"fmt"
"reflect"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/registry"
)
const (