remove v5

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

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 {

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)

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() {

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() {

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() {

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.

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 {

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.

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.

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.

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.

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

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

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.

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

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 (

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.

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

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() {

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.

protocol/message.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/smallnest/rpcx/v5/util"
+	"github.com/smallnest/rpcx/util"
 )
 
 var (

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

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 (

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

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

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.

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.

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 {

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

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"

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() {

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

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() {

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

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() {

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 (

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!!!!

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.

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

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

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

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

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() {

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

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 (

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 (