Merge pull request #1907 from zhaoyunxing92/ci
Modifying the CI Process
diff --git a/cluster/cluster_impl/available_cluster_invoker_test.go b/cluster/cluster_impl/available_cluster_invoker_test.go
index d55cac4..50b6ab0 100644
--- a/cluster/cluster_impl/available_cluster_invoker_test.go
+++ b/cluster/cluster_impl/available_cluster_invoker_test.go
@@ -26,6 +26,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go
index 24d11ce..3f1daee 100644
--- a/cluster/cluster_impl/base_cluster_invoker.go
+++ b/cluster/cluster_impl/base_cluster_invoker.go
@@ -19,6 +19,7 @@
import (
perrors "github.com/pkg/errors"
+
"go.uber.org/atomic"
)
diff --git a/cluster/cluster_impl/broadcast_cluster_invoker.go b/cluster/cluster_impl/broadcast_cluster_invoker.go
index b117dbb..52ae65c 100644
--- a/cluster/cluster_impl/broadcast_cluster_invoker.go
+++ b/cluster/cluster_impl/broadcast_cluster_invoker.go
@@ -20,6 +20,7 @@
import (
"context"
)
+
import (
"github.com/apache/dubbo-go/cluster"
"github.com/apache/dubbo-go/common/logger"
diff --git a/cluster/cluster_impl/broadcast_cluster_invoker_test.go b/cluster/cluster_impl/broadcast_cluster_invoker_test.go
index a93deb2..454ff0e 100644
--- a/cluster/cluster_impl/broadcast_cluster_invoker_test.go
+++ b/cluster/cluster_impl/broadcast_cluster_invoker_test.go
@@ -26,6 +26,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/cluster/cluster_impl/failback_cluster_test.go b/cluster/cluster_impl/failback_cluster_test.go
index 2dcff5b..7e45192 100644
--- a/cluster/cluster_impl/failback_cluster_test.go
+++ b/cluster/cluster_impl/failback_cluster_test.go
@@ -27,7 +27,9 @@
import (
"github.com/golang/mock/gomock"
+
perrors "github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
diff --git a/cluster/cluster_impl/failfast_cluster_invoker.go b/cluster/cluster_impl/failfast_cluster_invoker.go
index 018ec19..5f1a1a9 100644
--- a/cluster/cluster_impl/failfast_cluster_invoker.go
+++ b/cluster/cluster_impl/failfast_cluster_invoker.go
@@ -20,6 +20,7 @@
import (
"context"
)
+
import (
"github.com/apache/dubbo-go/cluster"
"github.com/apache/dubbo-go/protocol"
diff --git a/cluster/cluster_impl/failfast_cluster_test.go b/cluster/cluster_impl/failfast_cluster_test.go
index a62903f..6b73b4d 100644
--- a/cluster/cluster_impl/failfast_cluster_test.go
+++ b/cluster/cluster_impl/failfast_cluster_test.go
@@ -25,7 +25,9 @@
import (
"github.com/golang/mock/gomock"
+
perrors "github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
diff --git a/cluster/cluster_impl/failover_cluster_test.go b/cluster/cluster_impl/failover_cluster_test.go
index fc437bb..99b79bd 100644
--- a/cluster/cluster_impl/failover_cluster_test.go
+++ b/cluster/cluster_impl/failover_cluster_test.go
@@ -23,8 +23,10 @@
"net/url"
"testing"
)
+
import (
perrors "github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
@@ -42,7 +44,6 @@
// ///////////////////////////
// mock invoker
// ///////////////////////////
-
// nolint
type MockInvoker struct {
url *common.URL
diff --git a/cluster/cluster_impl/failsafe_cluster_invoker.go b/cluster/cluster_impl/failsafe_cluster_invoker.go
index a5bf4c2..57bbd4e 100644
--- a/cluster/cluster_impl/failsafe_cluster_invoker.go
+++ b/cluster/cluster_impl/failsafe_cluster_invoker.go
@@ -20,6 +20,7 @@
import (
"context"
)
+
import (
"github.com/apache/dubbo-go/cluster"
"github.com/apache/dubbo-go/common/constant"
diff --git a/cluster/cluster_impl/failsafe_cluster_test.go b/cluster/cluster_impl/failsafe_cluster_test.go
index f539f36..0972af6 100644
--- a/cluster/cluster_impl/failsafe_cluster_test.go
+++ b/cluster/cluster_impl/failsafe_cluster_test.go
@@ -25,7 +25,9 @@
import (
"github.com/golang/mock/gomock"
+
perrors "github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
diff --git a/cluster/cluster_impl/forking_cluster_test.go b/cluster/cluster_impl/forking_cluster_test.go
index 315eaf2..44c8ecc 100644
--- a/cluster/cluster_impl/forking_cluster_test.go
+++ b/cluster/cluster_impl/forking_cluster_test.go
@@ -28,6 +28,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/cluster/cluster_impl/zone_aware_cluster_invoker_test.go b/cluster/cluster_impl/zone_aware_cluster_invoker_test.go
index 9ef6f6c..3eb92b8 100644
--- a/cluster/cluster_impl/zone_aware_cluster_invoker_test.go
+++ b/cluster/cluster_impl/zone_aware_cluster_invoker_test.go
@@ -25,6 +25,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/cluster/loadbalance/consistent_hash.go b/cluster/loadbalance/consistent_hash.go
index fcda4ae..6abdd3b 100644
--- a/cluster/loadbalance/consistent_hash.go
+++ b/cluster/loadbalance/consistent_hash.go
@@ -27,9 +27,11 @@
"strconv"
"strings"
)
+
import (
gxsort "github.com/dubbogo/gost/sort"
)
+
import (
"github.com/apache/dubbo-go/cluster"
"github.com/apache/dubbo-go/common/constant"
diff --git a/cluster/router/chain/chain.go b/cluster/router/chain/chain.go
index d9ca416..76bddad 100644
--- a/cluster/router/chain/chain.go
+++ b/cluster/router/chain/chain.go
@@ -28,6 +28,7 @@
import (
perrors "github.com/pkg/errors"
+
"go.uber.org/atomic"
)
diff --git a/cluster/router/condition/factory_test.go b/cluster/router/condition/factory_test.go
index 632403a..3e665c6 100644
--- a/cluster/router/condition/factory_test.go
+++ b/cluster/router/condition/factory_test.go
@@ -27,6 +27,7 @@
import (
perrors "github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
diff --git a/cluster/router/condition/listenable_router.go b/cluster/router/condition/listenable_router.go
index 2e55b20..80da1f3 100644
--- a/cluster/router/condition/listenable_router.go
+++ b/cluster/router/condition/listenable_router.go
@@ -23,6 +23,7 @@
import (
"github.com/RoaringBitmap/roaring"
+
perrors "github.com/pkg/errors"
)
diff --git a/cluster/router/condition/router.go b/cluster/router/condition/router.go
index a2c9687..4b4801c 100644
--- a/cluster/router/condition/router.go
+++ b/cluster/router/condition/router.go
@@ -24,7 +24,9 @@
import (
"github.com/RoaringBitmap/roaring"
+
"github.com/dubbogo/gost/container/set"
+
perrors "github.com/pkg/errors"
)
diff --git a/cluster/router/condition/router_test.go b/cluster/router/condition/router_test.go
index 2895703..e56fb36 100644
--- a/cluster/router/condition/router_test.go
+++ b/cluster/router/condition/router_test.go
@@ -22,11 +22,15 @@
)
import (
- "github.com/apache/dubbo-go/common"
"github.com/dubbogo/gost/container/set"
+
"github.com/stretchr/testify/assert"
)
+import (
+ "github.com/apache/dubbo-go/common"
+)
+
func TestParseRule(t *testing.T) {
testString := ``
matchPair, err := parseRule(testString)
diff --git a/cluster/router/tag/file.go b/cluster/router/tag/file.go
index 4d78479..f4687a6 100644
--- a/cluster/router/tag/file.go
+++ b/cluster/router/tag/file.go
@@ -26,6 +26,7 @@
import (
"github.com/RoaringBitmap/roaring"
+
perrors "github.com/pkg/errors"
)
diff --git a/cluster/router/tag/tag_router.go b/cluster/router/tag/tag_router.go
index 524bb41..1831756 100644
--- a/cluster/router/tag/tag_router.go
+++ b/cluster/router/tag/tag_router.go
@@ -25,7 +25,9 @@
import (
"github.com/RoaringBitmap/roaring"
+
gxnet "github.com/dubbogo/gost/net"
+
perrors "github.com/pkg/errors"
)
diff --git a/cluster/router/tag/tag_router_test.go b/cluster/router/tag/tag_router_test.go
index 097a8cc..4aef16f 100644
--- a/cluster/router/tag/tag_router_test.go
+++ b/cluster/router/tag/tag_router_test.go
@@ -24,8 +24,11 @@
import (
"github.com/RoaringBitmap/roaring"
+
"github.com/dubbogo/go-zookeeper/zk"
+
gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
+
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
)
diff --git a/cluster/router/utils/bitmap_util_test.go b/cluster/router/utils/bitmap_util_test.go
index b88e106..6ba8cab 100644
--- a/cluster/router/utils/bitmap_util_test.go
+++ b/cluster/router/utils/bitmap_util_test.go
@@ -24,6 +24,7 @@
import (
"github.com/RoaringBitmap/roaring"
+
"github.com/stretchr/testify/assert"
)
diff --git a/common/extension/event_dispatcher_test.go b/common/extension/event_dispatcher_test.go
index 472360c..6b8f23a 100644
--- a/common/extension/event_dispatcher_test.go
+++ b/common/extension/event_dispatcher_test.go
@@ -25,6 +25,7 @@
import (
"github.com/stretchr/testify/assert"
)
+
import (
"github.com/apache/dubbo-go/common/observer"
)
diff --git a/common/extension/service_discovery.go b/common/extension/service_discovery.go
index 0227920..5d3492b 100644
--- a/common/extension/service_discovery.go
+++ b/common/extension/service_discovery.go
@@ -20,6 +20,7 @@
import (
perrors "github.com/pkg/errors"
)
+
import (
"github.com/apache/dubbo-go/registry"
)
diff --git a/common/host_util.go b/common/host_util.go
index 9861c92..1f2c939 100644
--- a/common/host_util.go
+++ b/common/host_util.go
@@ -17,7 +17,9 @@
package common
-import gxnet "github.com/dubbogo/gost/net"
+import (
+ gxnet "github.com/dubbogo/gost/net"
+)
var localIp string
diff --git a/common/logger/logger.go b/common/logger/logger.go
index 669a611..9b0d349 100644
--- a/common/logger/logger.go
+++ b/common/logger/logger.go
@@ -27,9 +27,12 @@
import (
"github.com/apache/dubbo-getty"
+
perrors "github.com/pkg/errors"
+
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
+
"gopkg.in/yaml.v2"
)
diff --git a/common/proxy/proxy.go b/common/proxy/proxy.go
index fd34810..de92d12 100644
--- a/common/proxy/proxy.go
+++ b/common/proxy/proxy.go
@@ -25,6 +25,7 @@
import (
"github.com/apache/dubbo-go-hessian2/java_exception"
+
perrors "github.com/pkg/errors"
)
diff --git a/common/proxy/proxy_test.go b/common/proxy/proxy_test.go
index c335bf6..6a682ff 100644
--- a/common/proxy/proxy_test.go
+++ b/common/proxy/proxy_test.go
@@ -26,6 +26,7 @@
import (
perrors "github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
diff --git a/common/url.go b/common/url.go
index e51fd70..dbb872c 100644
--- a/common/url.go
+++ b/common/url.go
@@ -32,9 +32,13 @@
import (
cm "github.com/Workiva/go-datastructures/common"
+
gxset "github.com/dubbogo/gost/container/set"
+
"github.com/jinzhu/copier"
+
perrors "github.com/pkg/errors"
+
"github.com/satori/go.uuid"
)
@@ -46,7 +50,6 @@
// ///////////////////////////////
// dubbo role type
// ///////////////////////////////
-
// role constant
const (
// CONSUMER is consumer role
diff --git a/common/yaml/yaml.go b/common/yaml/yaml.go
index d7e1ca4..677133b 100644
--- a/common/yaml/yaml.go
+++ b/common/yaml/yaml.go
@@ -24,6 +24,7 @@
import (
perrors "github.com/pkg/errors"
+
"gopkg.in/yaml.v2"
)
diff --git a/config/config_center_config.go b/config/config_center_config.go
index fe728fb..8706de5 100644
--- a/config/config_center_config.go
+++ b/config/config_center_config.go
@@ -24,6 +24,7 @@
import (
"github.com/creasty/defaults"
+
perrors "github.com/pkg/errors"
)
diff --git a/config/config_loader_test.go b/config/config_loader_test.go
index 05e9499..14f925b 100644
--- a/config/config_loader_test.go
+++ b/config/config_loader_test.go
@@ -26,9 +26,12 @@
import (
"github.com/Workiva/go-datastructures/slice/skip"
+
gxset "github.com/dubbogo/gost/container/set"
gxpage "github.com/dubbogo/gost/hash/page"
+
"github.com/stretchr/testify/assert"
+
"go.uber.org/atomic"
)
diff --git a/config/consumer_config.go b/config/consumer_config.go
index de05224..741b691 100644
--- a/config/consumer_config.go
+++ b/config/consumer_config.go
@@ -24,6 +24,7 @@
import (
"github.com/creasty/defaults"
+
perrors "github.com/pkg/errors"
)
diff --git a/config/generic_service.go b/config/generic_service.go
index a3332af..88ceea2 100644
--- a/config/generic_service.go
+++ b/config/generic_service.go
@@ -17,7 +17,9 @@
package config
-import "context"
+import (
+ "context"
+)
// GenericService uses for generic invoke for service call
type GenericService struct {
diff --git a/config/interfaces/config_reader.go b/config/interfaces/config_reader.go
index b23f989..b82d873 100644
--- a/config/interfaces/config_reader.go
+++ b/config/interfaces/config_reader.go
@@ -17,7 +17,9 @@
package interfaces
-import "bytes"
+import (
+ "bytes"
+)
// ConfigReader is used to read config from consumer or provider
type ConfigReader interface {
diff --git a/config/metadata_report_config.go b/config/metadata_report_config.go
index 6b5aa29..d5766f7 100644
--- a/config/metadata_report_config.go
+++ b/config/metadata_report_config.go
@@ -19,13 +19,18 @@
import (
"net/url"
+)
+import (
"github.com/creasty/defaults"
+ perrors "github.com/pkg/errors"
+)
+
+import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/config/instance"
- perrors "github.com/pkg/errors"
)
// MethodConfig is method level configuration
diff --git a/config/metadata_report_config_test.go b/config/metadata_report_config_test.go
index 1c585ee..bb191b3 100644
--- a/config/metadata_report_config_test.go
+++ b/config/metadata_report_config_test.go
@@ -17,7 +17,9 @@
package config
-import "testing"
+import (
+ "testing"
+)
import (
"github.com/stretchr/testify/assert"
diff --git a/config/provider_config.go b/config/provider_config.go
index 3605906..0d2296f 100644
--- a/config/provider_config.go
+++ b/config/provider_config.go
@@ -23,6 +23,7 @@
import (
"github.com/creasty/defaults"
+
perrors "github.com/pkg/errors"
)
@@ -34,7 +35,6 @@
/////////////////////////
// providerConfig
/////////////////////////
-
// ProviderConfig is the default configuration of service provider
type ProviderConfig struct {
BaseConfig `yaml:",inline" property:"base"`
diff --git a/config/reference_config.go b/config/reference_config.go
index c298296..5a975aa 100644
--- a/config/reference_config.go
+++ b/config/reference_config.go
@@ -25,6 +25,7 @@
"time"
"github.com/creasty/defaults"
+
gxstrings "github.com/dubbogo/gost/strings"
"github.com/apache/dubbo-go/cluster/directory"
diff --git a/config/remote_config_test.go b/config/remote_config_test.go
index 82535fd..cd21369 100644
--- a/config/remote_config_test.go
+++ b/config/remote_config_test.go
@@ -20,6 +20,7 @@
import (
"testing"
)
+
import (
"github.com/stretchr/testify/assert"
)
diff --git a/config/router_config.go b/config/router_config.go
index ea19b46..7323e49 100644
--- a/config/router_config.go
+++ b/config/router_config.go
@@ -19,6 +19,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
perrors "github.com/pkg/errors"
)
diff --git a/config/router_config_test.go b/config/router_config_test.go
index 13af705..d48da74 100644
--- a/config/router_config_test.go
+++ b/config/router_config_test.go
@@ -24,6 +24,7 @@
import (
"github.com/dubbogo/gost/container/set"
+
"github.com/stretchr/testify/assert"
)
diff --git a/config/service_config.go b/config/service_config.go
index 4452fef..22f361e 100644
--- a/config/service_config.go
+++ b/config/service_config.go
@@ -30,8 +30,11 @@
import (
"github.com/creasty/defaults"
+
gxnet "github.com/dubbogo/gost/net"
+
perrors "github.com/pkg/errors"
+
"go.uber.org/atomic"
)
diff --git a/config/service_config_test.go b/config/service_config_test.go
index aea0bde..dcd8c54 100644
--- a/config/service_config_test.go
+++ b/config/service_config_test.go
@@ -18,16 +18,17 @@
package config
import (
- "github.com/apache/dubbo-go/common"
"testing"
)
import (
"github.com/stretchr/testify/assert"
+
"go.uber.org/atomic"
)
import (
+ "github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/extension"
)
diff --git a/config_center/apollo/impl.go b/config_center/apollo/impl.go
index 5b74f5e..1d8cc62 100644
--- a/config_center/apollo/impl.go
+++ b/config_center/apollo/impl.go
@@ -26,7 +26,9 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
perrors "github.com/pkg/errors"
+
"github.com/zouyx/agollo/v3"
agolloConstant "github.com/zouyx/agollo/v3/constant"
"github.com/zouyx/agollo/v3/env/config"
diff --git a/config_center/apollo/listener.go b/config_center/apollo/listener.go
index 44d3255..1e5c005 100644
--- a/config_center/apollo/listener.go
+++ b/config_center/apollo/listener.go
@@ -20,6 +20,7 @@
import (
"github.com/zouyx/agollo/v3"
"github.com/zouyx/agollo/v3/storage"
+
"gopkg.in/yaml.v2"
)
diff --git a/config_center/file/impl.go b/config_center/file/impl.go
index 6489a07..a7d7d63 100644
--- a/config_center/file/impl.go
+++ b/config_center/file/impl.go
@@ -31,6 +31,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
perrors "github.com/pkg/errors"
)
diff --git a/config_center/mock_dynamic_config.go b/config_center/mock_dynamic_config.go
index 9bebd60..7d33535 100644
--- a/config_center/mock_dynamic_config.go
+++ b/config_center/mock_dynamic_config.go
@@ -23,6 +23,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
"gopkg.in/yaml.v2"
)
diff --git a/config_center/nacos/client.go b/config_center/nacos/client.go
index 6ce6108..4099c85 100644
--- a/config_center/nacos/client.go
+++ b/config_center/nacos/client.go
@@ -24,6 +24,7 @@
import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
+
perrors "github.com/pkg/errors"
)
diff --git a/config_center/nacos/impl.go b/config_center/nacos/impl.go
index 5d22cdc..cb90828 100644
--- a/config_center/nacos/impl.go
+++ b/config_center/nacos/impl.go
@@ -25,7 +25,9 @@
import (
gxset "github.com/dubbogo/gost/container/set"
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
+
"github.com/nacos-group/nacos-sdk-go/vo"
+
perrors "github.com/pkg/errors"
)
diff --git a/config_center/parser/configuration_parser.go b/config_center/parser/configuration_parser.go
index b104d3d..2d80141 100644
--- a/config_center/parser/configuration_parser.go
+++ b/config_center/parser/configuration_parser.go
@@ -24,7 +24,9 @@
import (
"github.com/magiconair/properties"
+
perrors "github.com/pkg/errors"
+
"gopkg.in/yaml.v2"
)
diff --git a/config_center/zookeeper/impl.go b/config_center/zookeeper/impl.go
index fa6ae1a..e03814e 100644
--- a/config_center/zookeeper/impl.go
+++ b/config_center/zookeeper/impl.go
@@ -25,6 +25,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
+
perrors "github.com/pkg/errors"
)
diff --git a/filter/filter_impl/access_log_filter_test.go b/filter/filter_impl/access_log_filter_test.go
index 9c4b947..73f3f8c 100644
--- a/filter/filter_impl/access_log_filter_test.go
+++ b/filter/filter_impl/access_log_filter_test.go
@@ -24,6 +24,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/active_filter_test.go b/filter/filter_impl/active_filter_test.go
index c616c6f..0ece987 100644
--- a/filter/filter_impl/active_filter_test.go
+++ b/filter/filter_impl/active_filter_test.go
@@ -26,6 +26,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/auth/consumer_sign.go b/filter/filter_impl/auth/consumer_sign.go
index 8f3f6df..ab3682e 100644
--- a/filter/filter_impl/auth/consumer_sign.go
+++ b/filter/filter_impl/auth/consumer_sign.go
@@ -21,6 +21,7 @@
"context"
"fmt"
)
+
import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
diff --git a/filter/filter_impl/auth/consumer_sign_test.go b/filter/filter_impl/auth/consumer_sign_test.go
index edd1b23..77bbace 100644
--- a/filter/filter_impl/auth/consumer_sign_test.go
+++ b/filter/filter_impl/auth/consumer_sign_test.go
@@ -24,6 +24,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/auth/default_authenticator.go b/filter/filter_impl/auth/default_authenticator.go
index 7c7131c..48ed661 100644
--- a/filter/filter_impl/auth/default_authenticator.go
+++ b/filter/filter_impl/auth/default_authenticator.go
@@ -20,7 +20,6 @@
import (
"errors"
"fmt"
- "github.com/apache/dubbo-go/filter"
"strconv"
"time"
)
@@ -29,6 +28,7 @@
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/filter"
"github.com/apache/dubbo-go/protocol"
invocation_impl "github.com/apache/dubbo-go/protocol/invocation"
)
diff --git a/filter/filter_impl/auth/provider_auth_test.go b/filter/filter_impl/auth/provider_auth_test.go
index 91a7479..3163d99 100644
--- a/filter/filter_impl/auth/provider_auth_test.go
+++ b/filter/filter_impl/auth/provider_auth_test.go
@@ -26,6 +26,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/generic_filter_test.go b/filter/filter_impl/generic_filter_test.go
index bc861fd..ca47593 100644
--- a/filter/filter_impl/generic_filter_test.go
+++ b/filter/filter_impl/generic_filter_test.go
@@ -25,7 +25,9 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/generic_generalizer_map.go b/filter/filter_impl/generic_generalizer_map.go
index 73531a3..ed32eef 100644
--- a/filter/filter_impl/generic_generalizer_map.go
+++ b/filter/filter_impl/generic_generalizer_map.go
@@ -26,7 +26,9 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
"github.com/mitchellh/mapstructure"
+
perrors "github.com/pkg/errors"
)
diff --git a/filter/filter_impl/generic_service_filter.go b/filter/filter_impl/generic_service_filter.go
index 886bb05..c3dcdf2 100644
--- a/filter/filter_impl/generic_service_filter.go
+++ b/filter/filter_impl/generic_service_filter.go
@@ -23,6 +23,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
perrors "github.com/pkg/errors"
)
diff --git a/filter/filter_impl/generic_service_filter_test.go b/filter/filter_impl/generic_service_filter_test.go
index d32e803..80c7eda 100644
--- a/filter/filter_impl/generic_service_filter_test.go
+++ b/filter/filter_impl/generic_service_filter_test.go
@@ -26,7 +26,9 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/hystrix_filter.go b/filter/filter_impl/hystrix_filter.go
index 6a3180f..b3593fb 100644
--- a/filter/filter_impl/hystrix_filter.go
+++ b/filter/filter_impl/hystrix_filter.go
@@ -23,11 +23,15 @@
"regexp"
"sync"
)
+
import (
"github.com/afex/hystrix-go/hystrix"
+
perrors "github.com/pkg/errors"
+
"gopkg.in/yaml.v2"
)
+
import (
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/common/logger"
diff --git a/filter/filter_impl/hystrix_filter_test.go b/filter/filter_impl/hystrix_filter_test.go
index 4973ce7..f7f719a 100644
--- a/filter/filter_impl/hystrix_filter_test.go
+++ b/filter/filter_impl/hystrix_filter_test.go
@@ -25,7 +25,9 @@
import (
"github.com/afex/hystrix-go/hystrix"
+
"github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/sentinel_filter.go b/filter/filter_impl/sentinel_filter.go
index 11accbd..fc97a92 100644
--- a/filter/filter_impl/sentinel_filter.go
+++ b/filter/filter_impl/sentinel_filter.go
@@ -42,7 +42,6 @@
// 1. Must initialize Sentinel Go run environment,
// refer to https://github.com/alibaba/sentinel-golang/blob/master/api/init.go
// 2. Register rules for resources user want to guard
-
func init() {
extension.SetFilter(SentinelProviderFilterName, GetSentinelProviderFilter)
extension.SetFilter(SentinelConsumerFilterName, GetSentinelConsumerFilter)
diff --git a/filter/filter_impl/sentinel_filter_test.go b/filter/filter_impl/sentinel_filter_test.go
index c6b6d42..ff98b50 100644
--- a/filter/filter_impl/sentinel_filter_test.go
+++ b/filter/filter_impl/sentinel_filter_test.go
@@ -26,6 +26,7 @@
import (
"github.com/alibaba/sentinel-golang/core/flow"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/tps/tps_limit_strategy_mock.go b/filter/filter_impl/tps/tps_limit_strategy_mock.go
index be76466..45d4ac6 100644
--- a/filter/filter_impl/tps/tps_limit_strategy_mock.go
+++ b/filter/filter_impl/tps/tps_limit_strategy_mock.go
@@ -22,11 +22,11 @@
package tps
import (
- gomock "github.com/golang/mock/gomock"
+ reflect "reflect"
)
import (
- reflect "reflect"
+ gomock "github.com/golang/mock/gomock"
)
// MockTpsLimitStrategy is a mock of TpsLimitStrategy interface
diff --git a/filter/filter_impl/tps/tps_limiter_method_service_test.go b/filter/filter_impl/tps/tps_limiter_method_service_test.go
index 5baa70a..0b56587 100644
--- a/filter/filter_impl/tps/tps_limiter_method_service_test.go
+++ b/filter/filter_impl/tps/tps_limiter_method_service_test.go
@@ -21,8 +21,10 @@
"net/url"
"testing"
)
+
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/filter/filter_impl/tps_limit_filter.go b/filter/filter_impl/tps_limit_filter.go
index 57e563d..ca2baab 100644
--- a/filter/filter_impl/tps_limit_filter.go
+++ b/filter/filter_impl/tps_limit_filter.go
@@ -20,6 +20,7 @@
import (
"context"
)
+
import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
diff --git a/filter/filter_impl/tps_limit_filter_test.go b/filter/filter_impl/tps_limit_filter_test.go
index 55a3a55..a667442 100644
--- a/filter/filter_impl/tps_limit_filter_test.go
+++ b/filter/filter_impl/tps_limit_filter_test.go
@@ -24,10 +24,8 @@
)
import (
- "github.com/apache/dubbo-go/filter"
- "github.com/apache/dubbo-go/filter/filter_impl/tps"
- common2 "github.com/apache/dubbo-go/filter/handler"
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
@@ -35,6 +33,9 @@
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/filter"
+ "github.com/apache/dubbo-go/filter/filter_impl/tps"
+ common2 "github.com/apache/dubbo-go/filter/handler"
"github.com/apache/dubbo-go/protocol"
"github.com/apache/dubbo-go/protocol/invocation"
)
diff --git a/filter/handler/rejected_execution_handler_only_log.go b/filter/handler/rejected_execution_handler_only_log.go
index 5242b5b..68f9919 100644
--- a/filter/handler/rejected_execution_handler_only_log.go
+++ b/filter/handler/rejected_execution_handler_only_log.go
@@ -18,7 +18,6 @@
package handler
import (
- "github.com/apache/dubbo-go/filter"
"sync"
)
@@ -27,6 +26,7 @@
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/filter"
"github.com/apache/dubbo-go/protocol"
)
diff --git a/filter/handler/rejected_execution_handler_only_log_test.go b/filter/handler/rejected_execution_handler_only_log_test.go
index 7aa4aff..acc3a19 100644
--- a/filter/handler/rejected_execution_handler_only_log_test.go
+++ b/filter/handler/rejected_execution_handler_only_log_test.go
@@ -21,6 +21,7 @@
"net/url"
"testing"
)
+
import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
diff --git a/metadata/mapping/dynamic/service_name_mapping.go b/metadata/mapping/dynamic/service_name_mapping.go
index 84039ac..2367795 100644
--- a/metadata/mapping/dynamic/service_name_mapping.go
+++ b/metadata/mapping/dynamic/service_name_mapping.go
@@ -25,6 +25,7 @@
import (
"github.com/dubbogo/gost/container/set"
+
perrors "github.com/pkg/errors"
)
diff --git a/metadata/mapping/dynamic/service_name_mapping_test.go b/metadata/mapping/dynamic/service_name_mapping_test.go
index af21704..76e2a60 100644
--- a/metadata/mapping/dynamic/service_name_mapping_test.go
+++ b/metadata/mapping/dynamic/service_name_mapping_test.go
@@ -23,6 +23,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
"github.com/stretchr/testify/assert"
)
diff --git a/metadata/mapping/memory/service_name_mapping.go b/metadata/mapping/memory/service_name_mapping.go
index 0965d52..b603c7e 100644
--- a/metadata/mapping/memory/service_name_mapping.go
+++ b/metadata/mapping/memory/service_name_mapping.go
@@ -24,6 +24,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
)
+
import (
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/config"
diff --git a/metadata/report/delegate/delegate_report.go b/metadata/report/delegate/delegate_report.go
index 56a22de..86bb16f 100644
--- a/metadata/report/delegate/delegate_report.go
+++ b/metadata/report/delegate/delegate_report.go
@@ -26,7 +26,9 @@
import (
"github.com/go-co-op/gocron"
+
perrors "github.com/pkg/errors"
+
"go.uber.org/atomic"
)
diff --git a/metadata/report/delegate/delegate_report_test.go b/metadata/report/delegate/delegate_report_test.go
index f60acf6..8daf5e8 100644
--- a/metadata/report/delegate/delegate_report_test.go
+++ b/metadata/report/delegate/delegate_report_test.go
@@ -25,6 +25,7 @@
import (
"github.com/stretchr/testify/assert"
+
"go.uber.org/atomic"
)
diff --git a/metadata/report/etcd/report_test.go b/metadata/report/etcd/report_test.go
index 59d0975..1c731d1 100644
--- a/metadata/report/etcd/report_test.go
+++ b/metadata/report/etcd/report_test.go
@@ -26,6 +26,7 @@
import (
"github.com/coreos/etcd/embed"
+
"github.com/stretchr/testify/assert"
)
diff --git a/metadata/report/nacos/report.go b/metadata/report/nacos/report.go
index 0337fef..d117764 100644
--- a/metadata/report/nacos/report.go
+++ b/metadata/report/nacos/report.go
@@ -23,7 +23,9 @@
import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
+
"github.com/nacos-group/nacos-sdk-go/vo"
+
perrors "github.com/pkg/errors"
)
diff --git a/metadata/service/remote/service_proxy.go b/metadata/service/remote/service_proxy.go
index e0cd6e0..9a43ac6 100644
--- a/metadata/service/remote/service_proxy.go
+++ b/metadata/service/remote/service_proxy.go
@@ -20,6 +20,7 @@
import (
"strings"
)
+
import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
diff --git a/metadata/service/remote/service_proxy_test.go b/metadata/service/remote/service_proxy_test.go
index 1899d02..d1d3eeb 100644
--- a/metadata/service/remote/service_proxy_test.go
+++ b/metadata/service/remote/service_proxy_test.go
@@ -20,6 +20,7 @@
import (
"testing"
)
+
import (
"github.com/stretchr/testify/assert"
)
diff --git a/protocol/dubbo/dubbo_codec.go b/protocol/dubbo/dubbo_codec.go
index 64cb56c..a040eb6 100644
--- a/protocol/dubbo/dubbo_codec.go
+++ b/protocol/dubbo/dubbo_codec.go
@@ -25,6 +25,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
perrors "github.com/pkg/errors"
)
diff --git a/protocol/dubbo/dubbo_invoker_test.go b/protocol/dubbo/dubbo_invoker_test.go
index 782c615..135b81f 100644
--- a/protocol/dubbo/dubbo_invoker_test.go
+++ b/protocol/dubbo/dubbo_invoker_test.go
@@ -27,8 +27,11 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
"github.com/opentracing/opentracing-go"
+
perrors "github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
diff --git a/protocol/dubbo/hessian2/hessian_dubbo.go b/protocol/dubbo/hessian2/hessian_dubbo.go
index 5ffebde..b243850 100644
--- a/protocol/dubbo/hessian2/hessian_dubbo.go
+++ b/protocol/dubbo/hessian2/hessian_dubbo.go
@@ -25,6 +25,7 @@
import (
"github.com/apache/dubbo-go-hessian2"
+
perrors "github.com/pkg/errors"
)
diff --git a/protocol/dubbo/hessian2/hessian_dubbo_test.go b/protocol/dubbo/hessian2/hessian_dubbo_test.go
index eaaf500..2541fa1 100644
--- a/protocol/dubbo/hessian2/hessian_dubbo_test.go
+++ b/protocol/dubbo/hessian2/hessian_dubbo_test.go
@@ -27,6 +27,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
"github.com/stretchr/testify/assert"
)
diff --git a/protocol/dubbo/hessian2/hessian_request.go b/protocol/dubbo/hessian2/hessian_request.go
index b281273..a2b5714 100644
--- a/protocol/dubbo/hessian2/hessian_request.go
+++ b/protocol/dubbo/hessian2/hessian_request.go
@@ -26,6 +26,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
perrors "github.com/pkg/errors"
)
@@ -36,7 +37,6 @@
/////////////////////////////////////////
// dubbo
/////////////////////////////////////////
-
func getArgType(v interface{}) string {
return GetClassDesc(v)
}
diff --git a/protocol/dubbo/hessian2/hessian_request_test.go b/protocol/dubbo/hessian2/hessian_request_test.go
index 98d5f23..3e75502 100644
--- a/protocol/dubbo/hessian2/hessian_request_test.go
+++ b/protocol/dubbo/hessian2/hessian_request_test.go
@@ -26,6 +26,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
"github.com/stretchr/testify/assert"
)
diff --git a/protocol/dubbo/hessian2/hessian_response.go b/protocol/dubbo/hessian2/hessian_response.go
index b95e1c2..a8d3987 100644
--- a/protocol/dubbo/hessian2/hessian_response.go
+++ b/protocol/dubbo/hessian2/hessian_response.go
@@ -18,7 +18,6 @@
import (
"encoding/binary"
- "github.com/apache/dubbo-go/common/logger"
"math"
"reflect"
"strconv"
@@ -28,9 +27,14 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
"github.com/apache/dubbo-go-hessian2/java_exception"
+
perrors "github.com/pkg/errors"
)
+import (
+ "github.com/apache/dubbo-go/common/logger"
+)
+
// DubboResponse dubbo response
type DubboResponse struct {
RspObj interface{}
diff --git a/protocol/dubbo/hessian2/hessian_response_test.go b/protocol/dubbo/hessian2/hessian_response_test.go
index f5c84ba..b497bad 100644
--- a/protocol/dubbo/hessian2/hessian_response_test.go
+++ b/protocol/dubbo/hessian2/hessian_response_test.go
@@ -24,6 +24,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
"github.com/stretchr/testify/assert"
)
diff --git a/protocol/dubbo/hessian2/java_class.go b/protocol/dubbo/hessian2/java_class.go
index 781ff21..4f43161 100644
--- a/protocol/dubbo/hessian2/java_class.go
+++ b/protocol/dubbo/hessian2/java_class.go
@@ -26,6 +26,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
perrors "github.com/pkg/errors"
)
diff --git a/protocol/dubbo/impl/codec.go b/protocol/dubbo/impl/codec.go
index 50f0dc0..91e5900 100644
--- a/protocol/dubbo/impl/codec.go
+++ b/protocol/dubbo/impl/codec.go
@@ -24,6 +24,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
perrors "github.com/pkg/errors"
)
diff --git a/protocol/dubbo/impl/const.go b/protocol/dubbo/impl/const.go
index c9b92ba..6bc2c93 100644
--- a/protocol/dubbo/impl/const.go
+++ b/protocol/dubbo/impl/const.go
@@ -20,7 +20,9 @@
import (
"reflect"
"regexp"
+)
+import (
"github.com/pkg/errors"
)
diff --git a/protocol/dubbo/impl/hessian.go b/protocol/dubbo/impl/hessian.go
index 4aaf67b..fbfbe5c 100644
--- a/protocol/dubbo/impl/hessian.go
+++ b/protocol/dubbo/impl/hessian.go
@@ -28,6 +28,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
"github.com/apache/dubbo-go-hessian2/java_exception"
+
perrors "github.com/pkg/errors"
)
diff --git a/protocol/dubbo/opentracing.go b/protocol/dubbo/opentracing.go
index f45e6fd..c8fc5c0 100644
--- a/protocol/dubbo/opentracing.go
+++ b/protocol/dubbo/opentracing.go
@@ -20,6 +20,7 @@
import (
"github.com/opentracing/opentracing-go"
)
+
import (
invocation_impl "github.com/apache/dubbo-go/protocol/invocation"
)
diff --git a/protocol/grpc/client.go b/protocol/grpc/client.go
index b8a9143..5dea336 100644
--- a/protocol/grpc/client.go
+++ b/protocol/grpc/client.go
@@ -24,8 +24,11 @@
import (
"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
+
"github.com/opentracing/opentracing-go"
+
"google.golang.org/grpc"
+
"gopkg.in/yaml.v2"
)
diff --git a/protocol/grpc/client_test.go b/protocol/grpc/client_test.go
index a4630c8..8bfdb80 100644
--- a/protocol/grpc/client_test.go
+++ b/protocol/grpc/client_test.go
@@ -24,6 +24,7 @@
import (
"github.com/stretchr/testify/assert"
+
"google.golang.org/grpc"
)
diff --git a/protocol/grpc/codec.go b/protocol/grpc/codec.go
index 7235a39..488b923 100644
--- a/protocol/grpc/codec.go
+++ b/protocol/grpc/codec.go
@@ -25,6 +25,7 @@
import (
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
+
"google.golang.org/grpc/encoding"
)
diff --git a/protocol/grpc/grpc_invoker.go b/protocol/grpc/grpc_invoker.go
index 7b33c67..489ab94 100644
--- a/protocol/grpc/grpc_invoker.go
+++ b/protocol/grpc/grpc_invoker.go
@@ -25,7 +25,9 @@
import (
hessian2 "github.com/apache/dubbo-go-hessian2"
+
"github.com/pkg/errors"
+
"google.golang.org/grpc/connectivity"
)
diff --git a/protocol/grpc/internal/helloworld.pb.go b/protocol/grpc/internal/helloworld.pb.go
index 82537f5..be15013 100644
--- a/protocol/grpc/internal/helloworld.pb.go
+++ b/protocol/grpc/internal/helloworld.pb.go
@@ -24,8 +24,11 @@
"context"
"fmt"
"math"
+)
+import (
"github.com/golang/protobuf/proto"
+
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/protocol/grpc/protoc-gen-dubbo/examples/helloworld.pb.go b/protocol/grpc/protoc-gen-dubbo/examples/helloworld.pb.go
index 702391b..d78ec26 100644
--- a/protocol/grpc/protoc-gen-dubbo/examples/helloworld.pb.go
+++ b/protocol/grpc/protoc-gen-dubbo/examples/helloworld.pb.go
@@ -24,8 +24,11 @@
"context"
"fmt"
"math"
+)
+import (
"github.com/golang/protobuf/proto"
+
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/protocol/grpc/server.go b/protocol/grpc/server.go
index ab8267a..5514b85 100644
--- a/protocol/grpc/server.go
+++ b/protocol/grpc/server.go
@@ -27,7 +27,9 @@
import (
"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
+
"github.com/opentracing/opentracing-go"
+
"google.golang.org/grpc"
)
diff --git a/protocol/invocation/rpcinvocation.go b/protocol/invocation/rpcinvocation.go
index b62c016..d7c709c 100644
--- a/protocol/invocation/rpcinvocation.go
+++ b/protocol/invocation/rpcinvocation.go
@@ -32,7 +32,6 @@
// ///////////////////////////
// Invocation Implement of RPC
// ///////////////////////////
-
// todo: is it necessary to separate fields of consumer(provider) from RPCInvocation
// nolint
type RPCInvocation struct {
diff --git a/protocol/invoker.go b/protocol/invoker.go
index 6bf4d2c..f95f20f 100644
--- a/protocol/invoker.go
+++ b/protocol/invoker.go
@@ -23,6 +23,7 @@
import (
perrors "github.com/pkg/errors"
+
uatomic "go.uber.org/atomic"
)
diff --git a/protocol/jsonrpc/http.go b/protocol/jsonrpc/http.go
index 11051df..2af3abb 100644
--- a/protocol/jsonrpc/http.go
+++ b/protocol/jsonrpc/http.go
@@ -34,6 +34,7 @@
import (
"github.com/opentracing/opentracing-go"
+
perrors "github.com/pkg/errors"
)
@@ -46,7 +47,6 @@
// ////////////////////////////////////////////
// Request
// ////////////////////////////////////////////
-
// Request is HTTP protocol request
type Request struct {
ID int64
diff --git a/protocol/jsonrpc/http_test.go b/protocol/jsonrpc/http_test.go
index 5ef4064..784f0d8 100644
--- a/protocol/jsonrpc/http_test.go
+++ b/protocol/jsonrpc/http_test.go
@@ -26,7 +26,9 @@
import (
"github.com/opentracing/opentracing-go"
+
perrors "github.com/pkg/errors"
+
"github.com/stretchr/testify/assert"
)
diff --git a/protocol/jsonrpc/server.go b/protocol/jsonrpc/server.go
index 76901bf..a64ac3b 100644
--- a/protocol/jsonrpc/server.go
+++ b/protocol/jsonrpc/server.go
@@ -33,6 +33,7 @@
import (
"github.com/opentracing/opentracing-go"
+
perrors "github.com/pkg/errors"
)
diff --git a/protocol/rest/client/client_impl/resty_client.go b/protocol/rest/client/client_impl/resty_client.go
index f301d94..e795803 100644
--- a/protocol/rest/client/client_impl/resty_client.go
+++ b/protocol/rest/client/client_impl/resty_client.go
@@ -27,6 +27,7 @@
import (
"github.com/go-resty/resty/v2"
+
perrors "github.com/pkg/errors"
)
diff --git a/protocol/rest/config/reader/rest_config_reader.go b/protocol/rest/config/reader/rest_config_reader.go
index 2338790..59ad854 100644
--- a/protocol/rest/config/reader/rest_config_reader.go
+++ b/protocol/rest/config/reader/rest_config_reader.go
@@ -25,6 +25,7 @@
import (
perrors "github.com/pkg/errors"
+
"gopkg.in/yaml.v2"
)
diff --git a/protocol/rest/rest_invoker_test.go b/protocol/rest/rest_invoker_test.go
index b6bc980..754c83e 100644
--- a/protocol/rest/rest_invoker_test.go
+++ b/protocol/rest/rest_invoker_test.go
@@ -25,6 +25,7 @@
import (
"github.com/emicklei/go-restful/v3"
+
"github.com/stretchr/testify/assert"
)
diff --git a/protocol/rest/server/server_impl/go_restful_server.go b/protocol/rest/server/server_impl/go_restful_server.go
index 4481f44..b56106d 100644
--- a/protocol/rest/server/server_impl/go_restful_server.go
+++ b/protocol/rest/server/server_impl/go_restful_server.go
@@ -28,6 +28,7 @@
import (
"github.com/emicklei/go-restful/v3"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/consul/listener.go b/registry/consul/listener.go
index 0d665af..a47a2532 100644
--- a/registry/consul/listener.go
+++ b/registry/consul/listener.go
@@ -24,6 +24,7 @@
import (
consul "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/api/watch"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/consul/service_discovery.go b/registry/consul/service_discovery.go
index fba142e..7082cab 100644
--- a/registry/consul/service_discovery.go
+++ b/registry/consul/service_discovery.go
@@ -28,8 +28,10 @@
import (
"github.com/dubbogo/gost/container/set"
"github.com/dubbogo/gost/hash/page"
+
consul "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/api/watch"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/consul/utils.go b/registry/consul/utils.go
index 76f5d2d..561516b 100644
--- a/registry/consul/utils.go
+++ b/registry/consul/utils.go
@@ -26,6 +26,7 @@
import (
consul "github.com/hashicorp/consul/api"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/consul/utils_test.go b/registry/consul/utils_test.go
index b7e2929..7b81630 100644
--- a/registry/consul/utils_test.go
+++ b/registry/consul/utils_test.go
@@ -19,8 +19,6 @@
import (
"fmt"
- "github.com/apache/dubbo-go/common/logger"
- "github.com/stretchr/testify/assert"
"net"
"net/url"
"strconv"
@@ -29,8 +27,13 @@
)
import (
+ "github.com/stretchr/testify/assert"
+)
+
+import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
"github.com/apache/dubbo-go/registry"
"github.com/apache/dubbo-go/remoting"
"github.com/apache/dubbo-go/remoting/consul"
diff --git a/registry/directory/directory_test.go b/registry/directory/directory_test.go
index 88f99d3..1859d88 100644
--- a/registry/directory/directory_test.go
+++ b/registry/directory/directory_test.go
@@ -26,6 +26,7 @@
import (
"github.com/golang/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
diff --git a/registry/etcdv3/listener.go b/registry/etcdv3/listener.go
index 8836fc2..55aeb57 100644
--- a/registry/etcdv3/listener.go
+++ b/registry/etcdv3/listener.go
@@ -24,6 +24,7 @@
import (
gxchan "github.com/dubbogo/gost/container/chan"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/etcdv3/listener_test.go b/registry/etcdv3/listener_test.go
index 12c3c50..97244c1 100644
--- a/registry/etcdv3/listener_test.go
+++ b/registry/etcdv3/listener_test.go
@@ -25,7 +25,9 @@
import (
"github.com/coreos/etcd/embed"
+
gxtime "github.com/dubbogo/gost/time"
+
"github.com/stretchr/testify/suite"
)
diff --git a/registry/etcdv3/service_discovery.go b/registry/etcdv3/service_discovery.go
index ca6016e..0597884 100644
--- a/registry/etcdv3/service_discovery.go
+++ b/registry/etcdv3/service_discovery.go
@@ -27,7 +27,9 @@
import (
gxset "github.com/dubbogo/gost/container/set"
gxpage "github.com/dubbogo/gost/hash/page"
+
"github.com/hashicorp/vault/sdk/helper/jsonutil"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/event/event_publishing_service_deiscovery_test.go b/registry/event/event_publishing_service_deiscovery_test.go
index 504f7b5..3698b37 100644
--- a/registry/event/event_publishing_service_deiscovery_test.go
+++ b/registry/event/event_publishing_service_deiscovery_test.go
@@ -25,6 +25,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
gxpage "github.com/dubbogo/gost/hash/page"
+
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
)
diff --git a/registry/event/metadata_service_url_params_customizer_test.go b/registry/event/metadata_service_url_params_customizer_test.go
index c041232..98c7dc6 100644
--- a/registry/event/metadata_service_url_params_customizer_test.go
+++ b/registry/event/metadata_service_url_params_customizer_test.go
@@ -23,6 +23,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
"github.com/stretchr/testify/assert"
)
diff --git a/registry/file/listener.go b/registry/file/listener.go
index 3fe7400..84b0177 100644
--- a/registry/file/listener.go
+++ b/registry/file/listener.go
@@ -17,7 +17,9 @@
package file
-import "github.com/apache/dubbo-go/config_center"
+import (
+ "github.com/apache/dubbo-go/config_center"
+)
// RegistryConfigurationListener represent the processor of flie watcher
type RegistryConfigurationListener struct {
diff --git a/registry/file/service_discovery.go b/registry/file/service_discovery.go
index 768a1c2..7f82969 100644
--- a/registry/file/service_discovery.go
+++ b/registry/file/service_discovery.go
@@ -29,6 +29,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
gxpage "github.com/dubbogo/gost/hash/page"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/nacos/listener.go b/registry/nacos/listener.go
index 5557f87..f1dd09c 100644
--- a/registry/nacos/listener.go
+++ b/registry/nacos/listener.go
@@ -28,8 +28,10 @@
import (
gxchan "github.com/dubbogo/gost/container/chan"
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
+
"github.com/nacos-group/nacos-sdk-go/model"
"github.com/nacos-group/nacos-sdk-go/vo"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/nacos/registry.go b/registry/nacos/registry.go
index 09f7ad9..913a3fc 100644
--- a/registry/nacos/registry.go
+++ b/registry/nacos/registry.go
@@ -25,9 +25,10 @@
)
import (
- "github.com/apache/dubbo-go/remoting/nacos"
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
+
"github.com/nacos-group/nacos-sdk-go/vo"
+
perrors "github.com/pkg/errors"
)
@@ -37,6 +38,7 @@
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/common/logger"
"github.com/apache/dubbo-go/registry"
+ "github.com/apache/dubbo-go/remoting/nacos"
)
var (
diff --git a/registry/nacos/registry_test.go b/registry/nacos/registry_test.go
index 8ebd727..879ea08 100644
--- a/registry/nacos/registry_test.go
+++ b/registry/nacos/registry_test.go
@@ -28,6 +28,7 @@
import (
"github.com/nacos-group/nacos-sdk-go/vo"
+
"github.com/stretchr/testify/assert"
)
diff --git a/registry/nacos/service_discovery.go b/registry/nacos/service_discovery.go
index dc2caa5..f51cfa6 100644
--- a/registry/nacos/service_discovery.go
+++ b/registry/nacos/service_discovery.go
@@ -26,8 +26,10 @@
"github.com/dubbogo/gost/container/set"
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
"github.com/dubbogo/gost/hash/page"
+
"github.com/nacos-group/nacos-sdk-go/model"
"github.com/nacos-group/nacos-sdk-go/vo"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go
index e50e2b9..6ef686f 100644
--- a/registry/protocol/protocol.go
+++ b/registry/protocol/protocol.go
@@ -25,6 +25,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/protocol/protocol_test.go b/registry/protocol/protocol_test.go
index 3f5389e..f2e9a7a 100644
--- a/registry/protocol/protocol_test.go
+++ b/registry/protocol/protocol_test.go
@@ -24,6 +24,7 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
"github.com/stretchr/testify/assert"
)
diff --git a/registry/servicediscovery/service_discovery_registry.go b/registry/servicediscovery/service_discovery_registry.go
index bf0e424..66e3df9 100644
--- a/registry/servicediscovery/service_discovery_registry.go
+++ b/registry/servicediscovery/service_discovery_registry.go
@@ -27,7 +27,9 @@
import (
gxset "github.com/dubbogo/gost/container/set"
+
perrors "github.com/pkg/errors"
+
"go.uber.org/atomic"
)
diff --git a/registry/servicediscovery/service_discovery_registry_test.go b/registry/servicediscovery/service_discovery_registry_test.go
index 391d92c..c8859b1 100644
--- a/registry/servicediscovery/service_discovery_registry_test.go
+++ b/registry/servicediscovery/service_discovery_registry_test.go
@@ -24,8 +24,10 @@
import (
"github.com/dubbogo/gost/container/set"
"github.com/dubbogo/gost/hash/page"
+
"github.com/stretchr/testify/assert"
)
+
import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/extension"
diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go
index e658155..3912a4f 100644
--- a/registry/zookeeper/listener.go
+++ b/registry/zookeeper/listener.go
@@ -25,6 +25,7 @@
import (
gxchan "github.com/dubbogo/gost/container/chan"
gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
index 3b07648..f7e9033 100644
--- a/registry/zookeeper/registry.go
+++ b/registry/zookeeper/registry.go
@@ -27,7 +27,9 @@
import (
"github.com/dubbogo/go-zookeeper/zk"
+
gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
+
perrors "github.com/pkg/errors"
)
diff --git a/registry/zookeeper/service_discovery.go b/registry/zookeeper/service_discovery.go
index 6562628..0ff2310 100644
--- a/registry/zookeeper/service_discovery.go
+++ b/registry/zookeeper/service_discovery.go
@@ -29,6 +29,7 @@
gxset "github.com/dubbogo/gost/container/set"
gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
gxpage "github.com/dubbogo/gost/hash/page"
+
perrors "github.com/pkg/errors"
)
diff --git a/remoting/kubernetes/client.go b/remoting/kubernetes/client.go
index 4feb5d3..543199b 100644
--- a/remoting/kubernetes/client.go
+++ b/remoting/kubernetes/client.go
@@ -25,7 +25,9 @@
import (
perrors "github.com/pkg/errors"
+
v1 "k8s.io/api/core/v1"
+
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake"
)
diff --git a/remoting/kubernetes/facade.go b/remoting/kubernetes/facade.go
index dc060bb..b33b5c1 100644
--- a/remoting/kubernetes/facade.go
+++ b/remoting/kubernetes/facade.go
@@ -17,7 +17,9 @@
package kubernetes
-import "github.com/apache/dubbo-go/common"
+import (
+ "github.com/apache/dubbo-go/common"
+)
type clientFacade interface {
Client() *Client
diff --git a/remoting/kubernetes/registry_controller.go b/remoting/kubernetes/registry_controller.go
index f66163d..eaa591a 100644
--- a/remoting/kubernetes/registry_controller.go
+++ b/remoting/kubernetes/registry_controller.go
@@ -31,18 +31,25 @@
import (
perrors "github.com/pkg/errors"
+
v1 "k8s.io/api/core/v1"
+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apimachinery/pkg/watch"
+
"k8s.io/client-go/informers"
informerscorev1 "k8s.io/client-go/informers/core/v1"
+
"k8s.io/client-go/kubernetes"
+
"k8s.io/client-go/rest"
+
"k8s.io/client-go/tools/cache"
+
"k8s.io/client-go/util/workqueue"
)
diff --git a/remoting/nacos/builder.go b/remoting/nacos/builder.go
index 53f4286..9525904 100644
--- a/remoting/nacos/builder.go
+++ b/remoting/nacos/builder.go
@@ -26,7 +26,9 @@
import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
+
nacosConstant "github.com/nacos-group/nacos-sdk-go/common/constant"
+
perrors "github.com/pkg/errors"
)
diff --git a/test/integrate/dubbo/go-client/client.go b/test/integrate/dubbo/go-client/client.go
index 4c62674..b7c77ca 100644
--- a/test/integrate/dubbo/go-client/client.go
+++ b/test/integrate/dubbo/go-client/client.go
@@ -25,15 +25,16 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
- _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
- "github.com/apache/dubbo-go/config"
- _ "github.com/apache/dubbo-go/protocol/dubbo"
- _ "github.com/apache/dubbo-go/registry/protocol"
+)
- _ "github.com/apache/dubbo-go/filter/filter_impl"
-
+import (
_ "github.com/apache/dubbo-go/cluster/cluster_impl"
_ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ "github.com/apache/dubbo-go/config"
+ _ "github.com/apache/dubbo-go/filter/filter_impl"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
_ "github.com/apache/dubbo-go/registry/zookeeper"
)
diff --git a/test/integrate/dubbo/go-client/user.go b/test/integrate/dubbo/go-client/user.go
index ff4486f..9820dbc 100644
--- a/test/integrate/dubbo/go-client/user.go
+++ b/test/integrate/dubbo/go-client/user.go
@@ -24,6 +24,9 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+)
+
+import (
"github.com/apache/dubbo-go/config"
)
diff --git a/test/integrate/dubbo/go-server/server.go b/test/integrate/dubbo/go-server/server.go
index a5d18db..a89c409 100644
--- a/test/integrate/dubbo/go-server/server.go
+++ b/test/integrate/dubbo/go-server/server.go
@@ -23,6 +23,9 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+)
+
+import (
_ "github.com/apache/dubbo-go/cluster/cluster_impl"
_ "github.com/apache/dubbo-go/cluster/loadbalance"
_ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
diff --git a/test/integrate/dubbo/go-server/user.go b/test/integrate/dubbo/go-server/user.go
index 7bff415..53477e0 100644
--- a/test/integrate/dubbo/go-server/user.go
+++ b/test/integrate/dubbo/go-server/user.go
@@ -25,6 +25,9 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+)
+
+import (
"github.com/apache/dubbo-go/config"
)
diff --git a/tools/cli/example/server/main.go b/tools/cli/example/server/main.go
index ed1ed52..dc9e3d2 100644
--- a/tools/cli/example/server/main.go
+++ b/tools/cli/example/server/main.go
@@ -27,6 +27,9 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+)
+
+import (
_ "github.com/apache/dubbo-go/cluster/cluster_impl"
_ "github.com/apache/dubbo-go/cluster/loadbalance"
"github.com/apache/dubbo-go/common/logger"
diff --git a/tools/cli/example/server/user.go b/tools/cli/example/server/user.go
index 5835848..c91798c 100644
--- a/tools/cli/example/server/user.go
+++ b/tools/cli/example/server/user.go
@@ -24,6 +24,9 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+)
+
+import (
"github.com/apache/dubbo-go/config"
)
diff --git a/tools/cli/json_register/json_register.go b/tools/cli/json_register/json_register.go
index e1ad787..c5f540d 100644
--- a/tools/cli/json_register/json_register.go
+++ b/tools/cli/json_register/json_register.go
@@ -25,6 +25,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
jparser "github.com/dubbogo/gost/encoding/json"
)
diff --git a/tools/cli/protocol/dubbo/codec.go b/tools/cli/protocol/dubbo/codec.go
index f73bf8e..ed67a50 100644
--- a/tools/cli/protocol/dubbo/codec.go
+++ b/tools/cli/protocol/dubbo/codec.go
@@ -26,11 +26,9 @@
)
import (
- perrors "github.com/pkg/errors"
-)
-
-import (
hessian "github.com/apache/dubbo-go-hessian2"
+
+ perrors "github.com/pkg/errors"
)
//SerialID serial ID
diff --git a/tools/cli/protocol/dubbo/dubbo_protocol.go b/tools/cli/protocol/dubbo/dubbo_protocol.go
index 97a3ac7..2ebaa3d 100644
--- a/tools/cli/protocol/dubbo/dubbo_protocol.go
+++ b/tools/cli/protocol/dubbo/dubbo_protocol.go
@@ -26,6 +26,7 @@
import (
hessian "github.com/apache/dubbo-go-hessian2"
+
perrors "github.com/pkg/errors"
)
