diff --git a/cluster/directory/service_array.go b/cluster/directory/service_array.go index 9f1661442f771d46e247e32f6353a2e79105a6b2..7ef5b5645d379aa52c45374f9e12b34333b1ff4f 100644 --- a/cluster/directory/service_array.go +++ b/cluster/directory/service_array.go @@ -3,7 +3,6 @@ package directory import ( "context" "fmt" - "strings" "time" ) diff --git a/cluster/loadbalance.go b/cluster/loadbalance.go index 8da3640ad6efaf6ef742bddea9ab6b39412befa6..63a2b4dd94e22136e6ac38c1ab30098fc1f47dcf 100644 --- a/cluster/loadbalance.go +++ b/cluster/loadbalance.go @@ -1,10 +1,13 @@ package cluster +import ( + "time" +) + import ( "github.com/dubbo/dubbo-go/common/constant" "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/protocol" - "time" ) // Extension - LoadBalance diff --git a/cluster/loadbalance/.gitkeep b/cluster/loadbalance/.gitkeep deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/cluster/loadbalance/random.go b/cluster/loadbalance/random.go index e53efca1900ca9daa3d2b198fa2b0a94739d7b6a..3e296ed1a95e3edbf361595a8ab449c4a65e93da 100644 --- a/cluster/loadbalance/random.go +++ b/cluster/loadbalance/random.go @@ -1,11 +1,14 @@ package loadbalance +import ( + "math/rand" +) + import ( "github.com/dubbo/dubbo-go/cluster" "github.com/dubbo/dubbo-go/common/extension" "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/protocol" - "math/rand" ) const name = "random" diff --git a/cluster/support/base_cluster_invoker.go b/cluster/support/base_cluster_invoker.go index d6b9e6ec954dc1a0310e9794aaf1471fb6d11f24..3b8ad8a004726a8c60468d6438a42ecf4fafc7e1 100644 --- a/cluster/support/base_cluster_invoker.go +++ b/cluster/support/base_cluster_invoker.go @@ -2,7 +2,6 @@ package cluster import ( gxnet "github.com/AlexStocks/goext/net" - "github.com/dubbo/dubbo-go/version" jerrors "github.com/juju/errors" "github.com/tevino/abool" ) @@ -11,6 +10,7 @@ import ( "github.com/dubbo/dubbo-go/cluster" "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/dubbo-go/version" ) type baseClusterInvoker struct { diff --git a/cluster/support/failover_cluster.go b/cluster/support/failover_cluster.go index 585f5c4125831d96cdf8a147b0e386e4ac7a5fd9..3961e0551dcd5cb99e48d6e4e614b8ed85cdf3e5 100644 --- a/cluster/support/failover_cluster.go +++ b/cluster/support/failover_cluster.go @@ -2,6 +2,9 @@ package cluster import ( "context" +) + +import ( "github.com/dubbo/dubbo-go/cluster" "github.com/dubbo/dubbo-go/common/extension" "github.com/dubbo/dubbo-go/protocol" @@ -22,5 +25,5 @@ func NewFailoverCluster() cluster.Cluster { } func (cluster *FailoverCluster) Join(directory cluster.Directory) protocol.Invoker { - return NewFailoverClusterInvoker( directory) + return NewFailoverClusterInvoker(directory) } diff --git a/cluster/support/failover_cluster_invoker.go b/cluster/support/failover_cluster_invoker.go index 611f141111fc3bc044c8196ef085b2a628c2c965..73dc7e9102fbe74c44de9dca61821672534a5160 100644 --- a/cluster/support/failover_cluster_invoker.go +++ b/cluster/support/failover_cluster_invoker.go @@ -2,13 +2,15 @@ package cluster import ( gxnet "github.com/AlexStocks/goext/net" + jerrors "github.com/juju/errors" +) +import ( "github.com/dubbo/dubbo-go/cluster" "github.com/dubbo/dubbo-go/common/constant" "github.com/dubbo/dubbo-go/common/extension" "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/protocol" "github.com/dubbo/dubbo-go/version" - jerrors "github.com/juju/errors" ) type failoverClusterInvoker struct { diff --git a/config/support/config_loader.go b/config/support/config_loader.go index 57931d7574ab5b347a3714f4bc11dc7591cf5b13..9bf21170dd08f42fb96493f303f4101f20c0142b 100644 --- a/config/support/config_loader.go +++ b/config/support/config_loader.go @@ -2,7 +2,6 @@ package support import ( "fmt" - "gopkg.in/yaml.v2" "io/ioutil" "os" "path" @@ -12,6 +11,7 @@ import ( import ( "github.com/AlexStocks/goext/log" jerrors "github.com/juju/errors" + "gopkg.in/yaml.v2" ) import ( diff --git a/config/support/reference_config.go b/config/support/reference_config.go index 6fe1058f9c839507c76f20757ae0ec66883851a6..8de40677b416d123427b71c64b93d4e8ec293a1b 100644 --- a/config/support/reference_config.go +++ b/config/support/reference_config.go @@ -2,8 +2,6 @@ package support import ( "context" - "github.com/dubbo/dubbo-go/config" - "github.com/dubbo/dubbo-go/protocol" ) import ( @@ -12,6 +10,8 @@ import ( import ( "github.com/dubbo/dubbo-go/common/extension" + "github.com/dubbo/dubbo-go/config" + "github.com/dubbo/dubbo-go/protocol" ) var refprotocol = extension.GetProtocolExtension("registry") diff --git a/registry/directory/directory.go b/registry/directory/directory.go index 97f7fbaa31ecee41cf8b093a52d787f5eb4f7b79..d1fb4db9ef735423632246975ff6ce002de1b130 100644 --- a/registry/directory/directory.go +++ b/registry/directory/directory.go @@ -1,10 +1,6 @@ package directory import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/protocol/protocolwrapper" - "github.com/dubbo/dubbo-go/registry" - protocol2 "github.com/dubbo/dubbo-go/registry/protocol" "sync" "time" ) @@ -16,9 +12,13 @@ import ( import ( "github.com/dubbo/dubbo-go/cluster/directory" + "github.com/dubbo/dubbo-go/common/constant" "github.com/dubbo/dubbo-go/common/extension" "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/dubbo-go/protocol/protocolwrapper" + "github.com/dubbo/dubbo-go/registry" + protocol2 "github.com/dubbo/dubbo-go/registry/protocol" ) type Options struct { diff --git a/registry/event.go b/registry/event.go index 07bd4662d710d02788a1b9636f8209b7983c9361..e7754f0481a56365872690dc1a8a0801a19c3a91 100644 --- a/registry/event.go +++ b/registry/event.go @@ -2,10 +2,12 @@ package registry import ( "fmt" - "github.com/dubbo/dubbo-go/config" "math/rand" "time" ) +import ( + "github.com/dubbo/dubbo-go/config" +) func init() { rand.Seed(time.Now().UnixNano()) diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go index 600e3bf275238f767bcd4106a14da319741409f3..4378d37933fa1b67fa389b45a0407e2b45763176 100644 --- a/registry/protocol/protocol.go +++ b/registry/protocol/protocol.go @@ -1,9 +1,6 @@ package protocol import ( - "github.com/dubbo/dubbo-go/common/constant" - "github.com/dubbo/dubbo-go/registry" - directory2 "github.com/dubbo/dubbo-go/registry/directory" "sync" ) @@ -12,9 +9,12 @@ import ( ) import ( + "github.com/dubbo/dubbo-go/common/constant" "github.com/dubbo/dubbo-go/common/extension" "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/protocol" + "github.com/dubbo/dubbo-go/registry" + directory2 "github.com/dubbo/dubbo-go/registry/directory" ) const RegistryConnDelay = 3 diff --git a/registry/zookeeper/consumer.go b/registry/zookeeper/consumer.go index bfee0d68d1bddede71b01f277171164b6002df8c..41bcef98fbc622c8eea1893d8956f62dfc79f345 100644 --- a/registry/zookeeper/consumer.go +++ b/registry/zookeeper/consumer.go @@ -1,11 +1,11 @@ package zookeeper import ( - "github.com/dubbo/dubbo-go/config" jerrors "github.com/juju/errors" ) import ( + "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/registry" ) diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go index 8336a5352455211ae337a4b35ce702d34c18d672..af2c27fb51f09ece7661f976a7ad1448c6ce0d5f 100644 --- a/registry/zookeeper/listener.go +++ b/registry/zookeeper/listener.go @@ -3,7 +3,6 @@ package zookeeper import ( "context" "fmt" - "github.com/dubbo/dubbo-go/config" "path" "sync" "time" @@ -16,6 +15,7 @@ import ( ) import ( + "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/registry" ) diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index 6aa3a1ca8e1a0fa1fb14158b87fb94ff27cc4c82..48fe411e52b3509a952775051188327e7b93a390 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -3,8 +3,6 @@ package zookeeper import ( "context" "fmt" - "github.com/dubbo/dubbo-go/common/extension" - "github.com/dubbo/dubbo-go/config" "net/url" "os" "strconv" @@ -20,6 +18,8 @@ import ( ) import ( + "github.com/dubbo/dubbo-go/common/extension" + "github.com/dubbo/dubbo-go/config" "github.com/dubbo/dubbo-go/registry" "github.com/dubbo/dubbo-go/version" ) @@ -64,7 +64,7 @@ type ZkRegistry struct { zkPath map[string]int // key = protocol://ip:port/interface } -func NewZkRegistry( url *config.RegistryURL) (registry.Registry, error) { +func NewZkRegistry(url *config.RegistryURL) (registry.Registry, error) { var ( err error r *ZkRegistry