Feat fix go import (apache#536)

optimize go imports style
georgehao · May 7, 2023 · 964ec6f · 964ec6f
1 parent 7614229
commit 964ec6f
Show file tree

Hide file tree

Showing 69 changed files with 117 additions and 48 deletions.
diff --git a/goimports.sh b/goimports.sh
@@ -17,7 +17,7 @@
 
 # format go imports style
 go install -v golang.org/x/tools/cmd/goimports
-goimports  -w .
+goimports  -local github.com/seata/seata-go -w .
 
 # format licence style
 go install github.com/apache/skywalking-eyes/cmd/license-eye@latest

diff --git a/pkg/datasource/sql/datasource/mysql/trigger.go b/pkg/datasource/sql/datasource/mysql/trigger.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo/executor"
 )

diff --git a/pkg/datasource/sql/driver_test.go b/pkg/datasource/sql/driver_test.go
@@ -27,10 +27,11 @@ import (
 	"github.com/seata/seata-go/pkg/rm"
 
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/mock"
 	"github.com/seata/seata-go/pkg/protocol/branch"
 	"github.com/seata/seata-go/pkg/util/reflectx"
-	"github.com/stretchr/testify/assert"
 )
 
 func initMockResourceManager(branchType branch.BranchType, ctrl *gomock.Controller) *mock.MockDataSourceManager {

diff --git a/pkg/datasource/sql/exec/at/base_executor.go b/pkg/datasource/sql/exec/at/base_executor.go
@@ -28,6 +28,7 @@ import (
 	"github.com/arana-db/parser/ast"
 	"github.com/arana-db/parser/test_driver"
 	gxsort "github.com/dubbogo/gost/sort"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/util"

diff --git a/pkg/datasource/sql/exec/at/delete_executor.go b/pkg/datasource/sql/exec/at/delete_executor.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/arana-db/parser/ast"
 	"github.com/arana-db/parser/format"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"

diff --git a/pkg/datasource/sql/exec/at/delete_executor_test.go b/pkg/datasource/sql/exec/at/delete_executor_test.go
@@ -21,11 +21,12 @@ import (
 	"database/sql/driver"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/util"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestNewDeleteExecutor(t *testing.T) {

diff --git a/pkg/datasource/sql/exec/at/insert_executor_test.go b/pkg/datasource/sql/exec/at/insert_executor_test.go
@@ -27,13 +27,14 @@ import (
 	"github.com/arana-db/parser/ast"
 	"github.com/arana-db/parser/model"
 	"github.com/arana-db/parser/test_driver"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource/mysql"
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/util"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestBuildSelectSQLByInsert(t *testing.T) {

diff --git a/pkg/datasource/sql/exec/at/insert_on_update_executor.go b/pkg/datasource/sql/exec/at/insert_on_update_executor.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"github.com/arana-db/parser/ast"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"

diff --git a/pkg/datasource/sql/exec/at/insert_on_update_executor_test.go b/pkg/datasource/sql/exec/at/insert_on_update_executor_test.go
@@ -21,10 +21,11 @@ import (
 	"database/sql/driver"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/util"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestInsertOnUpdateBeforeImageSQL(t *testing.T) {

diff --git a/pkg/datasource/sql/exec/at/multi_delete_executor.go b/pkg/datasource/sql/exec/at/multi_delete_executor.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/arana-db/parser/ast"
 	"github.com/arana-db/parser/format"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"

diff --git a/pkg/datasource/sql/exec/at/multi_delete_executor_test.go b/pkg/datasource/sql/exec/at/multi_delete_executor_test.go
@@ -21,12 +21,13 @@ import (
 	"database/sql/driver"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/util"
 	"github.com/seata/seata-go/pkg/util/log"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_multiDeleteExecutor_buildBeforeImageSQL(t *testing.T) {

diff --git a/pkg/datasource/sql/exec/at/multi_update_excutor.go b/pkg/datasource/sql/exec/at/multi_update_excutor.go
@@ -28,6 +28,7 @@ import (
 	"github.com/arana-db/parser/format"
 	"github.com/arana-db/parser/model"
 	"github.com/pkg/errors"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"

diff --git a/pkg/datasource/sql/exec/at/multi_update_excutor_test.go b/pkg/datasource/sql/exec/at/multi_update_excutor_test.go
@@ -21,14 +21,15 @@ import (
 	"database/sql/driver"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource/mysql"
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo"
 	"github.com/seata/seata-go/pkg/datasource/sql/util"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestBuildSelectSQLByMultiUpdate(t *testing.T) {

diff --git a/pkg/datasource/sql/exec/at/plain_executor_test.go b/pkg/datasource/sql/exec/at/plain_executor_test.go
@@ -24,10 +24,11 @@ import (
 	"testing"
 
 	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/mock"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestNewPlainExecutor(t *testing.T) {

diff --git a/pkg/datasource/sql/exec/at/update_executor_test.go b/pkg/datasource/sql/exec/at/update_executor_test.go
@@ -24,6 +24,8 @@ import (
 	"testing"
 
 	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource/mysql"
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
@@ -32,7 +34,6 @@ import (
 	"github.com/seata/seata-go/pkg/datasource/sql/undo"
 	"github.com/seata/seata-go/pkg/datasource/sql/util"
 	_ "github.com/seata/seata-go/pkg/util/log"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestBuildSelectSQLByUpdate(t *testing.T) {

diff --git a/pkg/datasource/sql/hook/logger_hook.go b/pkg/datasource/sql/hook/logger_hook.go
@@ -22,9 +22,10 @@ import (
 
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 
+	"go.uber.org/zap"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/util/log"
-	"go.uber.org/zap"
 )
 
 func NewLoggerSQLHook() exec.SQLHook {

diff --git a/pkg/datasource/sql/mock/mock_datasource_manager.go b/pkg/datasource/sql/mock/mock_datasource_manager.go
diff --git a/pkg/datasource/sql/parser/parse_factory_test.go b/pkg/datasource/sql/parser/parse_factory_test.go
@@ -23,11 +23,13 @@ import (
 
 	aparser "github.com/arana-db/parser"
 	"github.com/arana-db/parser/format"
+
 	"github.com/seata/seata-go/pkg/util/bytes"
 
-	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/seata/seata-go/pkg/datasource/sql/types"
+
 	_ "github.com/arana-db/parser/test_driver"
 )
 

diff --git a/pkg/datasource/sql/parser/parser_factory.go b/pkg/datasource/sql/parser/parser_factory.go
@@ -20,6 +20,7 @@ package parser
 import (
 	aparser "github.com/arana-db/parser"
 	"github.com/arana-db/parser/ast"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 )
 

diff --git a/pkg/datasource/sql/types/executor.go b/pkg/datasource/sql/types/executor.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/arana-db/parser/ast"
 	"github.com/arana-db/parser/format"
+
 	seatabytes "github.com/seata/seata-go/pkg/util/bytes"
 )
 

diff --git a/pkg/datasource/sql/undo/base/undo.go b/pkg/datasource/sql/undo/base/undo.go
@@ -28,6 +28,7 @@ import (
 	"strings"
 
 	"github.com/arana-db/parser/mysql"
+
 	"github.com/seata/seata-go/pkg/compressor"
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"

diff --git a/pkg/datasource/sql/undo/builder/basic_undo_log_builder.go b/pkg/datasource/sql/undo/builder/basic_undo_log_builder.go
@@ -28,6 +28,7 @@ import (
 	"github.com/arana-db/parser/ast"
 	"github.com/arana-db/parser/test_driver"
 	gxsort "github.com/dubbogo/gost/sort"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 )
 

diff --git a/pkg/datasource/sql/undo/builder/basic_undo_log_builder_test.go b/pkg/datasource/sql/undo/builder/basic_undo_log_builder_test.go
@@ -20,8 +20,9 @@ package builder
 import (
 	"testing"
 
-	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/seata/seata-go/pkg/datasource/sql/types"
 )
 
 func TestBuildWhereConditionByPKs(t *testing.T) {

diff --git a/pkg/datasource/sql/undo/builder/mysql_delete_undo_log_builder.go b/pkg/datasource/sql/undo/builder/mysql_delete_undo_log_builder.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/arana-db/parser/ast"
 	"github.com/arana-db/parser/format"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/util/bytes"
 	"github.com/seata/seata-go/pkg/util/log"

diff --git a/pkg/datasource/sql/undo/builder/mysql_insert_undo_log_builder.go b/pkg/datasource/sql/undo/builder/mysql_insert_undo_log_builder.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"github.com/arana-db/parser/ast"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo/executor"

diff --git a/pkg/datasource/sql/undo/builder/mysql_insert_undo_log_builder_test.go b/pkg/datasource/sql/undo/builder/mysql_insert_undo_log_builder_test.go
@@ -30,10 +30,11 @@ import (
 	"github.com/arana-db/parser/model"
 
 	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/mock"
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestBuildSelectSQLByInsert(t *testing.T) {

diff --git a/pkg/datasource/sql/undo/builder/mysql_insertonduplicate_update_undo_log_builder.go b/pkg/datasource/sql/undo/builder/mysql_insertonduplicate_update_undo_log_builder.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"github.com/arana-db/parser/ast"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo/executor"

diff --git a/pkg/datasource/sql/undo/builder/mysql_insertonduplicate_update_undo_log_builder_test.go b/pkg/datasource/sql/undo/builder/mysql_insertonduplicate_update_undo_log_builder_test.go
@@ -23,9 +23,10 @@ import (
 
 	"database/sql/driver"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestInsertOnDuplicateBuildBeforeImageSQL(t *testing.T) {

diff --git a/pkg/datasource/sql/undo/builder/mysql_update_undo_log_builder.go b/pkg/datasource/sql/undo/builder/mysql_update_undo_log_builder.go
@@ -26,6 +26,7 @@ import (
 	"github.com/arana-db/parser/ast"
 	"github.com/arana-db/parser/format"
 	"github.com/arana-db/parser/model"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 
 	"github.com/seata/seata-go/pkg/datasource/sql/types"

diff --git a/pkg/datasource/sql/undo/builder/mysql_update_undo_log_builder_test.go b/pkg/datasource/sql/undo/builder/mysql_update_undo_log_builder_test.go
@@ -33,8 +33,9 @@ import (
 	"github.com/seata/seata-go/pkg/datasource/sql/parser"
 
 	_ "github.com/arana-db/parser/test_driver"
-	_ "github.com/seata/seata-go/pkg/util/log"
 	"github.com/stretchr/testify/assert"
+
+	_ "github.com/seata/seata-go/pkg/util/log"
 )
 
 func TestBuildSelectSQLByUpdate(t *testing.T) {

diff --git a/pkg/datasource/sql/undo/executor/executor.go b/pkg/datasource/sql/undo/executor/executor.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 
 	"github.com/goccy/go-json"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo"

diff --git a/pkg/datasource/sql/undo/mysql/default.go b/pkg/datasource/sql/undo/mysql/default.go
@@ -19,6 +19,7 @@ package mysql
 
 import (
 	"github.com/pkg/errors"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/undo"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo/base"
 )

diff --git a/pkg/datasource/sql/undo/parser/parser_json_test.go b/pkg/datasource/sql/undo/parser/parser_json_test.go
@@ -20,8 +20,9 @@ package parser
 import (
 	"testing"
 
-	"github.com/seata/seata-go/pkg/datasource/sql/undo"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/seata/seata-go/pkg/datasource/sql/undo"
 )
 
 func TestGetName(t *testing.T) {

diff --git a/pkg/datasource/sql/undo_test.go b/pkg/datasource/sql/undo_test.go
@@ -22,9 +22,10 @@ import (
 	"database/sql"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/seata/seata-go/pkg/datasource/sql/undo/base"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo/mysql"
-	"github.com/stretchr/testify/assert"
 )
 
 // TestBatchDeleteUndoLogs

diff --git a/pkg/integration/dubbo/dubbo_transaction_filter.go b/pkg/integration/dubbo/dubbo_transaction_filter.go
@@ -25,6 +25,7 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/common/extension"
 	"dubbo.apache.org/dubbo-go/v3/filter"
 	"dubbo.apache.org/dubbo-go/v3/protocol"
+
 	"github.com/seata/seata-go/pkg/constant"
 	"github.com/seata/seata-go/pkg/tm"
 	"github.com/seata/seata-go/pkg/util/log"

diff --git a/pkg/protocol/codec/branch_commit_req_codec_test.go b/pkg/protocol/codec/branch_commit_req_codec_test.go
@@ -22,8 +22,9 @@ import (
 
 	model2 "github.com/seata/seata-go/pkg/protocol/branch"
 
-	"github.com/seata/seata-go/pkg/protocol/message"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/seata/seata-go/pkg/protocol/message"
 )
 
 func TestBranchCommitRequestCodec(t *testing.T) {