Move selector to client/selector

2025-10-30 23:27:41 +02:00 · 2019-06-21 15:13:54 +01:00
parent c350e19552
commit ca5acba0c6
28 changed files with 21 additions and 21 deletions
--- a/api/handler/api/api.go
+++ b/api/handler/api/api.go
@@ -9,7 +9,7 @@ import (
 	api "github.com/micro/go-micro/api/proto"
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/errors"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/util/ctx"
 )

--- a/api/handler/api/util.go
+++ b/api/handler/api/util.go
@@ -10,7 +10,7 @@ import (

 	api "github.com/micro/go-micro/api/proto"
 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 func requestToProto(r *http.Request) (*api.Request, error) {
--- a/api/handler/http/http.go
+++ b/api/handler/http/http.go
@@ -10,7 +10,7 @@ import (

 	"github.com/micro/go-micro/api"
 	"github.com/micro/go-micro/api/handler"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 const (
--- a/api/handler/rpc/rpc.go
+++ b/api/handler/rpc/rpc.go
@@ -19,7 +19,7 @@ import (
 	"github.com/micro/go-micro/codec/protorpc"
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/util/ctx"
 )

--- a/api/handler/web/web.go
+++ b/api/handler/web/web.go
@@ -13,7 +13,7 @@ import (

 	"github.com/micro/go-micro/api"
 	"github.com/micro/go-micro/api/handler"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 const (
--- a/client/grpc/grpc.go
+++ b/client/grpc/grpc.go
@@ -16,7 +16,7 @@ import (
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/metadata"
 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/transport"

 	"google.golang.org/grpc"
--- a/client/grpc/grpc_test.go
+++ b/client/grpc/grpc_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/registry/memory"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 	pgrpc "google.golang.org/grpc"
 	pb "google.golang.org/grpc/examples/helloworld/helloworld"
 )
--- a/client/options.go
+++ b/client/options.go
@@ -7,7 +7,7 @@ import (
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/transport"
 )

--- a/client/rpc_client.go
+++ b/client/rpc_client.go
@@ -17,7 +17,7 @@ import (
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/metadata"
 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/transport"
 )

--- a/client/rpc_client_test.go
+++ b/client/rpc_client_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/registry/memory"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 func newTestRegistry() registry.Registry {
--- a/client/selector/common_test.go
+++ b/client/selector/common_test.go
--- a/client/selector/default.go
+++ b/client/selector/default.go
--- a/client/selector/default_test.go
+++ b/client/selector/default_test.go
--- a/client/selector/dns/dns.go
+++ b/client/selector/dns/dns.go
@@ -6,7 +6,7 @@ import (
 	"strconv"

 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 type dnsSelector struct {
--- a/client/selector/filter.go
+++ b/client/selector/filter.go
--- a/client/selector/filter_test.go
+++ b/client/selector/filter_test.go
--- a/client/selector/options.go
+++ b/client/selector/options.go
--- a/client/selector/registry/options.go
+++ b/client/selector/registry/options.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"

-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 // Set the registry cache ttl
--- a/client/selector/registry/registry.go
+++ b/client/selector/registry/registry.go
@@ -2,7 +2,7 @@
 package registry

 import (
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 // NewSelector returns a new registry selector
--- a/client/selector/selector.go
+++ b/client/selector/selector.go
--- a/client/selector/static/static.go
+++ b/client/selector/static/static.go
@@ -6,7 +6,7 @@ import (
 	"strconv"

 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 // staticSelector is a static selector
--- a/client/selector/strategy.go
+++ b/client/selector/strategy.go
--- a/client/selector/strategy_test.go
+++ b/client/selector/strategy_test.go
--- a/config/cmd/cmd.go
+++ b/config/cmd/cmd.go
@@ -32,9 +32,9 @@ import (
 	rmem "github.com/micro/go-micro/registry/memory"

 	// selectors
-	"github.com/micro/go-micro/selector"
-	"github.com/micro/go-micro/selector/dns"
-	"github.com/micro/go-micro/selector/static"
+	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/client/selector/dns"
+	"github.com/micro/go-micro/client/selector/static"

 	// transports
 	"github.com/micro/go-micro/transport"
--- a/config/cmd/options.go
+++ b/config/cmd/options.go
@@ -6,7 +6,7 @@ import (
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/server"
 	"github.com/micro/go-micro/transport"
 )
--- a/options.go
+++ b/options.go
@@ -9,7 +9,7 @@ import (
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/config/cmd"
 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/server"
 	"github.com/micro/go-micro/transport"
 )
--- a/util/http/http.go
+++ b/util/http/http.go
@@ -4,7 +4,7 @@ import (
 	"net/http"

 	"github.com/micro/go-micro/registry"
-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 func NewRoundTripper(opts ...Option) http.RoundTripper {
--- a/util/http/roundtripper.go
+++ b/util/http/roundtripper.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"

-	"github.com/micro/go-micro/selector"
+	"github.com/micro/go-micro/client/selector"
 )

 type roundTripper struct {