From 2add39758d403ef1e5207f1c2a5a36fc1b5247f7 Mon Sep 17 00:00:00 2001
From: "vito.he" <hxmhlt@163.com>
Date: Tue, 14 May 2019 10:53:53 +0800
Subject: [PATCH] Mod:format import
---
cluster/cluster_impl/base_cluster_invoker.go | 2 +-
cluster/directory/base_directory.go | 8 ++++++--
cluster/directory/service_array.go | 4 +++-
cluster/loadbalance.go | 2 +-
cluster/loadbalance/random.go | 2 +-
common/proxy/proxy.go | 2 +-
common/proxy/proxy_test.go | 2 +-
config/reference_config.go | 2 +-
config/registry_config.go | 7 +++++--
config/service_config.go | 2 +-
examples/dubbo/go-client/app/client.go | 4 ++--
examples/dubbo/go-client/app/user.go | 2 +-
examples/dubbo/go-server/app/server.go | 4 ++--
examples/dubbo/go-server/app/user.go | 2 +-
filter/imp/echo_filter_test.go | 2 +-
protocol/dubbo/client.go | 4 ++--
protocol/dubbo/dubbo_invoker.go | 2 +-
protocol/dubbo/dubbo_protocol.go | 2 +-
protocol/dubbo/dubbo_protocol_test.go | 2 +-
protocol/dubbo/listener.go | 4 ++--
protocol/dubbo/readwriter.go | 4 +++-
protocol/dubbo/server.go | 4 ++--
protocol/invocation/rpcinvocation.go | 2 +-
protocol/jsonrpc/http.go | 2 +-
protocol/jsonrpc/jsonrpc_invoker.go | 2 +-
protocol/jsonrpc/jsonrpc_protocol.go | 4 ++--
protocol/jsonrpc/jsonrpc_protocol_test.go | 4 ++--
protocol/jsonrpc/server.go | 2 +-
protocol/protocol.go | 4 +++-
protocol/protocolwrapper/mock_protocol_filter.go | 4 +++-
protocol/protocolwrapper/protocol_filter_wrapper.go | 4 ++--
registry/directory/directory.go | 2 +-
registry/directory/directory_test.go | 4 ++--
registry/event.go | 4 +++-
registry/mock_registry.go | 4 +++-
registry/protocol/protocol.go | 2 +-
registry/protocol/protocol_test.go | 2 +-
registry/zookeeper/listener.go | 2 +-
registry/zookeeper/registry.go | 2 +-
registry/zookeeper/registry_test.go | 2 +-
40 files changed, 70 insertions(+), 51 deletions(-)
diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go
index 913ffe313..4a4f689a1 100644
--- a/cluster/cluster_impl/base_cluster_invoker.go
+++ b/cluster/cluster_impl/base_cluster_invoker.go
@@ -2,13 +2,13 @@ package cluster
import (
gxnet "github.com/AlexStocks/goext/net"
- "github.com/dubbo/go-for-apache-dubbo/common"
jerrors "github.com/juju/errors"
"github.com/tevino/abool"
)
import (
"github.com/dubbo/go-for-apache-dubbo/cluster"
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/protocol"
"github.com/dubbo/go-for-apache-dubbo/version"
)
diff --git a/cluster/directory/base_directory.go b/cluster/directory/base_directory.go
index 5794c6852..1d6556849 100644
--- a/cluster/directory/base_directory.go
+++ b/cluster/directory/base_directory.go
@@ -1,10 +1,14 @@
package directory
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/tevino/abool"
"sync"
)
+import (
+ "github.com/tevino/abool"
+)
+import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+)
type BaseDirectory struct {
url *common.URL
diff --git a/cluster/directory/service_array.go b/cluster/directory/service_array.go
index f510edc0a..4d4a92254 100644
--- a/cluster/directory/service_array.go
+++ b/cluster/directory/service_array.go
@@ -3,7 +3,6 @@ package directory
import (
"context"
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/common"
"strings"
"time"
)
@@ -11,6 +10,9 @@ import (
import (
jerrors "github.com/juju/errors"
)
+import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+)
//////////////////////////////////////////
// registry array
diff --git a/cluster/loadbalance.go b/cluster/loadbalance.go
index 68a09f43b..880bcc9be 100644
--- a/cluster/loadbalance.go
+++ b/cluster/loadbalance.go
@@ -1,11 +1,11 @@
package cluster
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"time"
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/cluster/loadbalance/random.go b/cluster/loadbalance/random.go
index 09c9ff337..85780e345 100644
--- a/cluster/loadbalance/random.go
+++ b/cluster/loadbalance/random.go
@@ -1,12 +1,12 @@
package loadbalance
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"math/rand"
)
import (
"github.com/dubbo/go-for-apache-dubbo/cluster"
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/common/proxy/proxy.go b/common/proxy/proxy.go
index fd876da6b..5447c5656 100644
--- a/common/proxy/proxy.go
+++ b/common/proxy/proxy.go
@@ -1,7 +1,6 @@
package proxy
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"reflect"
)
import (
@@ -9,6 +8,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/protocol"
"github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
)
diff --git a/common/proxy/proxy_test.go b/common/proxy/proxy_test.go
index 6d5422ffd..2335fa3c5 100644
--- a/common/proxy/proxy_test.go
+++ b/common/proxy/proxy_test.go
@@ -3,7 +3,6 @@ package proxy
import (
"context"
"errors"
- "github.com/dubbo/go-for-apache-dubbo/common"
"testing"
)
@@ -12,6 +11,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/config/reference_config.go b/config/reference_config.go
index f61b70d4a..d06c70e0e 100644
--- a/config/reference_config.go
+++ b/config/reference_config.go
@@ -2,7 +2,6 @@ package config
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
"net/url"
"strconv"
"time"
@@ -10,6 +9,7 @@ import (
import (
"github.com/dubbo/go-for-apache-dubbo/cluster/directory"
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/common/proxy"
diff --git a/config/registry_config.go b/config/registry_config.go
index fb40a9a10..9e646d98b 100644
--- a/config/registry_config.go
+++ b/config/registry_config.go
@@ -2,8 +2,6 @@ package config
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
"net/url"
"strconv"
)
@@ -11,6 +9,11 @@ import (
log "github.com/AlexStocks/log4go"
)
+import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/dubbo/go-for-apache-dubbo/common/constant"
+)
+
type RegistryConfig struct {
Id string `required:"true" yaml:"id" json:"id,omitempty"`
Type string `required:"true" yaml:"type" json:"type,omitempty"`
diff --git a/config/service_config.go b/config/service_config.go
index 2700c3bab..70dcc77f9 100644
--- a/config/service_config.go
+++ b/config/service_config.go
@@ -2,7 +2,6 @@ package config
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
"net/url"
"strconv"
"strings"
@@ -15,6 +14,7 @@ import (
"go.uber.org/atomic"
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/protocol"
diff --git a/examples/dubbo/go-client/app/client.go b/examples/dubbo/go-client/app/client.go
index f984bd8f1..42c3557f1 100644
--- a/examples/dubbo/go-client/app/client.go
+++ b/examples/dubbo/go-client/app/client.go
@@ -3,7 +3,6 @@ package main
import (
"context"
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/config"
"net/http"
_ "net/http/pprof"
"os"
@@ -21,13 +20,14 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/config"
_ "github.com/dubbo/go-for-apache-dubbo/protocol/dubbo"
_ "github.com/dubbo/go-for-apache-dubbo/registry/protocol"
_ "github.com/dubbo/go-for-apache-dubbo/filter/imp"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
_ "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
+ _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
_ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper"
)
diff --git a/examples/dubbo/go-client/app/user.go b/examples/dubbo/go-client/app/user.go
index ed2c0822c..119511596 100644
--- a/examples/dubbo/go-client/app/user.go
+++ b/examples/dubbo/go-client/app/user.go
@@ -3,12 +3,12 @@ package main
import (
"context"
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/config"
"strconv"
"time"
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/config"
"github.com/dubbogo/hessian2"
)
diff --git a/examples/dubbo/go-server/app/server.go b/examples/dubbo/go-server/app/server.go
index 4b25dc1f6..e517ac9a9 100644
--- a/examples/dubbo/go-server/app/server.go
+++ b/examples/dubbo/go-server/app/server.go
@@ -2,7 +2,6 @@ package main
import (
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/config"
"net/http"
_ "net/http/pprof"
"os"
@@ -19,13 +18,14 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/config"
_ "github.com/dubbo/go-for-apache-dubbo/protocol/dubbo"
_ "github.com/dubbo/go-for-apache-dubbo/registry/protocol"
_ "github.com/dubbo/go-for-apache-dubbo/filter/imp"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
_ "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
+ _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
_ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper"
)
diff --git a/examples/dubbo/go-server/app/user.go b/examples/dubbo/go-server/app/user.go
index 8565f8071..cf9494a43 100644
--- a/examples/dubbo/go-server/app/user.go
+++ b/examples/dubbo/go-server/app/user.go
@@ -3,13 +3,13 @@ package main
import (
"context"
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/config"
"strconv"
"time"
)
import (
"github.com/AlexStocks/goext/log"
+ "github.com/dubbo/go-for-apache-dubbo/config"
"github.com/dubbogo/hessian2"
)
diff --git a/filter/imp/echo_filter_test.go b/filter/imp/echo_filter_test.go
index ba2f52c79..4db247625 100644
--- a/filter/imp/echo_filter_test.go
+++ b/filter/imp/echo_filter_test.go
@@ -1,7 +1,6 @@
package imp
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"testing"
)
@@ -10,6 +9,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/protocol"
"github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
)
diff --git a/protocol/dubbo/client.go b/protocol/dubbo/client.go
index 8daec9791..5ffa5aedc 100644
--- a/protocol/dubbo/client.go
+++ b/protocol/dubbo/client.go
@@ -1,8 +1,6 @@
package dubbo
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/config"
"strings"
"sync"
"time"
@@ -18,7 +16,9 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
+ "github.com/dubbo/go-for-apache-dubbo/config"
)
var (
diff --git a/protocol/dubbo/dubbo_invoker.go b/protocol/dubbo/dubbo_invoker.go
index 8f844be02..c0e481837 100644
--- a/protocol/dubbo/dubbo_invoker.go
+++ b/protocol/dubbo/dubbo_invoker.go
@@ -2,7 +2,6 @@ package dubbo
import (
"errors"
- "github.com/dubbo/go-for-apache-dubbo/common"
"strconv"
"sync"
)
@@ -12,6 +11,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/protocol"
invocation_impl "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
diff --git a/protocol/dubbo/dubbo_protocol.go b/protocol/dubbo/dubbo_protocol.go
index 483bac387..b122383d8 100644
--- a/protocol/dubbo/dubbo_protocol.go
+++ b/protocol/dubbo/dubbo_protocol.go
@@ -2,10 +2,10 @@ package dubbo
import (
log "github.com/AlexStocks/log4go"
- "github.com/dubbo/go-for-apache-dubbo/common"
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/protocol/dubbo/dubbo_protocol_test.go b/protocol/dubbo/dubbo_protocol_test.go
index 0379a4b19..99a189f32 100644
--- a/protocol/dubbo/dubbo_protocol_test.go
+++ b/protocol/dubbo/dubbo_protocol_test.go
@@ -2,7 +2,6 @@ package dubbo
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
"testing"
)
@@ -11,6 +10,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/protocol/dubbo/listener.go b/protocol/dubbo/listener.go
index bba2e11e6..8620cd40c 100644
--- a/protocol/dubbo/listener.go
+++ b/protocol/dubbo/listener.go
@@ -2,8 +2,6 @@ package dubbo
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
"reflect"
"sync"
"time"
@@ -17,6 +15,8 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/protocol"
"github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
)
diff --git a/protocol/dubbo/readwriter.go b/protocol/dubbo/readwriter.go
index 0dcec72d6..d930a5e81 100644
--- a/protocol/dubbo/readwriter.go
+++ b/protocol/dubbo/readwriter.go
@@ -2,7 +2,6 @@ package dubbo
import (
"bytes"
- "github.com/dubbo/go-for-apache-dubbo/common"
"reflect"
)
@@ -11,6 +10,9 @@ import (
log "github.com/AlexStocks/log4go"
jerrors "github.com/juju/errors"
)
+import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+)
////////////////////////////////////////////
// RpcClientPackageHandler
diff --git a/protocol/dubbo/server.go b/protocol/dubbo/server.go
index 8a4765070..ad831acbe 100644
--- a/protocol/dubbo/server.go
+++ b/protocol/dubbo/server.go
@@ -2,8 +2,6 @@ package dubbo
import (
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/config"
"net"
)
@@ -14,6 +12,8 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/dubbo/go-for-apache-dubbo/config"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/protocol/invocation/rpcinvocation.go b/protocol/invocation/rpcinvocation.go
index 89143856b..e6034d2c5 100644
--- a/protocol/invocation/rpcinvocation.go
+++ b/protocol/invocation/rpcinvocation.go
@@ -1,11 +1,11 @@
package invocation
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"reflect"
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/protocol/jsonrpc/http.go b/protocol/jsonrpc/http.go
index 1dbe012a0..b815e8c05 100644
--- a/protocol/jsonrpc/http.go
+++ b/protocol/jsonrpc/http.go
@@ -5,7 +5,6 @@ import (
"bytes"
"context"
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/common"
"io/ioutil"
"net"
"net/http"
@@ -21,6 +20,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
)
diff --git a/protocol/jsonrpc/jsonrpc_invoker.go b/protocol/jsonrpc/jsonrpc_invoker.go
index 3ded3ef81..645fe8b0d 100644
--- a/protocol/jsonrpc/jsonrpc_invoker.go
+++ b/protocol/jsonrpc/jsonrpc_invoker.go
@@ -2,7 +2,6 @@ package jsonrpc
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
)
import (
@@ -11,6 +10,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/protocol"
invocation_impl "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
diff --git a/protocol/jsonrpc/jsonrpc_protocol.go b/protocol/jsonrpc/jsonrpc_protocol.go
index bbd4fc1dd..b8ae6be59 100644
--- a/protocol/jsonrpc/jsonrpc_protocol.go
+++ b/protocol/jsonrpc/jsonrpc_protocol.go
@@ -2,12 +2,12 @@ package jsonrpc
import (
log "github.com/AlexStocks/log4go"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/config"
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
+ "github.com/dubbo/go-for-apache-dubbo/config"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/protocol/jsonrpc/jsonrpc_protocol_test.go b/protocol/jsonrpc/jsonrpc_protocol_test.go
index 619d3f640..e8609da1a 100644
--- a/protocol/jsonrpc/jsonrpc_protocol_test.go
+++ b/protocol/jsonrpc/jsonrpc_protocol_test.go
@@ -2,8 +2,6 @@ package jsonrpc
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/config"
"testing"
"time"
)
@@ -13,6 +11,8 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/dubbo/go-for-apache-dubbo/config"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/protocol/jsonrpc/server.go b/protocol/jsonrpc/server.go
index f64c6c102..dba427b71 100644
--- a/protocol/jsonrpc/server.go
+++ b/protocol/jsonrpc/server.go
@@ -4,7 +4,6 @@ import (
"bufio"
"bytes"
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
"io"
"io/ioutil"
"net"
@@ -22,6 +21,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/protocol"
"github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
diff --git a/protocol/protocol.go b/protocol/protocol.go
index 4df2e609d..cd11b101d 100644
--- a/protocol/protocol.go
+++ b/protocol/protocol.go
@@ -1,13 +1,15 @@
package protocol
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"sync"
)
import (
log "github.com/AlexStocks/log4go"
)
+import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+)
// Extension - protocol
type Protocol interface {
diff --git a/protocol/protocolwrapper/mock_protocol_filter.go b/protocol/protocolwrapper/mock_protocol_filter.go
index 7852cfbf1..7776fa9dd 100644
--- a/protocol/protocolwrapper/mock_protocol_filter.go
+++ b/protocol/protocolwrapper/mock_protocol_filter.go
@@ -1,9 +1,11 @@
package protocolwrapper
+import (
+ "sync"
+)
import (
"github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/protocol"
- "sync"
)
type mockProtocolFilter struct {
diff --git a/protocol/protocolwrapper/protocol_filter_wrapper.go b/protocol/protocolwrapper/protocol_filter_wrapper.go
index b8cccec0c..1d27b55d3 100644
--- a/protocol/protocolwrapper/protocol_filter_wrapper.go
+++ b/protocol/protocolwrapper/protocol_filter_wrapper.go
@@ -1,15 +1,15 @@
package protocolwrapper
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/filter/imp"
"strings"
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/filter"
+ "github.com/dubbo/go-for-apache-dubbo/filter/imp"
"github.com/dubbo/go-for-apache-dubbo/protocol"
)
diff --git a/registry/directory/directory.go b/registry/directory/directory.go
index 57e635994..504677dca 100644
--- a/registry/directory/directory.go
+++ b/registry/directory/directory.go
@@ -1,7 +1,6 @@
package directory
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"sync"
"time"
)
@@ -13,6 +12,7 @@ import (
import (
"github.com/dubbo/go-for-apache-dubbo/cluster/directory"
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/protocol"
diff --git a/registry/directory/directory_test.go b/registry/directory/directory_test.go
index 0f5371f07..5e3c6e18b 100644
--- a/registry/directory/directory_test.go
+++ b/registry/directory/directory_test.go
@@ -2,8 +2,6 @@ package directory
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
"net/url"
"strconv"
"testing"
@@ -14,8 +12,10 @@ import (
)
import (
"github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
+ "github.com/dubbo/go-for-apache-dubbo/protocol"
"github.com/dubbo/go-for-apache-dubbo/protocol/protocolwrapper"
"github.com/dubbo/go-for-apache-dubbo/registry"
)
diff --git a/registry/event.go b/registry/event.go
index 368779394..9ee1e9715 100644
--- a/registry/event.go
+++ b/registry/event.go
@@ -2,10 +2,12 @@ package registry
import (
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/common"
"math/rand"
"time"
)
+import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+)
func init() {
rand.Seed(time.Now().UnixNano())
diff --git a/registry/mock_registry.go b/registry/mock_registry.go
index f112306d3..8e92b5c8f 100644
--- a/registry/mock_registry.go
+++ b/registry/mock_registry.go
@@ -1,9 +1,11 @@
package registry
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/tevino/abool"
)
+import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
+)
type MockRegistry struct {
listener *listener
diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go
index 2052d244e..809317270 100644
--- a/registry/protocol/protocol.go
+++ b/registry/protocol/protocol.go
@@ -1,7 +1,6 @@
package protocol
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
"sync"
)
@@ -10,6 +9,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/protocol"
diff --git a/registry/protocol/protocol_test.go b/registry/protocol/protocol_test.go
index 6b99d544f..93b5c22bc 100644
--- a/registry/protocol/protocol_test.go
+++ b/registry/protocol/protocol_test.go
@@ -2,7 +2,6 @@ package protocol
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
"testing"
)
import (
@@ -10,6 +9,7 @@ import (
)
import (
cluster "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/protocol"
diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go
index 740f9c009..189522405 100644
--- a/registry/zookeeper/listener.go
+++ b/registry/zookeeper/listener.go
@@ -3,7 +3,6 @@ package zookeeper
import (
"context"
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/common"
"path"
"sync"
"time"
@@ -16,6 +15,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/registry"
)
diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
index 6545b73e6..5660261f6 100644
--- a/registry/zookeeper/registry.go
+++ b/registry/zookeeper/registry.go
@@ -3,7 +3,6 @@ package zookeeper
import (
"context"
"fmt"
- "github.com/dubbo/go-for-apache-dubbo/common"
"net/url"
"os"
"strconv"
@@ -20,6 +19,7 @@ import (
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
"github.com/dubbo/go-for-apache-dubbo/common/extension"
"github.com/dubbo/go-for-apache-dubbo/registry"
diff --git a/registry/zookeeper/registry_test.go b/registry/zookeeper/registry_test.go
index b6e7adbc7..0f8351f1b 100644
--- a/registry/zookeeper/registry_test.go
+++ b/registry/zookeeper/registry_test.go
@@ -2,7 +2,6 @@ package zookeeper
import (
"context"
- "github.com/dubbo/go-for-apache-dubbo/common"
"strconv"
"testing"
"time"
@@ -11,6 +10,7 @@ import (
"github.com/stretchr/testify/assert"
)
import (
+ "github.com/dubbo/go-for-apache-dubbo/common"
"github.com/dubbo/go-for-apache-dubbo/common/constant"
)
--
GitLab