You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/03/11 02:27:04 UTC
[dubbo-go-samples] branch master updated: fix: regroup imports
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/master by this push:
new ec9f630 fix: regroup imports
new 219ffe3 Merge pull request #63 from beiwei30/direct
ec9f630 is described below
commit ec9f630579a0ae3366eba063a4cd263a1062ee5c
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Tue Mar 9 10:22:46 2021 +0800
fix: regroup imports
---
direct/go-client/cmd/client.go | 10 +++++-----
direct/go-server/cmd/server.go | 7 ++++---
direct/go-server/pkg/user.go | 5 +----
direct/go-server/tests/integration/main_test.go | 17 ++++++++---------
4 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/direct/go-client/cmd/client.go b/direct/go-client/cmd/client.go
index 1dcc651..13f587d 100644
--- a/direct/go-client/cmd/client.go
+++ b/direct/go-client/cmd/client.go
@@ -25,11 +25,6 @@ import (
import (
hessian "github.com/apache/dubbo-go-hessian2"
- "github.com/apache/dubbo-go-samples/helloworld/go-client/pkg"
- "github.com/dubbogo/gost/log"
-)
-
-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"
@@ -38,6 +33,11 @@ import (
_ "github.com/apache/dubbo-go/protocol/dubbo"
_ "github.com/apache/dubbo-go/registry/protocol"
_ "github.com/apache/dubbo-go/registry/zookeeper"
+ "github.com/dubbogo/gost/log"
+)
+
+import (
+ "github.com/apache/dubbo-go-samples/direct/go-client/pkg"
)
var userProvider = new(pkg.UserProvider)
diff --git a/direct/go-server/cmd/server.go b/direct/go-server/cmd/server.go
index 65d3989..a4cfc42 100644
--- a/direct/go-server/cmd/server.go
+++ b/direct/go-server/cmd/server.go
@@ -27,9 +27,6 @@ import (
import (
hessian "github.com/apache/dubbo-go-hessian2"
-
- "github.com/apache/dubbo-go-samples/direct/go-server/pkg"
-
_ "github.com/apache/dubbo-go/cluster/cluster_impl"
_ "github.com/apache/dubbo-go/cluster/loadbalance"
"github.com/apache/dubbo-go/common/logger"
@@ -41,6 +38,10 @@ import (
_ "github.com/apache/dubbo-go/registry/zookeeper"
)
+import (
+ "github.com/apache/dubbo-go-samples/direct/go-server/pkg"
+)
+
var (
survivalTimeout = int(3e9)
)
diff --git a/direct/go-server/pkg/user.go b/direct/go-server/pkg/user.go
index 37fcb25..2759d19 100644
--- a/direct/go-server/pkg/user.go
+++ b/direct/go-server/pkg/user.go
@@ -23,12 +23,9 @@ import (
)
import (
- "github.com/dubbogo/gost/log"
-)
-
-import (
hessian "github.com/apache/dubbo-go-hessian2"
"github.com/apache/dubbo-go/config"
+ "github.com/dubbogo/gost/log"
)
func init() {
diff --git a/direct/go-server/tests/integration/main_test.go b/direct/go-server/tests/integration/main_test.go
index 98bd630..25552b7 100644
--- a/direct/go-server/tests/integration/main_test.go
+++ b/direct/go-server/tests/integration/main_test.go
@@ -20,12 +20,18 @@
package integration
import (
- hessian "github.com/apache/dubbo-go-hessian2"
- "github.com/apache/dubbo-go/config"
+ "context"
+ "os"
+ "testing"
+ "time"
+)
+import (
+ hessian "github.com/apache/dubbo-go-hessian2"
_ "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/metadata/service/inmemory"
_ "github.com/apache/dubbo-go/protocol/dubbo"
@@ -33,13 +39,6 @@ import (
_ "github.com/apache/dubbo-go/registry/zookeeper"
)
-import (
- "context"
- "os"
- "testing"
- "time"
-)
-
var userProvider = new(UserProvider)
func TestMain(m *testing.M) {