diff --git a/client/client.go b/client/client.go index d5c4db8..0095ae9 100644 --- a/client/client.go +++ b/client/client.go @@ -15,9 +15,9 @@ import ( opentracing "github.com/opentracing/opentracing-go" circuit "github.com/rubyist/circuitbreaker" - "github.com/smallnest/rpcx/v5/log" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/log" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/share" "go.opencensus.io/trace" ) diff --git a/client/client_test.go b/client/client_test.go index a7ada19..431d8ec 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -8,8 +8,8 @@ import ( "time" testutils "github.com/smallnest/rpcx/_testutils" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/server" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/server" ) type Args struct { diff --git a/client/connection.go b/client/connection.go index 742a724..e4cb6fd 100644 --- a/client/connection.go +++ b/client/connection.go @@ -9,8 +9,8 @@ import ( "net/http" "time" - "github.com/smallnest/rpcx/v5/log" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/log" + "github.com/smallnest/rpcx/share" ) type ConnFactoryFn func(c *Client, network, address string) (net.Conn, error) diff --git a/client/consul_discovery.go b/client/consul_discovery.go index 33a7d06..40454d6 100644 --- a/client/consul_discovery.go +++ b/client/consul_discovery.go @@ -8,7 +8,7 @@ import ( "github.com/docker/libkv" "github.com/docker/libkv/store" "github.com/docker/libkv/store/consul" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) func init() { diff --git a/client/etcd_discovery.go b/client/etcd_discovery.go index 5b5214d..4e2f73c 100644 --- a/client/etcd_discovery.go +++ b/client/etcd_discovery.go @@ -8,7 +8,7 @@ import ( "github.com/docker/libkv" "github.com/docker/libkv/store" "github.com/docker/libkv/store/etcd" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) func init() { diff --git a/client/etcdv3_discovery.go b/client/etcdv3_discovery.go index 1370c20..2fc3a1f 100644 --- a/client/etcdv3_discovery.go +++ b/client/etcdv3_discovery.go @@ -8,7 +8,7 @@ import ( "github.com/docker/libkv" "github.com/docker/libkv/store" etcd "github.com/smallnest/libkv-etcdv3-store" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) func init() { diff --git a/client/inprocess_client.go b/client/inprocess_client.go index 4cbfd57..2efac04 100644 --- a/client/inprocess_client.go +++ b/client/inprocess_client.go @@ -7,9 +7,9 @@ import ( "reflect" "sync" - "github.com/smallnest/rpcx/v5/log" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/log" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/share" ) // InprocessClient is a in-process client for test. diff --git a/client/mdns_discovery.go b/client/mdns_discovery.go index d4efb2b..df61078 100644 --- a/client/mdns_discovery.go +++ b/client/mdns_discovery.go @@ -8,7 +8,7 @@ import ( "time" "github.com/grandcat/zeroconf" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) type serviceMeta struct { diff --git a/client/multiple_servers_discovery.go b/client/multiple_servers_discovery.go index d188663..f6f3583 100644 --- a/client/multiple_servers_discovery.go +++ b/client/multiple_servers_discovery.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) // MultipleServersDiscovery is a multiple servers service discovery. diff --git a/client/nacos_discovery.go b/client/nacos_discovery.go index ab9117a..45eff69 100644 --- a/client/nacos_discovery.go +++ b/client/nacos_discovery.go @@ -10,8 +10,8 @@ import ( "github.com/nacos-group/nacos-sdk-go/common/constant" "github.com/nacos-group/nacos-sdk-go/model" "github.com/nacos-group/nacos-sdk-go/vo" - "github.com/smallnest/rpcx/v5/log" - "github.com/smallnest/rpcx/v5/util" + "github.com/smallnest/rpcx/log" + "github.com/smallnest/rpcx/util" ) // NacosDiscovery is a nacos service discovery. diff --git a/client/oneclient.go b/client/oneclient.go index ff10c9c..c89115c 100644 --- a/client/oneclient.go +++ b/client/oneclient.go @@ -6,10 +6,10 @@ import ( "io" "sync" - "github.com/smallnest/rpcx/v5/serverplugin" + "github.com/smallnest/rpcx/serverplugin" multierror "github.com/hashicorp/go-multierror" - "github.com/smallnest/rpcx/v5/protocol" + "github.com/smallnest/rpcx/protocol" ) // OneClient wraps servicesPath and XClients. diff --git a/client/oneclient_pool.go b/client/oneclient_pool.go index f9fd865..0f98063 100644 --- a/client/oneclient_pool.go +++ b/client/oneclient_pool.go @@ -3,7 +3,7 @@ package client import ( "sync/atomic" - "github.com/smallnest/rpcx/v5/protocol" + "github.com/smallnest/rpcx/protocol" ) // OneClientPool is a oneclient pool with fixed size. diff --git a/client/opencensus.go b/client/opencensus.go index 38d17b1..35c3124 100644 --- a/client/opencensus.go +++ b/client/opencensus.go @@ -3,7 +3,7 @@ package client import ( "context" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/share" "go.opencensus.io/trace" ) diff --git a/client/opentracing.go b/client/opentracing.go index 7d3790e..fbaa7cc 100644 --- a/client/opentracing.go +++ b/client/opentracing.go @@ -5,7 +5,7 @@ import ( opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/share" ) type OpenTracingPlugin struct{} diff --git a/client/plugin.go b/client/plugin.go index 7c2fe9d..9e91141 100644 --- a/client/plugin.go +++ b/client/plugin.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/smallnest/rpcx/v5/protocol" + "github.com/smallnest/rpcx/protocol" ) // pluginContainer implements PluginContainer interface. diff --git a/client/redis_discovery.go b/client/redis_discovery.go index 8a41ba8..ce200dd 100644 --- a/client/redis_discovery.go +++ b/client/redis_discovery.go @@ -7,7 +7,7 @@ import ( "github.com/abronan/valkeyrie" "github.com/abronan/valkeyrie/store" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" "github.com/smallnest/valkeyrie/store/redis" ) diff --git a/client/xclient.go b/client/xclient.go index 2ebfde3..cc0ac41 100644 --- a/client/xclient.go +++ b/client/xclient.go @@ -15,9 +15,9 @@ import ( "github.com/juju/ratelimit" ex "github.com/smallnest/rpcx/errors" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/serverplugin" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/serverplugin" + "github.com/smallnest/rpcx/share" ) const ( diff --git a/client/xclient_pool.go b/client/xclient_pool.go index 024ca4b..11d9d91 100644 --- a/client/xclient_pool.go +++ b/client/xclient_pool.go @@ -3,7 +3,7 @@ package client import ( "sync/atomic" - "github.com/smallnest/rpcx/v5/protocol" + "github.com/smallnest/rpcx/protocol" ) // XClientPool is a xclient pool with fixed size. diff --git a/client/xclient_test.go b/client/xclient_test.go index 0dc1b48..74c80bd 100644 --- a/client/xclient_test.go +++ b/client/xclient_test.go @@ -9,9 +9,9 @@ import ( "fmt" testutils "github.com/smallnest/rpcx/_testutils" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/server" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/server" + "github.com/smallnest/rpcx/share" ) func TestXClient_Thrift(t *testing.T) { diff --git a/client/zookeeper_discovery.go b/client/zookeeper_discovery.go index 01662d4..4fc8c67 100644 --- a/client/zookeeper_discovery.go +++ b/client/zookeeper_discovery.go @@ -8,7 +8,7 @@ import ( "github.com/docker/libkv" "github.com/docker/libkv/store" "github.com/docker/libkv/store/zookeeper" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) func init() { diff --git a/protocol/compressor.go b/protocol/compressor.go index d29aca1..752054c 100644 --- a/protocol/compressor.go +++ b/protocol/compressor.go @@ -1,7 +1,7 @@ package protocol import ( - "github.com/smallnest/rpcx/v5/util" + "github.com/smallnest/rpcx/util" ) // Compressor defines a common compression interface. diff --git a/protocol/message.go b/protocol/message.go index 2dde536..628f7cb 100644 --- a/protocol/message.go +++ b/protocol/message.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/smallnest/rpcx/v5/util" + "github.com/smallnest/rpcx/util" ) var ( diff --git a/reflection/server_reflection.go b/reflection/server_reflection.go index b3a3222..ea2f4d2 100644 --- a/reflection/server_reflection.go +++ b/reflection/server_reflection.go @@ -13,7 +13,7 @@ import ( "github.com/ChimeraCoder/gojson" jsoniter "github.com/json-iterator/go" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) var typeOfError = reflect.TypeOf((*error)(nil)).Elem() diff --git a/server/converter.go b/server/converter.go index b3164fd..a4cdf54 100644 --- a/server/converter.go +++ b/server/converter.go @@ -6,8 +6,8 @@ import ( "net/url" "strconv" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/share" ) const ( diff --git a/server/gateway.go b/server/gateway.go index 2dc23ee..10266b1 100644 --- a/server/gateway.go +++ b/server/gateway.go @@ -12,9 +12,9 @@ import ( "github.com/julienschmidt/httprouter" "github.com/rs/cors" - "github.com/smallnest/rpcx/v5/log" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/log" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/share" "github.com/soheilhy/cmux" ) diff --git a/server/jsonrpc2.go b/server/jsonrpc2.go index e08ebae..dc6fc2b 100644 --- a/server/jsonrpc2.go +++ b/server/jsonrpc2.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/rs/cors" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/share" ) func (s *Server) jsonrpcHandler(w http.ResponseWriter, r *http.Request) { diff --git a/server/plugin.go b/server/plugin.go index 11a0de6..070e57c 100644 --- a/server/plugin.go +++ b/server/plugin.go @@ -4,8 +4,8 @@ import ( "context" "net" - "github.com/smallnest/rpcx/v5/errors" - "github.com/smallnest/rpcx/v5/protocol" + "github.com/smallnest/rpcx/errors" + "github.com/smallnest/rpcx/protocol" ) //PluginContainer represents a plugin container that defines all methods to manage plugins. diff --git a/server/server.go b/server/server.go index 6f495d2..a0b5385 100644 --- a/server/server.go +++ b/server/server.go @@ -21,9 +21,9 @@ import ( "os/signal" "syscall" - "github.com/smallnest/rpcx/v5/log" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/log" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/share" ) // ErrServerClosed is returned by the Server's Serve, ListenAndServe after a call to Shutdown or Close. diff --git a/server/server_test.go b/server/server_test.go index f6f472c..c072787 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -8,8 +8,8 @@ import ( "time" testutils "github.com/smallnest/rpcx/_testutils" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/share" ) type Args struct { diff --git a/server/service.go b/server/service.go index cbbd837..2d614a0 100644 --- a/server/service.go +++ b/server/service.go @@ -12,7 +12,7 @@ import ( "unicode/utf8" rerrors "github.com/smallnest/rpcx/errors" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) // Precompute the reflect type for error. Can't use error directly diff --git a/serverplugin/alias.go b/serverplugin/alias.go index 3147f5a..4f59ad9 100644 --- a/serverplugin/alias.go +++ b/serverplugin/alias.go @@ -3,7 +3,7 @@ package serverplugin import ( "context" - "github.com/smallnest/rpcx/v5/protocol" + "github.com/smallnest/rpcx/protocol" ) var aliasAppliedKey = "__aliasAppliedKey" diff --git a/serverplugin/consul.go b/serverplugin/consul.go index cfc6441..686063f 100644 --- a/serverplugin/consul.go +++ b/serverplugin/consul.go @@ -14,7 +14,7 @@ import ( "github.com/docker/libkv/store" "github.com/docker/libkv/store/consul" metrics "github.com/rcrowley/go-metrics" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) func init() { diff --git a/serverplugin/consul_test.go b/serverplugin/consul_test.go index fd536ee..81e32e9 100644 --- a/serverplugin/consul_test.go +++ b/serverplugin/consul_test.go @@ -5,7 +5,7 @@ import ( "time" metrics "github.com/rcrowley/go-metrics" - "github.com/smallnest/rpcx/v5/server" + "github.com/smallnest/rpcx/server" ) func TestConsulRegistry(t *testing.T) { diff --git a/serverplugin/etcd.go b/serverplugin/etcd.go index 0a69ca3..cc36ba4 100644 --- a/serverplugin/etcd.go +++ b/serverplugin/etcd.go @@ -14,7 +14,7 @@ import ( "github.com/docker/libkv/store" "github.com/docker/libkv/store/etcd" metrics "github.com/rcrowley/go-metrics" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) func init() { diff --git a/serverplugin/etcd_test.go b/serverplugin/etcd_test.go index 5af4113..ca63f8f 100644 --- a/serverplugin/etcd_test.go +++ b/serverplugin/etcd_test.go @@ -5,7 +5,7 @@ import ( "time" metrics "github.com/rcrowley/go-metrics" - "github.com/smallnest/rpcx/v5/server" + "github.com/smallnest/rpcx/server" ) func TestEtcdRegistry(t *testing.T) { diff --git a/serverplugin/etcdv3.go b/serverplugin/etcdv3.go index e4f078e..be7f900 100644 --- a/serverplugin/etcdv3.go +++ b/serverplugin/etcdv3.go @@ -14,7 +14,7 @@ import ( "github.com/docker/libkv/store" metrics "github.com/rcrowley/go-metrics" etcd "github.com/smallnest/libkv-etcdv3-store" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) func init() { diff --git a/serverplugin/file_transfer.go b/serverplugin/file_transfer.go index ea83e62..5df75d8 100644 --- a/serverplugin/file_transfer.go +++ b/serverplugin/file_transfer.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/golang-lru" - "github.com/smallnest/rpcx/v5/log" - "github.com/smallnest/rpcx/v5/server" + "github.com/smallnest/rpcx/log" + "github.com/smallnest/rpcx/server" ) var ( diff --git a/serverplugin/metrics.go b/serverplugin/metrics.go index fee036e..5f779d0 100644 --- a/serverplugin/metrics.go +++ b/serverplugin/metrics.go @@ -7,8 +7,8 @@ import ( "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/server" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/server" ) // MetricsPlugin has an issue. It changes seq of requests and it is wrong!!!! diff --git a/serverplugin/nacos.go b/serverplugin/nacos.go index c1bca09..577a3ca 100644 --- a/serverplugin/nacos.go +++ b/serverplugin/nacos.go @@ -8,8 +8,8 @@ import ( "github.com/nacos-group/nacos-sdk-go/clients/naming_client" "github.com/nacos-group/nacos-sdk-go/common/constant" "github.com/nacos-group/nacos-sdk-go/vo" - "github.com/smallnest/rpcx/v5/log" - "github.com/smallnest/rpcx/v5/util" + "github.com/smallnest/rpcx/log" + "github.com/smallnest/rpcx/util" ) // NacosRegisterPlugin implements consul registry. diff --git a/serverplugin/opencensus.go b/serverplugin/opencensus.go index 4ecb34d..565fa65 100644 --- a/serverplugin/opencensus.go +++ b/serverplugin/opencensus.go @@ -4,9 +4,9 @@ import ( "context" "net" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/server" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/server" + "github.com/smallnest/rpcx/share" "go.opencensus.io/trace" ) diff --git a/serverplugin/opentracing.go b/serverplugin/opentracing.go index ae3152b..66ecbc1 100644 --- a/serverplugin/opentracing.go +++ b/serverplugin/opentracing.go @@ -7,9 +7,9 @@ import ( opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" "github.com/opentracing/opentracing-go/log" - "github.com/smallnest/rpcx/v5/protocol" - "github.com/smallnest/rpcx/v5/server" - "github.com/smallnest/rpcx/v5/share" + "github.com/smallnest/rpcx/protocol" + "github.com/smallnest/rpcx/server" + "github.com/smallnest/rpcx/share" ) type OpenTracingPlugin struct{} diff --git a/serverplugin/redis.go b/serverplugin/redis.go index 8ce4f48..46a694f 100644 --- a/serverplugin/redis.go +++ b/serverplugin/redis.go @@ -13,7 +13,7 @@ import ( "github.com/abronan/valkeyrie" "github.com/abronan/valkeyrie/store" metrics "github.com/rcrowley/go-metrics" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" "github.com/smallnest/valkeyrie/store/redis" ) diff --git a/serverplugin/trace.go b/serverplugin/trace.go index d99381d..abc3698 100644 --- a/serverplugin/trace.go +++ b/serverplugin/trace.go @@ -6,7 +6,7 @@ package serverplugin // "reflect" // "runtime" -// "github.com/smallnest/rpcx/v5/protocol" +// "github.com/smallnest/rpcx/protocol" // "golang.org/x/net/trace" // ) diff --git a/serverplugin/zookeeper.go b/serverplugin/zookeeper.go index 5f54647..0e804a8 100644 --- a/serverplugin/zookeeper.go +++ b/serverplugin/zookeeper.go @@ -15,7 +15,7 @@ import ( "github.com/docker/libkv/store" metrics "github.com/rcrowley/go-metrics" - "github.com/smallnest/rpcx/v5/log" + "github.com/smallnest/rpcx/log" ) func init() { diff --git a/serverplugin/zookeeper_test.go b/serverplugin/zookeeper_test.go index 298b3bb..8c96cc6 100644 --- a/serverplugin/zookeeper_test.go +++ b/serverplugin/zookeeper_test.go @@ -5,7 +5,7 @@ import ( "time" metrics "github.com/rcrowley/go-metrics" - "github.com/smallnest/rpcx/v5/server" + "github.com/smallnest/rpcx/server" ) func TestZookeeperRegistry(t *testing.T) { diff --git a/share/share.go b/share/share.go index bb5981f..3eeee9c 100644 --- a/share/share.go +++ b/share/share.go @@ -1,8 +1,8 @@ package share import ( - "github.com/smallnest/rpcx/v5/codec" - "github.com/smallnest/rpcx/v5/protocol" + "github.com/smallnest/rpcx/codec" + "github.com/smallnest/rpcx/protocol" ) const ( diff --git a/tool/xgen/xgen.go b/tool/xgen/xgen.go index b02b770..f7e24bc 100644 --- a/tool/xgen/xgen.go +++ b/tool/xgen/xgen.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "github.com/smallnest/rpcx/v5/tool/xgen/parser" + "github.com/smallnest/rpcx/tool/xgen/parser" ) var (