This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new cdbddd8 clean up imports
cdbddd8 is described below
commit cdbddd8a7047648c8d645d17cbdb8fad5b1f7aab
Author: Ian Luo <ian....@gmail.com>
AuthorDate: Fri Oct 30 11:27:58 2020 +0800
clean up imports
---
direct/go-client/conf/client.yml | 2 +-
direct/go-server/tests/integration/main_test.go | 10 +++++++++-
direct/go-server/tests/integration/userprovider_test.go | 8 --------
generic/go-server/tests/integration/main_test.go | 7 +++++++
generic/go-server/tests/integration/userprovider_test.go | 7 -------
helloworld/go-client/conf/client.yml | 2 +-
helloworld/go-client/pkg/user.go | 6 +++++-
helloworld/go-server/cmd/server.go | 3 +--
helloworld/go-server/conf/client.yml | 2 +-
helloworld/go-server/tests/integration/main_test.go | 8 ++++++++
helloworld/go-server/tests/integration/userprovider_test.go | 8 --------
11 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/direct/go-client/conf/client.yml b/direct/go-client/conf/client.yml
index 6fb0977..3822e1f 100644
--- a/direct/go-client/conf/client.yml
+++ b/direct/go-client/conf/client.yml
@@ -9,7 +9,7 @@ connect_timeout: "3s"
# application config
application:
organization: "dubbo.io"
- name: "UserInfoServer"
+ name: "UserInfoClient"
module: "dubbo-go user-info client"
version: "0.0.1"
environment: "dev"
diff --git a/direct/go-server/tests/integration/main_test.go
b/direct/go-server/tests/integration/main_test.go
index 1c10dec..0f824e6 100644
--- a/direct/go-server/tests/integration/main_test.go
+++ b/direct/go-server/tests/integration/main_test.go
@@ -22,6 +22,14 @@ package integration
import (
hessian "github.com/apache/dubbo-go-hessian2"
"github.com/apache/dubbo-go/config"
+
+ _ "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/filter/filter_impl"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
import (
@@ -59,4 +67,4 @@ func (u *UserProvider) Reference() string {
func (User) JavaClassName() string {
return "org.apache.dubbo.User"
-}
\ No newline at end of file
+}
diff --git a/direct/go-server/tests/integration/userprovider_test.go
b/direct/go-server/tests/integration/userprovider_test.go
index f3cf65b..e5da5e0 100644
--- a/direct/go-server/tests/integration/userprovider_test.go
+++ b/direct/go-server/tests/integration/userprovider_test.go
@@ -24,14 +24,6 @@ import (
"testing"
)
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/filter/filter_impl"
- _ "github.com/apache/dubbo-go/protocol/dubbo"
- _ "github.com/apache/dubbo-go/registry/protocol"
- _ "github.com/apache/dubbo-go/registry/zookeeper"
-
"github.com/stretchr/testify/assert"
)
diff --git a/generic/go-server/tests/integration/main_test.go
b/generic/go-server/tests/integration/main_test.go
index b22fff2..1cf9287 100644
--- a/generic/go-server/tests/integration/main_test.go
+++ b/generic/go-server/tests/integration/main_test.go
@@ -20,8 +20,15 @@
package integration
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/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
import (
diff --git a/generic/go-server/tests/integration/userprovider_test.go
b/generic/go-server/tests/integration/userprovider_test.go
index 0c9a6cb..d7c0880 100644
--- a/generic/go-server/tests/integration/userprovider_test.go
+++ b/generic/go-server/tests/integration/userprovider_test.go
@@ -26,14 +26,7 @@ import (
"time"
)
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"
)
func TestGetUser(t *testing.T) {
diff --git a/helloworld/go-client/conf/client.yml
b/helloworld/go-client/conf/client.yml
index 3d8870f..e69fc0f 100644
--- a/helloworld/go-client/conf/client.yml
+++ b/helloworld/go-client/conf/client.yml
@@ -9,7 +9,7 @@ connect_timeout : "3s"
# application config
application:
organization : "dubbo.io"
- name : "UserInfoServer"
+ name : "UserInfoClient"
module : "dubbo-go user-info client"
version : "0.0.1"
environment : "dev"
diff --git a/helloworld/go-client/pkg/user.go b/helloworld/go-client/pkg/user.go
index abcad09..14c543f 100644
--- a/helloworld/go-client/pkg/user.go
+++ b/helloworld/go-client/pkg/user.go
@@ -19,11 +19,15 @@ package pkg
import (
"context"
+ "time"
+)
+
+import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/protocol"
"github.com/apache/dubbo-go/remoting"
+
gxlog "github.com/dubbogo/gost/log"
- "time"
)
type User struct {
diff --git a/helloworld/go-server/cmd/server.go
b/helloworld/go-server/cmd/server.go
index 0f1ffed..e813698 100644
--- a/helloworld/go-server/cmd/server.go
+++ b/helloworld/go-server/cmd/server.go
@@ -27,6 +27,7 @@ import (
import (
hessian "github.com/apache/dubbo-go-hessian2"
+ "github.com/apache/dubbo-samples/golang/helloworld/go-server/pkg"
_ "github.com/apache/dubbo-go/cluster/cluster_impl"
_ "github.com/apache/dubbo-go/cluster/loadbalance"
@@ -37,8 +38,6 @@ import (
_ "github.com/apache/dubbo-go/protocol/dubbo"
_ "github.com/apache/dubbo-go/registry/protocol"
_ "github.com/apache/dubbo-go/registry/zookeeper"
-
- "github.com/apache/dubbo-samples/golang/helloworld/go-server/pkg"
)
var (
diff --git a/helloworld/go-server/conf/client.yml
b/helloworld/go-server/conf/client.yml
index 3d8870f..27b17c5 100644
--- a/helloworld/go-server/conf/client.yml
+++ b/helloworld/go-server/conf/client.yml
@@ -9,7 +9,7 @@ connect_timeout : "3s"
# application config
application:
organization : "dubbo.io"
- name : "UserInfoServer"
+ name : "UserInfoTest"
module : "dubbo-go user-info client"
version : "0.0.1"
environment : "dev"
diff --git a/helloworld/go-server/tests/integration/main_test.go
b/helloworld/go-server/tests/integration/main_test.go
index 3aefa29..0f824e6 100644
--- a/helloworld/go-server/tests/integration/main_test.go
+++ b/helloworld/go-server/tests/integration/main_test.go
@@ -22,6 +22,14 @@ package integration
import (
hessian "github.com/apache/dubbo-go-hessian2"
"github.com/apache/dubbo-go/config"
+
+ _ "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/filter/filter_impl"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
import (
diff --git a/helloworld/go-server/tests/integration/userprovider_test.go
b/helloworld/go-server/tests/integration/userprovider_test.go
index 86b2d18..09b09c3 100644
--- a/helloworld/go-server/tests/integration/userprovider_test.go
+++ b/helloworld/go-server/tests/integration/userprovider_test.go
@@ -24,14 +24,6 @@ import (
"testing"
)
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/filter/filter_impl"
- _ "github.com/apache/dubbo-go/protocol/dubbo"
- _ "github.com/apache/dubbo-go/registry/protocol"
- _ "github.com/apache/dubbo-go/registry/zookeeper"
-
"github.com/stretchr/testify/assert"
)
