style(*): format imports with dubbogo/tools/imports-formatter (#1346)

apache · Jul 29, 2021 · 1643df2 · 1643df2
1 parent 103cf14
commit 1643df2
Show file tree

Hide file tree

Showing 35 changed files with 166 additions and 93 deletions.
diff --git a/cluster/cluster_impl/failover_cluster_test.go b/cluster/cluster_impl/failover_cluster_test.go
@@ -40,10 +40,6 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
 )
 
-// ///////////////////////////
-// mock invoker
-// ///////////////////////////
-
 // nolint
 type MockInvoker struct {
 	url       *common.URL

diff --git a/cluster/router/v3router/judger/bool_match_judger.go b/cluster/router/v3router/judger/bool_match_judger.go
@@ -17,7 +17,9 @@
 
 package judger
 
-import "dubbo.apache.org/dubbo-go/v3/config"
+import (
+	"dubbo.apache.org/dubbo-go/v3/config"
+)
 
 // nolint
 type BoolMatchJudger struct {

diff --git a/cluster/router/v3router/router_chain_test.go b/cluster/router/v3router/router_chain_test.go
@@ -23,22 +23,16 @@ import (
 )
 
 import (
+	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 import (
 	"dubbo.apache.org/dubbo-go/v3/cluster/router/v3router/k8s_api"
-	"dubbo.apache.org/dubbo-go/v3/config"
-	"dubbo.apache.org/dubbo-go/v3/config_center"
-)
-
-import (
-	"github.com/stretchr/testify/assert"
-)
-
-import (
 	"dubbo.apache.org/dubbo-go/v3/common"
 	"dubbo.apache.org/dubbo-go/v3/common/yaml"
+	"dubbo.apache.org/dubbo-go/v3/config"
+	"dubbo.apache.org/dubbo-go/v3/config_center"
 	"dubbo.apache.org/dubbo-go/v3/protocol"
 	"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
 )

diff --git 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/url.go b/common/url.go
@@ -42,11 +42,7 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/common/logger"
 )
 
-// ///////////////////////////////
-// dubbo role type
-// ///////////////////////////////
-
-// role constant
+// dubbo role type constant
 const (
 	// CONSUMER is consumer role
 	CONSUMER = iota

diff --git 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
@@ -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/service_discovery_config.go b/config/service_discovery_config.go
@@ -17,7 +17,9 @@
 
 package config
 
-import "dubbo.apache.org/dubbo-go/v3/common/constant"
+import (
+	"dubbo.apache.org/dubbo-go/v3/common/constant"
+)
 
 // ServiceDiscoveryConfig will be used to create
 type ServiceDiscoveryConfig struct {

diff --git a/filter/generic/generalizer/example.pb.go b/filter/generic/generalizer/example.pb.go
diff --git a/filter/generic/generalizer/generalizer.go b/filter/generic/generalizer/generalizer.go
@@ -17,7 +17,9 @@
 
 package generalizer
 
-import "reflect"
+import (
+	"reflect"
+)
 
 type Generalizer interface {
 

diff --git a/filter/sentinel/filter.go b/filter/sentinel/filter.go
@@ -42,7 +42,6 @@ import (
 // 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(constant.SentinelConsumerFilterKey, func() filter.Filter {
 		return &ConsumerFilter{}

diff --git a/filter/tps/limiter/method_service_test.go b/filter/tps/limiter/method_service_test.go
@@ -18,7 +18,6 @@
 package limiter
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/filter"
 	"net/url"
 	"testing"
 )
@@ -32,6 +31,7 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/common"
 	"dubbo.apache.org/dubbo-go/v3/common/constant"
 	"dubbo.apache.org/dubbo-go/v3/common/extension"
+	"dubbo.apache.org/dubbo-go/v3/filter"
 	"dubbo.apache.org/dubbo-go/v3/filter/tps/strategy"
 	"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
 )

diff --git a/filter/tps/strategy/mock.go b/filter/tps/strategy/mock.go
diff --git a/protocol/dubbo/hessian2/hessian_request.go b/protocol/dubbo/hessian2/hessian_request.go
@@ -33,10 +33,6 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/common/logger"
 )
 
-/////////////////////////////////////////
-// dubbo
-/////////////////////////////////////////
-
 func getArgType(v interface{}) string {
 	return GetClassDesc(v)
 }

diff --git a/protocol/dubbo/hessian2/hessian_response.go b/protocol/dubbo/hessian2/hessian_response.go
@@ -22,8 +22,6 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-
-	"dubbo.apache.org/dubbo-go/v3/common/logger"
 )
 
 import (
@@ -32,6 +30,10 @@ import (
 	perrors "github.com/pkg/errors"
 )
 
+import (
+	"dubbo.apache.org/dubbo-go/v3/common/logger"
+)
+
 // DubboResponse dubbo response
 type DubboResponse struct {
 	RspObj      interface{}

diff --git a/protocol/dubbo/impl/const.go b/protocol/dubbo/impl/const.go
@@ -20,7 +20,9 @@ package impl
 import (
 	"reflect"
 	"regexp"
+)
 
+import (
 	"github.com/pkg/errors"
 )
 

diff --git a/protocol/dubbo3/internal/helloworld.pb.go b/protocol/dubbo3/internal/helloworld.pb.go
diff --git a/protocol/dubbo3/protoc-gen-dubbo3/examples/helloworld.pb.go b/protocol/dubbo3/protoc-gen-dubbo3/examples/helloworld.pb.go
diff --git a/protocol/dubbo3/protoc-gen-dubbo3/go.mod b/protocol/dubbo3/protoc-gen-dubbo3/go.mod
@@ -3,7 +3,9 @@ module github.com/apache/dubbo-go/protocol/dubbo3/protoc-gen-dubbo3
 go 1.15
 
 require (
-	github.com/dubbogo/triple v1.0.0
+	dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2
+	github.com/dubbogo/triple v1.0.1
 	github.com/golang/protobuf v1.5.2
-	google.golang.org/grpc v1.36.0
+	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
+	google.golang.org/grpc v1.38.0
 )