style(getty): format package getty imports

apache · Aug 13, 2021 · ade5a1f · ade5a1f
1 parent f9237b0
commit ade5a1f
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 11 deletions.
diff --git a/go.sum b/go.sum
@@ -53,10 +53,6 @@ github.com/alibaba/sentinel-golang v1.0.2/go.mod h1:QsB99f/z35D2AiMrAWwgWE85kDTk
 github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 h1:zOVTBdCKFd9JbCKz9/nt+FovbjPFmb7mUnp8nH9fQBA=
 github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/dubbo-getty v1.4.3 h1:PCKpryDasKOxwT5MBC6MIMO+0NLOaHF6Xco9YXQw7HI=
-github.com/apache/dubbo-getty v1.4.3/go.mod h1:ansXgKxxyhCOiQL29nO5ce1MDcEKmCyZuNR9oMs3hek=
-github.com/apache/dubbo-getty v1.4.4 h1:pthYQaCXyjHJ6/SjVwKkX5NhdAqSpUrRL1Z9GowrLdE=
-github.com/apache/dubbo-getty v1.4.4/go.mod h1:mcDyiu7M/TVrYDyL8TxDemQkOdvEqqHSQ4jOuYejY1w=
 github.com/apache/dubbo-getty v1.4.5 h1:MptKbjC0n2Mo/8eFPwirSInH2BfdNG4IZch43PdNvIM=
 github.com/apache/dubbo-getty v1.4.5/go.mod h1:mcDyiu7M/TVrYDyL8TxDemQkOdvEqqHSQ4jOuYejY1w=
 github.com/apache/dubbo-go-hessian2 v1.9.1/go.mod h1:xQUjE7F8PX49nm80kChFvepA/AvqAZ0oh/UaB6+6pBE=
@@ -152,7 +148,6 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ
 github.com/dubbogo/go-zookeeper v1.0.3 h1:UkuY+rBsxdT7Bs63QAzp9z7XqQ53W1j8E5rwl83me8g=
 github.com/dubbogo/go-zookeeper v1.0.3/go.mod h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c=
 github.com/dubbogo/gost v1.9.0/go.mod h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8=
-github.com/dubbogo/gost v1.10.1/go.mod h1:+mQGS51XQEUWZP2JeGZTxJwipjRKtJO7Tr+FOg+72rI=
 github.com/dubbogo/gost v1.11.12/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
 github.com/dubbogo/gost v1.11.14 h1:9lfcdILOmqTOVAW1fPHa5uf1NrD6jlIOBe4vf8576yQ=
 github.com/dubbogo/gost v1.11.14/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
@@ -601,7 +596,6 @@ github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/shirou/gopsutil v3.20.11-0.20201116082039-2fb5da2f2449+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.20.11+incompatible h1:LJr4ZQK4mPpIV5gOa4jCOKOGb4ty4DZO54I4FGqIpto=
 github.com/shirou/gopsutil v3.20.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -653,7 +647,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=

diff --git a/registry/etcdv3/listener.go b/registry/etcdv3/listener.go
@@ -24,6 +24,7 @@ import (
 
 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
@@ -18,14 +18,16 @@
 package etcdv3
 
 import (
-	gxtime "github.com/dubbogo/gost/time"
 	"os"
 	"testing"
 	"time"
 )
 
 import (
+	gxtime "github.com/dubbogo/gost/time"
+
 	"github.com/stretchr/testify/suite"
+
 	"go.etcd.io/etcd/server/v3/embed"
 )
 

diff --git a/registry/etcdv3/registry.go b/registry/etcdv3/registry.go
@@ -27,6 +27,7 @@ import (
 
 import (
 	gxetcd "github.com/dubbogo/gost/database/kv/etcd/v3"
+
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/registry/etcdv3/service_discovery.go b/registry/etcdv3/service_discovery.go
@@ -28,7 +28,9 @@ import (
 	gxset "github.com/dubbogo/gost/container/set"
 	gxetcd "github.com/dubbogo/gost/database/kv/etcd/v3"
 	gxpage "github.com/dubbogo/gost/hash/page"
+
 	"github.com/hashicorp/vault/sdk/helper/jsonutil"
+
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/registry/kubernetes/listener.go b/registry/kubernetes/listener.go
@@ -23,6 +23,7 @@ import (
 
 import (
 	gxchan "github.com/dubbogo/gost/container/chan"
+
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/registry/kubernetes/registry.go b/registry/kubernetes/registry.go
@@ -26,7 +26,9 @@ import (
 
 import (
 	gxtime "github.com/dubbogo/gost/time"
+
 	perrors "github.com/pkg/errors"
+
 	v1 "k8s.io/api/core/v1"
 )
 

diff --git a/registry/kubernetes/registry_test.go b/registry/kubernetes/registry_test.go
@@ -28,6 +28,7 @@ import (
 
 import (
 	"github.com/stretchr/testify/assert"
+
 	v1 "k8s.io/api/core/v1"
 )
 

diff --git a/remoting/getty/dubbo_codec_for_test.go b/remoting/getty/dubbo_codec_for_test.go
@@ -26,6 +26,7 @@ import (
 
 import (
 	hessian "github.com/apache/dubbo-go-hessian2"
+
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/remoting/getty/getty_client.go b/remoting/getty/getty_client.go
@@ -18,17 +18,21 @@
 package getty
 
 import (
-	gxtime "github.com/dubbogo/gost/time"
 	"math/rand"
 	"sync"
 	"time"
 )
 
 import (
 	"github.com/apache/dubbo-getty"
+
 	gxsync "github.com/dubbogo/gost/sync"
+	gxtime "github.com/dubbogo/gost/time"
+
 	perrors "github.com/pkg/errors"
+
 	"go.uber.org/atomic"
+
 	"gopkg.in/yaml.v2"
 )
 

diff --git a/remoting/getty/getty_client_test.go b/remoting/getty/getty_client_test.go
@@ -28,7 +28,9 @@ import (
 
 import (
 	hessian "github.com/apache/dubbo-go-hessian2"
+
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -435,7 +437,7 @@ func (u *UserProvider) GetUser(ctx context.Context, req []interface{}, rsp *User
 
 func (u *UserProvider) GetUser0(id string, k *User, name string) (User, error) {
 	// fix testClient_AsyncCall assertion bug(#1233)
-	//time.Sleep(1 * time.Second)
+	time.Sleep(1 * time.Second)
 	return User{ID: id, Name: name}, nil
 }
 

diff --git a/remoting/getty/getty_server.go b/remoting/getty/getty_server.go
@@ -25,8 +25,11 @@ import (
 
 import (
 	"github.com/apache/dubbo-getty"
+
 	gxsync "github.com/dubbogo/gost/sync"
+
 	perrors "github.com/pkg/errors"
+
 	"gopkg.in/yaml.v2"
 )
 

diff --git a/remoting/getty/listener.go b/remoting/getty/listener.go
@@ -19,15 +19,18 @@ package getty
 
 import (
 	"fmt"
-	gxtime "github.com/dubbogo/gost/time"
 	"sync"
 	"sync/atomic"
 	"time"
 )
 
 import (
 	"github.com/apache/dubbo-getty"
+
 	hessian "github.com/apache/dubbo-go-hessian2"
+
+	gxtime "github.com/dubbogo/gost/time"
+
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/remoting/getty/listener_test.go b/remoting/getty/listener_test.go
@@ -25,6 +25,7 @@ import (
 import (
 	"github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/mocktracer"
+
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/remoting/getty/pool.go b/remoting/getty/pool.go
@@ -29,6 +29,7 @@ import (
 
 import (
 	"github.com/apache/dubbo-getty"
+
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/remoting/getty/readwriter.go b/remoting/getty/readwriter.go
@@ -24,7 +24,9 @@ import (
 
 import (
 	"github.com/apache/dubbo-getty"
+
 	hessian "github.com/apache/dubbo-go-hessian2"
+
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/remoting/getty/readwriter_test.go b/remoting/getty/readwriter_test.go
@@ -25,6 +25,7 @@ import (
 
 import (
 	hessian "github.com/apache/dubbo-go-hessian2"
+
 	"github.com/stretchr/testify/assert"
 )