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,8 +5,8 @@ import (
"regexp"
"strings"
"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"
)
// Endpoint is a mapping between an RPC method and HTTP endpoint

View File

@@ -4,13 +4,13 @@ package api
import (
"net/http"
goapi "github.com/micro/go-micro/api"
"github.com/micro/go-micro/api/handler"
api "github.com/micro/go-micro/api/proto"
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/errors"
"github.com/micro/go-micro/util/ctx"
goapi "github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/handler"
api "github.com/micro/go-micro/v2/api/proto"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/util/ctx"
)
type apiHandler struct {

View File

@@ -8,9 +8,9 @@ import (
"net/http"
"strings"
api "github.com/micro/go-micro/api/proto"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/registry"
api "github.com/micro/go-micro/v2/api/proto"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/registry"
)
func requestToProto(r *http.Request) (*api.Request, error) {

View File

@@ -11,9 +11,9 @@ import (
"time"
"github.com/gorilla/websocket"
"github.com/micro/go-micro/api/handler"
"github.com/micro/go-micro/broker"
"github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/v2/broker"
"github.com/micro/go-micro/v2/util/log"
)
const (

View File

@@ -7,8 +7,8 @@ import (
"regexp"
"strings"
"github.com/micro/go-micro/api/handler"
"github.com/micro/go-micro/util/ctx"
"github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/v2/util/ctx"
)
type event struct {

View File

@@ -12,9 +12,9 @@ import (
"time"
"github.com/google/uuid"
"github.com/micro/go-micro/api/handler"
proto "github.com/micro/go-micro/api/proto"
"github.com/micro/go-micro/util/ctx"
"github.com/micro/go-micro/v2/api/handler"
proto "github.com/micro/go-micro/v2/api/proto"
"github.com/micro/go-micro/v2/util/ctx"
)
type event struct {

View File

@@ -8,9 +8,9 @@ import (
"net/http/httputil"
"net/url"
"github.com/micro/go-micro/api"
"github.com/micro/go-micro/api/handler"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/v2/client/selector"
)
const (

View File

@@ -6,11 +6,11 @@ import (
"net/http/httptest"
"testing"
"github.com/micro/go-micro/api/handler"
"github.com/micro/go-micro/api/router"
regRouter "github.com/micro/go-micro/api/router/registry"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/registry/memory"
"github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/v2/api/router"
regRouter "github.com/micro/go-micro/v2/api/router/registry"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/registry/memory"
)
func testHttp(t *testing.T, path, service, ns string) {

View File

@@ -1,8 +1,8 @@
package handler
import (
"github.com/micro/go-micro"
"github.com/micro/go-micro/api/router"
"github.com/micro/go-micro/v2"
"github.com/micro/go-micro/v2/api/router"
)
type Options struct {

View File

@@ -9,8 +9,8 @@ import (
"time"
"github.com/gorilla/websocket"
"github.com/micro/go-micro/api/handler"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/v2/registry"
)
const (

View File

@@ -10,17 +10,17 @@ import (
"strings"
"github.com/joncalhoun/qson"
"github.com/micro/go-micro/api"
"github.com/micro/go-micro/api/handler"
proto "github.com/micro/go-micro/api/internal/proto"
"github.com/micro/go-micro/client"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/codec"
"github.com/micro/go-micro/codec/jsonrpc"
"github.com/micro/go-micro/codec/protorpc"
"github.com/micro/go-micro/errors"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/util/ctx"
"github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/handler"
proto "github.com/micro/go-micro/v2/api/internal/proto"
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/client/selector"
"github.com/micro/go-micro/v2/codec"
"github.com/micro/go-micro/v2/codec/jsonrpc"
"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/util/ctx"
)
const (

View File

@@ -7,7 +7,7 @@ import (
"testing"
"github.com/golang/protobuf/proto"
go_api "github.com/micro/go-micro/api/proto"
go_api "github.com/micro/go-micro/v2/api/proto"
)
func TestRequestPayloadFromRequest(t *testing.T) {

View File

@@ -11,9 +11,9 @@ import (
"net/url"
"strings"
"github.com/micro/go-micro/api"
"github.com/micro/go-micro/api/handler"
"github.com/micro/go-micro/client/selector"
"github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/handler"
"github.com/micro/go-micro/v2/client/selector"
)
const (

View File

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

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-micro. DO NOT EDIT.
// source: github.com/micro/go-micro/api/proto/api.proto
// source: github.com/micro/go-micro/v2/api/proto/api.proto
package go_api

View File

@@ -6,7 +6,7 @@ import (
"net/http"
"strings"
"github.com/micro/go-micro/api/resolver"
"github.com/micro/go-micro/v2/api/resolver"
)
type Resolver struct{}

View File

@@ -4,7 +4,7 @@ package host
import (
"net/http"
"github.com/micro/go-micro/api/resolver"
"github.com/micro/go-micro/v2/api/resolver"
)
type Resolver struct{}

View File

@@ -4,7 +4,7 @@ package micro
import (
"net/http"
"github.com/micro/go-micro/api/resolver"
"github.com/micro/go-micro/v2/api/resolver"
)
// default resolver for legacy purposes

View File

@@ -6,7 +6,7 @@ import (
"net/http"
"strings"
"github.com/micro/go-micro/api/resolver"
"github.com/micro/go-micro/v2/api/resolver"
)
type Resolver struct{}

View File

@@ -7,7 +7,7 @@ import (
"regexp"
"strings"
"github.com/micro/go-micro/api/resolver"
"github.com/micro/go-micro/v2/api/resolver"
)
type Resolver struct{}

View File

@@ -1,9 +1,9 @@
package router
import (
"github.com/micro/go-micro/api/resolver"
"github.com/micro/go-micro/api/resolver/micro"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/v2/api/resolver"
"github.com/micro/go-micro/v2/api/resolver/micro"
"github.com/micro/go-micro/v2/registry"
)
type Options struct {

View File

@@ -11,10 +11,10 @@ import (
"sync"
"time"
"github.com/micro/go-micro/api"
"github.com/micro/go-micro/api/router"
"github.com/micro/go-micro/registry"
"github.com/micro/go-micro/registry/cache"
"github.com/micro/go-micro/v2/api"
"github.com/micro/go-micro/v2/api/router"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/registry/cache"
)
// router is the default router

View File

@@ -6,7 +6,7 @@ import (
"net/url"
"testing"
"github.com/micro/go-micro/api"
"github.com/micro/go-micro/v2/api"
)
func TestSetNamespace(t *testing.T) {

View File

@@ -4,7 +4,7 @@ package router
import (
"net/http"
"github.com/micro/go-micro/api"
"github.com/micro/go-micro/v2/api"
)
// Router is used to determine an endpoint for a request

View File

@@ -5,7 +5,7 @@ package autocert
import (
"net"
"github.com/micro/go-micro/api/server/acme"
"github.com/micro/go-micro/v2/api/server/acme"
"golang.org/x/crypto/acme/autocert"
)

View File

@@ -9,7 +9,7 @@ import (
"github.com/mholt/certmagic"
"github.com/micro/go-micro/api/server/acme"
"github.com/micro/go-micro/v2/api/server/acme"
)
type certmagicProvider struct {

View File

@@ -10,9 +10,9 @@ import (
"github.com/go-acme/lego/v3/providers/dns/cloudflare"
"github.com/mholt/certmagic"
"github.com/micro/go-micro/api/server/acme"
cfstore "github.com/micro/go-micro/store/cloudflare"
"github.com/micro/go-micro/sync/lock/memory"
"github.com/micro/go-micro/v2/api/server/acme"
cfstore "github.com/micro/go-micro/v2/store/cloudflare"
"github.com/micro/go-micro/v2/sync/lock/memory"
)
func TestCertMagic(t *testing.T) {

View File

@@ -10,8 +10,8 @@ import (
"time"
"github.com/mholt/certmagic"
"github.com/micro/go-micro/store"
"github.com/micro/go-micro/sync/lock"
"github.com/micro/go-micro/v2/store"
"github.com/micro/go-micro/v2/sync/lock"
)
// File represents a "File" that will be stored in store.Store - the contents and last modified time

View File

@@ -9,8 +9,8 @@ import (
"sync"
"github.com/gorilla/handlers"
"github.com/micro/go-micro/api/server"
"github.com/micro/go-micro/util/log"
"github.com/micro/go-micro/v2/api/server"
"github.com/micro/go-micro/v2/util/log"
)
type httpServer struct {

View File

@@ -3,7 +3,7 @@ package server
import (
"crypto/tls"
"github.com/micro/go-micro/api/server/acme"
"github.com/micro/go-micro/v2/api/server/acme"
)
type Option func(o *Options)