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

@@ -12,23 +12,23 @@ import (
"time"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/client"
cmucp "github.com/micro/go-micro/client/mucp"
rtr "github.com/micro/go-micro/client/selector/router"
"github.com/micro/go-micro/network/resolver/dns"
pbNet "github.com/micro/go-micro/network/service/proto"
"github.com/micro/go-micro/proxy"
"github.com/micro/go-micro/router"
pbRtr "github.com/micro/go-micro/router/service/proto"
"github.com/micro/go-micro/server"
smucp "github.com/micro/go-micro/server/mucp"
"github.com/micro/go-micro/transport"
"github.com/micro/go-micro/tunnel"
bun "github.com/micro/go-micro/tunnel/broker"
tun "github.com/micro/go-micro/tunnel/transport"
"github.com/micro/go-micro/util/backoff"
"github.com/micro/go-micro/util/log"
pbUtil "github.com/micro/go-micro/util/proto"
"github.com/micro/go-micro/v2/client"
cmucp "github.com/micro/go-micro/v2/client/mucp"
rtr "github.com/micro/go-micro/v2/client/selector/router"
"github.com/micro/go-micro/v2/network/resolver/dns"
pbNet "github.com/micro/go-micro/v2/network/service/proto"
"github.com/micro/go-micro/v2/proxy"
"github.com/micro/go-micro/v2/router"
pbRtr "github.com/micro/go-micro/v2/router/service/proto"
"github.com/micro/go-micro/v2/server"
smucp "github.com/micro/go-micro/v2/server/mucp"
"github.com/micro/go-micro/v2/transport"
"github.com/micro/go-micro/v2/tunnel"
bun "github.com/micro/go-micro/v2/tunnel/broker"
tun "github.com/micro/go-micro/v2/tunnel/transport"
"github.com/micro/go-micro/v2/util/backoff"
"github.com/micro/go-micro/v2/util/log"
pbUtil "github.com/micro/go-micro/v2/util/proto"
)
var (

View File

@@ -4,8 +4,8 @@ package network
import (
"time"
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/server"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/server"
)
var (

View File

@@ -6,7 +6,7 @@ import (
"sync"
"time"
pb "github.com/micro/go-micro/network/service/proto"
pb "github.com/micro/go-micro/v2/network/service/proto"
)
var (

View File

@@ -4,7 +4,7 @@ import (
"testing"
"time"
pb "github.com/micro/go-micro/network/service/proto"
pb "github.com/micro/go-micro/v2/network/service/proto"
)
var (

View File

@@ -2,12 +2,12 @@ package network
import (
"github.com/google/uuid"
"github.com/micro/go-micro/network/resolver"
"github.com/micro/go-micro/network/resolver/registry"
"github.com/micro/go-micro/proxy"
"github.com/micro/go-micro/proxy/mucp"
"github.com/micro/go-micro/router"
"github.com/micro/go-micro/tunnel"
"github.com/micro/go-micro/v2/network/resolver"
"github.com/micro/go-micro/v2/network/resolver/registry"
"github.com/micro/go-micro/v2/proxy"
"github.com/micro/go-micro/v2/proxy/mucp"
"github.com/micro/go-micro/v2/router"
"github.com/micro/go-micro/v2/tunnel"
)
type Option func(*Options)

View File

@@ -5,7 +5,7 @@ import (
"context"
"net"
"github.com/micro/go-micro/network/resolver"
"github.com/micro/go-micro/v2/network/resolver"
"github.com/miekg/dns"
)

View File

@@ -5,7 +5,7 @@ import (
"fmt"
"net"
"github.com/micro/go-micro/network/resolver"
"github.com/micro/go-micro/v2/network/resolver"
)
// Resolver is a DNS network resolve

View File

@@ -8,7 +8,7 @@ import (
"net/http"
"net/url"
"github.com/micro/go-micro/network/resolver"
"github.com/micro/go-micro/v2/network/resolver"
)
// Resolver is a HTTP network resolver

View File

@@ -2,8 +2,8 @@
package registry
import (
"github.com/micro/go-micro/network/resolver"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/network/resolver"
"github.com/micro/go-micro/v2/registry"
)
// Resolver is a registry network resolver

View File

@@ -2,7 +2,7 @@
package registry
import (
"github.com/micro/go-micro/network/resolver"
"github.com/micro/go-micro/v2/network/resolver"
)
// Resolver returns a static list of nodes. In the event the node list

View File

@@ -6,7 +6,7 @@ package go_micro_network
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
proto1 "github.com/micro/go-micro/router/service/proto"
proto1 "github.com/micro/go-micro/v2/router/service/proto"
math "math"
)

View File

@@ -6,14 +6,14 @@ package go_micro_network
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
_ "github.com/micro/go-micro/router/service/proto"
_ "github.com/micro/go-micro/v2/router/service/proto"
math "math"
)
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.