diff --git a/README.md b/README.md
index a9a63c156e034f285865658c0bfccb3871018701..29447d21c95493282670cf53737e1da077036184 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Go for Apache Dubbo [涓枃](./README_CN.md) #
-[](https://travis-ci.com/dubbo/go-for-apache-dubbo)
-[](https://codecov.io/gh/dubbo/go-for-apache-dubbo)
+[](https://travis-ci.com/apache/dubbo-go)
+[](https://codecov.io/gh/apache/dubbo-go)
---
Apache Dubbo Go Implementation.
@@ -12,7 +12,7 @@ Apache License, Version 2.0
## Release note ##
-[v1.0.0 - May 29, 2019 compatible with dubbo v2.6.5](https://github.com/dubbo/go-for-apache-dubbo/releases/tag/v1.0.0)
+[v1.0.0 - May 29, 2019 compatible with dubbo v2.6.5](https://github.com/apache/dubbo-go/releases/tag/v1.0.0)
## Project Architecture ##
@@ -20,7 +20,7 @@ Extension module and layered code design based on dubbo (include protocol layer,
-About detail design please refer to [code layered design](https://github.com/dubbo/go-for-apache-dubbo/wiki/dubbo-go-V1.0-design)
+About detail design please refer to [code layered design](https://github.com/apache/dubbo-go/wiki/dubbo-go-V1.0-design)
## Feature list ##
@@ -48,23 +48,23 @@ Todo List:
- dynamic configuration center & metadata center (dubbo v2.7.x)
- tracing (dubbo ecosystem)
-You can know more about dubbo-go by its [roadmap](https://github.com/dubbo/go-for-apache-dubbo/wiki/Roadmap).
+You can know more about dubbo-go by its [roadmap](https://github.com/apache/dubbo-go/wiki/Roadmap).
## Quick Start
-The subdirectory examples shows how to use dubbo-go. Please read the [examples/README.md](https://github.com/dubbo/go-for-apache-dubbo/blob/develop/examples/README.md) carefully to learn how to dispose the configuration and compile the program.
+The subdirectory examples shows how to use dubbo-go. Please read the [examples/README.md](https://github.com/apache/dubbo-go/blob/develop/examples/README.md) carefully to learn how to dispose the configuration and compile the program.
## Benchmark
Benchmark project please refer to [go-for-apache-dubbo-benchmark](https://github.com/dubbogo/go-for-apache-dubbo-benchmark)
-About dubbo-go benchmarking report, please refer to [dubbo benchmarking report](https://github.com/dubbo/go-for-apache-dubbo/wiki/pressure-test-report-for-dubbo) & [jsonrpc benchmarking report](https://github.com/dubbo/go-for-apache-dubbo/wiki/pressure-test-report-for-jsonrpc)
+About dubbo-go benchmarking report, please refer to [dubbo benchmarking report](https://github.com/apache/dubbo-go/wiki/pressure-test-report-for-dubbo) & [jsonrpc benchmarking report](https://github.com/apache/dubbo-go/wiki/pressure-test-report-for-jsonrpc)
-## [User List](https://github.com/dubbo/go-for-apache-dubbo/issues/2)
+## [User List](https://github.com/apache/dubbo-go/issues/2)
## Stargazers
-[](https://starchart.cc/dubbo/dubbo-go)
+[](https://starchart.cc/apache/dubbo-go)
diff --git a/README_CN.md b/README_CN.md
index 4b0d40f54dcd60b8b56822bddd10773b8b3680c1..656ea286d54cff66c68659fb6a107213809c4eb3 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,7 +1,7 @@
# Go for Apache Dubbo [English](./README.md) #
-[](https://travis-ci.com/dubbo/go-for-apache-dubbo)
-[](https://codecov.io/gh/dubbo/go-for-apache-dubbo)
+[](https://travis-ci.com/apache/dubbo-go)
+[](https://codecov.io/gh/apache/dubbo-go)
---
Apache Dubbo Go 璇█瀹炵幇
@@ -12,7 +12,7 @@ Apache License, Version 2.0
## 鍙戝竷鏃ュ織 ##
-[v1.0.0 - 2019骞�5鏈�29鏃� 鍏煎dubbo v2.6.5 鐗堟湰](https://github.com/dubbo/go-for-apache-dubbo/releases/tag/v1.0.0)
+[v1.0.0 - 2019骞�5鏈�29鏃� 鍏煎dubbo v2.6.5 鐗堟湰](https://github.com/apache/dubbo-go/releases/tag/v1.0.0)
## 宸ョ▼鏋舵瀯 ##
@@ -20,7 +20,7 @@ Apache License, Version 2.0
-鍏充簬璇︾粏璁捐璇烽槄璇� [code layered design](https://github.com/dubbo/go-for-apache-dubbo/wiki/dubbo-go-V1.0-design)
+鍏充簬璇︾粏璁捐璇烽槄璇� [code layered design](https://github.com/apache/dubbo-go/wiki/dubbo-go-V1.0-design)
## 鍔熻兘鍒楄〃 ##
@@ -48,23 +48,23 @@ Apache License, Version 2.0
- dynamic configuration center & metadata center (dubbo v2.7.x)
- tracing (dubbo ecosystem)
-浣犲彲浠ラ€氳繃璁块棶 [roadmap](https://github.com/dubbo/go-for-apache-dubbo/wiki/Roadmap) 鐭ラ亾鏇村鍏充簬 dubbo-go 鐨勪俊鎭�
+浣犲彲浠ラ€氳繃璁块棶 [roadmap](https://github.com/apache/dubbo-go/wiki/Roadmap) 鐭ラ亾鏇村鍏充簬 dubbo-go 鐨勪俊鎭�
## 蹇€熷紑濮� ##
-杩欎釜瀛愮洰褰曚笅鐨勪緥瀛愬睍绀轰簡濡備綍浣跨敤 dubbo-go 銆傝浠旂粏闃呰 [examples/README.md](https://github.com/dubbo/go-for-apache-dubbo/blob/develop/examples/README.md) 瀛︿範濡備綍澶勭悊閰嶇疆骞剁紪璇戠▼搴忋€�
+杩欎釜瀛愮洰褰曚笅鐨勪緥瀛愬睍绀轰簡濡備綍浣跨敤 dubbo-go 銆傝浠旂粏闃呰 [examples/README.md](https://github.com/apache/dubbo-go/blob/develop/examples/README.md) 瀛︿範濡備綍澶勭悊閰嶇疆骞剁紪璇戠▼搴忋€�
## 鎬ц兘娴嬭瘯 ##
鎬ц兘娴嬭瘯椤圭洰鏄� [go-for-apache-dubbo-benchmark](https://github.com/dubbogo/go-for-apache-dubbo-benchmark)
-鍏充簬 dubbo-go 鎬ц兘娴嬭瘯鎶ュ憡锛岃闃呰 [dubbo benchmarking report](https://github.com/dubbo/go-for-apache-dubbo/wiki/pressure-test-report-for-dubbo) & [jsonrpc benchmarking report](https://github.com/dubbo/go-for-apache-dubbo/wiki/pressure-test-report-for-jsonrpc)
+鍏充簬 dubbo-go 鎬ц兘娴嬭瘯鎶ュ憡锛岃闃呰 [dubbo benchmarking report](https://github.com/apache/dubbo-go/wiki/pressure-test-report-for-dubbo) & [jsonrpc benchmarking report](https://github.com/apache/dubbo-go/wiki/pressure-test-report-for-jsonrpc)
-## [User List](https://github.com/dubbo/go-for-apache-dubbo/issues/2)
+## [User List](https://github.com/apache/dubbo-go/issues/2)
## Stargazers
-[](https://starchart.cc/dubbo/dubbo-go)
+[](https://starchart.cc/apache/dubbo-go)
diff --git a/cluster/cluster.go b/cluster/cluster.go
index a9a6c2e5972f44c50180f39c42f27b6aa681546f..5077aecae148a870fd65c20dee0c4701898231d9 100644
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -14,7 +14,9 @@
package cluster
-import "github.com/dubbo/go-for-apache-dubbo/protocol"
+import (
+ "github.com/apache/dubbo-go/protocol"
+)
type Cluster interface {
Join(Directory) protocol.Invoker
diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go
index 3b0c587cce9eba4825fdb566c3c790c41c805c09..0bfeb26a8afd78b39767b0009fa198db9622aa03 100644
--- a/cluster/cluster_impl/base_cluster_invoker.go
+++ b/cluster/cluster_impl/base_cluster_invoker.go
@@ -20,11 +20,11 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/utils"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/version"
+ "github.com/apache/dubbo-go/cluster"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/utils"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/version"
)
type baseClusterInvoker struct {
diff --git a/cluster/cluster_impl/failover_cluster.go b/cluster/cluster_impl/failover_cluster.go
index 2f2bfdfe36e2943a9757b46c3218116e583a01d6..32059755605e303570be4a36d932d21b6f8c7d02 100644
--- a/cluster/cluster_impl/failover_cluster.go
+++ b/cluster/cluster_impl/failover_cluster.go
@@ -15,13 +15,12 @@
package cluster_impl
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/cluster"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol"
)
-type failoverCluster struct {
-}
+type failoverCluster struct{}
const name = "failover"
diff --git a/cluster/cluster_impl/failover_cluster_invoker.go b/cluster/cluster_impl/failover_cluster_invoker.go
index 5bb2471e06c967159196d754fe04158ad3a96c6b..834c71cad5c7e517dba8756aa28f7ba13c79f6f4 100644
--- a/cluster/cluster_impl/failover_cluster_invoker.go
+++ b/cluster/cluster_impl/failover_cluster_invoker.go
@@ -19,12 +19,12 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/common/utils"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/version"
+ "github.com/apache/dubbo-go/cluster"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/utils"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/version"
)
type failoverClusterInvoker struct {
diff --git a/cluster/cluster_impl/failover_cluster_test.go b/cluster/cluster_impl/failover_cluster_test.go
index 5f0a28f0a679c42b6cd5fd2b9a9052a4722c0737..a50263311c5891284734bf25ceb151a9b69b2560 100644
--- a/cluster/cluster_impl/failover_cluster_test.go
+++ b/cluster/cluster_impl/failover_cluster_test.go
@@ -26,14 +26,14 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster/directory"
- "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/cluster/directory"
+ "github.com/apache/dubbo-go/cluster/loadbalance"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
/////////////////////////////
diff --git a/cluster/cluster_impl/mock_cluster.go b/cluster/cluster_impl/mock_cluster.go
index f913eb6827b56aa1795df593fee38aaedf4bded6..5ef45faf4d2ea3987d3bc67edfd032c354f6dd70 100644
--- a/cluster/cluster_impl/mock_cluster.go
+++ b/cluster/cluster_impl/mock_cluster.go
@@ -15,12 +15,11 @@
package cluster_impl
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/cluster"
+ "github.com/apache/dubbo-go/protocol"
)
-type mockCluster struct {
-}
+type mockCluster struct{}
func NewMockCluster() cluster.Cluster {
return &mockCluster{}
diff --git a/cluster/cluster_impl/registry_aware_cluster.go b/cluster/cluster_impl/registry_aware_cluster.go
index 9f897bdf59c9b32794a7fe3038ee27e272f891e2..b8beaec10f2c3a88b36bfa7842c44120380d1ea3 100644
--- a/cluster/cluster_impl/registry_aware_cluster.go
+++ b/cluster/cluster_impl/registry_aware_cluster.go
@@ -15,13 +15,12 @@
package cluster_impl
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/cluster"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol"
)
-type registryAwareCluster struct {
-}
+type registryAwareCluster struct{}
func init() {
extension.SetCluster("registryAware", NewRegistryAwareCluster)
diff --git a/cluster/cluster_impl/registry_aware_cluster_invoker.go b/cluster/cluster_impl/registry_aware_cluster_invoker.go
index 975ff8bdad63243188130b5772f2293c0b4e24de..b5e3eb20d969826f7a583be7699f16863342f449 100644
--- a/cluster/cluster_impl/registry_aware_cluster_invoker.go
+++ b/cluster/cluster_impl/registry_aware_cluster_invoker.go
@@ -15,9 +15,9 @@
package cluster_impl
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/cluster"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/protocol"
)
type registryAwareClusterInvoker struct {
diff --git a/cluster/cluster_impl/registry_aware_cluster_test.go b/cluster/cluster_impl/registry_aware_cluster_test.go
index 51734116a696303f4079c06ff361b200234e3aa9..70bd6742f70798258cd2fd9785d6fea3cd24c09a 100644
--- a/cluster/cluster_impl/registry_aware_cluster_test.go
+++ b/cluster/cluster_impl/registry_aware_cluster_test.go
@@ -24,10 +24,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster/directory"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/cluster/directory"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
func Test_RegAwareInvokeSuccess(t *testing.T) {
diff --git a/cluster/directory.go b/cluster/directory.go
index 9a055d6f580e622a68e648de0a0b2e3999773752..ef5135f6c44347413741a0dccd6bd13a2add1e45 100644
--- a/cluster/directory.go
+++ b/cluster/directory.go
@@ -15,8 +15,8 @@
package cluster
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
)
// Extension - Directory
diff --git a/cluster/directory/base_directory.go b/cluster/directory/base_directory.go
index ef74c3511ca1b57fac91249c9b02aa94cb8a1f78..ff6de33ac8647ccade1fe4f9df5fa3a27cfb4806 100644
--- a/cluster/directory/base_directory.go
+++ b/cluster/directory/base_directory.go
@@ -21,7 +21,7 @@ import (
"go.uber.org/atomic"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/apache/dubbo-go/common"
)
type BaseDirectory struct {
diff --git a/cluster/directory/static_directory.go b/cluster/directory/static_directory.go
index 3ac567b00e37fae3923753a7577121e7a341ae1f..228d1840cbdc98dc267189cd86191567d9cd9967 100644
--- a/cluster/directory/static_directory.go
+++ b/cluster/directory/static_directory.go
@@ -15,8 +15,8 @@
package directory
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
)
type staticDirectory struct {
diff --git a/cluster/directory/static_directory_test.go b/cluster/directory/static_directory_test.go
index 929d23edefd3821ae8f6c48a3706f6036b9238d8..a2738207856cea0b77537121dd8090dcfb8c8a60 100644
--- a/cluster/directory/static_directory_test.go
+++ b/cluster/directory/static_directory_test.go
@@ -25,9 +25,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
func Test_StaticDirList(t *testing.T) {
diff --git a/cluster/loadbalance.go b/cluster/loadbalance.go
index 897c7952f63047eb2a2237a0cd6baba3c6cb2dc2..30755b2a50fd3155b08bf6dc1fe66160caed2a6d 100644
--- a/cluster/loadbalance.go
+++ b/cluster/loadbalance.go
@@ -15,7 +15,7 @@
package cluster
import (
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/protocol"
)
// Extension - LoadBalance
diff --git a/cluster/loadbalance/random.go b/cluster/loadbalance/random.go
index 992a8dfc35be600d29663aebf59e665a681025e3..71f2e34ffbcc0ce25e239b1a808d5d78c68efef6 100644
--- a/cluster/loadbalance/random.go
+++ b/cluster/loadbalance/random.go
@@ -19,12 +19,14 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/cluster"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol"
)
-const name = "random"
+const (
+ name = "random"
+)
func init() {
extension.SetLoadbalance(name, NewRandomLoadBalance)
diff --git a/cluster/loadbalance/random_test.go b/cluster/loadbalance/random_test.go
index 5b94f6b27218cf7a7b8000ecd2c2c1121b5a8ffd..dcae0312667405bed4c1f1142c62574fe093e89c 100644
--- a/cluster/loadbalance/random_test.go
+++ b/cluster/loadbalance/random_test.go
@@ -28,10 +28,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
func Test_RandomlbSelect(t *testing.T) {
diff --git a/cluster/loadbalance/util.go b/cluster/loadbalance/util.go
index fdbeb14dd31fa8b2581f46d3adacf5355b12878b..999ae9df9596ffea47db0e3ed883978e5f02b42d 100644
--- a/cluster/loadbalance/util.go
+++ b/cluster/loadbalance/util.go
@@ -17,9 +17,10 @@ package loadbalance
import (
"time"
)
+
import (
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/protocol"
)
func GetWeight(invoker protocol.Invoker, invocation protocol.Invocation) int64 {
diff --git a/cluster/router.go b/cluster/router.go
index a80efaa0b99ad51c1ad5a83b5cff6d3996d2b220..c0ab126373aa0e21d01a141eae8305bd27608767 100644
--- a/cluster/router.go
+++ b/cluster/router.go
@@ -15,8 +15,8 @@
package cluster
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
)
// Extension - Router
diff --git a/common/extension/cluster.go b/common/extension/cluster.go
index 54b5ac59d31950c7ac42d81856f11c28f4716a19..3976d0e097a801e3d31b62037d41ee35e3f673ba 100644
--- a/common/extension/cluster.go
+++ b/common/extension/cluster.go
@@ -15,7 +15,7 @@
package extension
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster"
+ "github.com/apache/dubbo-go/cluster"
)
var (
diff --git a/common/extension/filter.go b/common/extension/filter.go
index 263b67eae4023bdca49af4f1197af7f19ba3dab0..22e49f9fa3dce77cbc19728cd748b6dfed5529b6 100644
--- a/common/extension/filter.go
+++ b/common/extension/filter.go
@@ -15,7 +15,7 @@
package extension
import (
- "github.com/dubbo/go-for-apache-dubbo/filter"
+ "github.com/apache/dubbo-go/filter"
)
var (
diff --git a/common/extension/loadbalance.go b/common/extension/loadbalance.go
index bb46c8283386351bfb8f789bedabd0fbd5e7b43d..188c2ba1bac9d8b3b45c1d300902c3276a766519 100644
--- a/common/extension/loadbalance.go
+++ b/common/extension/loadbalance.go
@@ -14,7 +14,9 @@
package extension
-import "github.com/dubbo/go-for-apache-dubbo/cluster"
+import (
+ "github.com/apache/dubbo-go/cluster"
+)
var (
loadbalances = make(map[string]func() cluster.LoadBalance)
@@ -28,5 +30,6 @@ func GetLoadbalance(name string) cluster.LoadBalance {
if loadbalances[name] == nil {
panic("loadbalance for " + name + " is not existing, make sure you have import the package.")
}
+
return loadbalances[name]()
}
diff --git a/common/extension/protocol.go b/common/extension/protocol.go
index f1ddbdeef8bb3de0207befaf3ec7063571723513..c9f4db2a0a42c6dc5eca44e7af261f156a92be7a 100644
--- a/common/extension/protocol.go
+++ b/common/extension/protocol.go
@@ -15,7 +15,7 @@
package extension
import (
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/protocol"
)
var (
diff --git a/common/extension/proxy_factory.go b/common/extension/proxy_factory.go
index 8795ea8f975237c4d263053fb67052d5b98cff84..d84acbd419c9bda3ae589d4076ede74655b24e1c 100644
--- a/common/extension/proxy_factory.go
+++ b/common/extension/proxy_factory.go
@@ -1,6 +1,22 @@
+// Copyright 2016-2019 hxmhlt & Yincheng Fang
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package extension
-import "github.com/dubbo/go-for-apache-dubbo/common/proxy"
+import (
+ "github.com/apache/dubbo-go/common/proxy"
+)
var (
proxy_factories = make(map[string]func(...proxy.Option) proxy.ProxyFactory)
diff --git a/common/extension/registry.go b/common/extension/registry.go
index d6cacd88028bf96697e11525098454d741784351..e10e4d0d865de40763575a84fd43582b5de9251e 100644
--- a/common/extension/registry.go
+++ b/common/extension/registry.go
@@ -15,8 +15,8 @@
package extension
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/registry"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/registry"
)
var (
diff --git a/common/logger/log.yml b/common/logger/log.yml
index 427308d52b028d1740dac56b66b2e54fa76c6fe2..59fa4279ad85272c4c49d532beaf23b74d00f58a 100644
--- a/common/logger/log.yml
+++ b/common/logger/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/common/logger/logger.go b/common/logger/logger.go
index 22fe7329e7601b9e3701ad51c9da2eaa937a7d27..1fb268f7e2bbed168c2651e6c521c43f00d5b294 100644
--- a/common/logger/logger.go
+++ b/common/logger/logger.go
@@ -30,7 +30,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
+ "github.com/apache/dubbo-go/common/constant"
)
var (
diff --git a/common/proxy/proxy.go b/common/proxy/proxy.go
index 033c8687ee25d4ded826b9a6a1315608b7b8c4ab..b4d90deea8348966e6889cf1f4e6116300221684 100644
--- a/common/proxy/proxy.go
+++ b/common/proxy/proxy.go
@@ -19,10 +19,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- invocation_impl "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
+ invocation_impl "github.com/apache/dubbo-go/protocol/invocation"
)
// Proxy struct
diff --git a/common/proxy/proxy_factory.go b/common/proxy/proxy_factory.go
index 4d7fa52b7451b0c014d2ffdc3f0383acb6c777d4..3541ec99e90657273f7e84451689298b58958744 100644
--- a/common/proxy/proxy_factory.go
+++ b/common/proxy/proxy_factory.go
@@ -14,8 +14,8 @@
package proxy
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
)
type ProxyFactory interface {
diff --git a/common/proxy/proxy_factory/default.go b/common/proxy/proxy_factory/default.go
index 54ba45392bea7bcbb578178845ca781dbffe3cb5..39b54590f47e73a29a7f849360b51775bd4a5539 100644
--- a/common/proxy/proxy_factory/default.go
+++ b/common/proxy/proxy_factory/default.go
@@ -14,11 +14,11 @@
package proxy_factory
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/common/proxy"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/proxy"
+ "github.com/apache/dubbo-go/protocol"
)
func init() {
diff --git a/common/proxy/proxy_factory/default_test.go b/common/proxy/proxy_factory/default_test.go
index 385dfee636a5422ca81deee39b1195201c6edd3c..58860e2bc3fae27d5c694f2a6066b5bc1827a9dc 100644
--- a/common/proxy/proxy_factory/default_test.go
+++ b/common/proxy/proxy_factory/default_test.go
@@ -14,12 +14,15 @@
package proxy_factory
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/stretchr/testify/assert"
"testing"
)
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/stretchr/testify/assert"
+)
+
func Test_GetProxy(t *testing.T) {
proxyFactory := NewDefaultProxyFactory()
url := common.NewURLWithOptions("testservice")
diff --git a/common/proxy/proxy_test.go b/common/proxy/proxy_test.go
index 6a12af8a70552ec5348d75f9c57bec31670806ad..85c1c293289c7113b875ac81397114bf7b0f51f8 100644
--- a/common/proxy/proxy_test.go
+++ b/common/proxy/proxy_test.go
@@ -26,9 +26,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/protocol"
)
type TestService struct {
diff --git a/common/rpc_service.go b/common/rpc_service.go
index 3a215ab17a7c156fda7d19be3b86255d8ef06138..3bd22725574af8a9a65f171c91ad4fc226617c7d 100644
--- a/common/rpc_service.go
+++ b/common/rpc_service.go
@@ -28,7 +28,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
)
// rpc service interface
diff --git a/common/url.go b/common/url.go
index 9ea3e0b09179a576bd7aac3f4601e6f61c437f47..3336472fabf2d76e01cc0f796300330a90d2eed4 100644
--- a/common/url.go
+++ b/common/url.go
@@ -28,7 +28,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
+ "github.com/apache/dubbo-go/common/constant"
)
/////////////////////////////////
diff --git a/common/url_test.go b/common/url_test.go
index 21c1aeeb15fae9efdee1008acdd22578a70caa5c..14c98870f084b659b5ca6a2bf51d4b6cd153496a 100644
--- a/common/url_test.go
+++ b/common/url_test.go
@@ -21,7 +21,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
+ "github.com/apache/dubbo-go/common/constant"
"github.com/stretchr/testify/assert"
)
diff --git a/common/utils/strings.go b/common/utils/strings.go
index 1844479fb66e98062e1e3a18dabe6eba14f41d09..f44cdb868e5fb5683916214185bb968c921fbaf0 100644
--- a/common/utils/strings.go
+++ b/common/utils/strings.go
@@ -1,6 +1,8 @@
package utils
-import "regexp"
+import (
+ "regexp"
+)
func RegSplit(text string, delimeter string) []string {
reg := regexp.MustCompile(delimeter)
diff --git a/config/config_loader.go b/config/config_loader.go
index 0078dc5b6523d743dd7aa806dea2442a1927bcf7..1c3a8096839d8dde1183a7f42927e55ab87c153d 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -30,9 +30,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/version"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/version"
)
var (
diff --git a/config/config_loader_test.go b/config/config_loader_test.go
index 0fcd76b95535c09770a0a72e6a8ca8f5f5007d7a..20f62f8e618d0b6f10eff41b1986b2511134a410 100644
--- a/config/config_loader_test.go
+++ b/config/config_loader_test.go
@@ -15,7 +15,6 @@
package config
import (
- "github.com/dubbo/go-for-apache-dubbo/common/proxy/proxy_factory"
"path/filepath"
"testing"
)
@@ -25,9 +24,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
+ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
)
func TestConfigLoader(t *testing.T) {
diff --git a/config/config_utils.go b/config/config_utils.go
index 5b2e2053ce5c2aac9312c8112e5c234764b394d1..3b868df6d1bad0961ef247623447f8da026642a2 100644
--- a/config/config_utils.go
+++ b/config/config_utils.go
@@ -5,7 +5,7 @@ import (
"strings"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
+ "github.com/apache/dubbo-go/common/constant"
)
func mergeValue(str1, str2, def string) string {
diff --git a/config/mock_rpcservice.go b/config/mock_rpcservice.go
index 87059ac007d736f19bbeea579a18a41b407a9560..62c298cd7aba659347c6c84447df8d524c75a504 100644
--- a/config/mock_rpcservice.go
+++ b/config/mock_rpcservice.go
@@ -14,20 +14,24 @@
package config
-import "context"
+import (
+ "context"
+)
-type MockService struct {
-}
+type MockService struct{}
func (*MockService) Service() string {
return "MockService"
}
+
func (*MockService) Version() string {
return "1.0"
}
+
func (*MockService) GetUser(ctx context.Context, itf []interface{}, str *struct{}) error {
return nil
}
+
func (*MockService) GetUser1(ctx context.Context, itf []interface{}, str *struct{}) error {
return nil
}
diff --git a/config/reference_config.go b/config/reference_config.go
index fb83b8001a3a1339b2c7a3c294f7519d0dfa6025..026b163d36ce4a3a30db2a635bef29cfcbebb1eb 100644
--- a/config/reference_config.go
+++ b/config/reference_config.go
@@ -23,13 +23,13 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster/directory"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/common/proxy"
- "github.com/dubbo/go-for-apache-dubbo/common/utils"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/cluster/directory"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/proxy"
+ "github.com/apache/dubbo-go/common/utils"
+ "github.com/apache/dubbo-go/protocol"
)
type ReferenceConfig struct {
@@ -61,6 +61,7 @@ type ConfigRegistry string
func NewReferenceConfig(ctx context.Context) *ReferenceConfig {
return &ReferenceConfig{context: ctx}
}
+
func (refconfig *ReferenceConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
type rf ReferenceConfig
raw := rf{} // Put your defaults here
@@ -71,6 +72,7 @@ func (refconfig *ReferenceConfig) UnmarshalYAML(unmarshal func(interface{}) erro
*refconfig = ReferenceConfig(raw)
return nil
}
+
func (refconfig *ReferenceConfig) Refer() {
url := common.NewURLWithOptions(refconfig.InterfaceName, common.WithProtocol(refconfig.Protocol), common.WithParams(refconfig.getUrlMap()))
diff --git a/config/reference_config_test.go b/config/reference_config_test.go
index a43c1e61c7d3b024c1e09db738173d9d3371e0ad..8c818521a74e1d94d1e7b8f998cb3706cb845153 100644
--- a/config/reference_config_test.go
+++ b/config/reference_config_test.go
@@ -24,10 +24,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol"
)
var regProtocol protocol.Protocol
@@ -174,6 +174,7 @@ func Test_ReferMultiP2PWithReg(t *testing.T) {
}
consumerConfig = nil
}
+
func Test_Implement(t *testing.T) {
doInit()
extension.SetProtocol("registry", GetProtocol)
@@ -186,6 +187,7 @@ func Test_Implement(t *testing.T) {
}
consumerConfig = nil
}
+
func GetProtocol() protocol.Protocol {
if regProtocol != nil {
return regProtocol
@@ -197,8 +199,7 @@ func newRegistryProtocol() protocol.Protocol {
return &mockRegistryProtocol{}
}
-type mockRegistryProtocol struct {
-}
+type mockRegistryProtocol struct{}
func (*mockRegistryProtocol) Refer(url common.URL) protocol.Invoker {
return protocol.NewBaseInvoker(url)
@@ -208,6 +209,4 @@ func (*mockRegistryProtocol) Export(invoker protocol.Invoker) protocol.Exporter
return protocol.NewBaseExporter("test", invoker, &sync.Map{})
}
-func (*mockRegistryProtocol) Destroy() {
-
-}
+func (*mockRegistryProtocol) Destroy() {}
diff --git a/config/registry_config.go b/config/registry_config.go
index 550b73544fa055b044d5bb4305bdd3624beefd67..3e2e82e80fb065b8e6a5fee46fe76637fe636e7c 100644
--- a/config/registry_config.go
+++ b/config/registry_config.go
@@ -21,9 +21,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
)
type RegistryConfig struct {
@@ -43,8 +43,12 @@ func loadRegistries(registriesIds []ConfigRegistry, registries []RegistryConfig,
for _, registryConf := range registries {
if string(registry) == registryConf.Id {
- url, err := common.NewURL(context.TODO(), constant.REGISTRY_PROTOCOL+"://"+registryConf.Address, common.WithParams(registryConf.getUrlMap(roleType)),
- common.WithUsername(registryConf.Username), common.WithPassword(registryConf.Password),
+ url, err := common.NewURL(
+ context.TODO(),
+ constant.REGISTRY_PROTOCOL+"://"+registryConf.Address,
+ common.WithParams(registryConf.getUrlMap(roleType)),
+ common.WithUsername(registryConf.Username),
+ common.WithPassword(registryConf.Password),
)
if err != nil {
@@ -66,5 +70,6 @@ func (regconfig *RegistryConfig) getUrlMap(roleType common.RoleType) url.Values
urlMap.Set(constant.ROLE_KEY, strconv.Itoa(int(roleType)))
urlMap.Set(constant.REGISTRY_KEY, regconfig.Type)
urlMap.Set(constant.REGISTRY_TIMEOUT_KEY, regconfig.TimeoutStr)
+
return urlMap
}
diff --git a/config/service.go b/config/service.go
index 507bee4542a666de63d946509c15e320a876ed8b..88dd1ed37e50d59ffc287dbc44498596e84629f0 100644
--- a/config/service.go
+++ b/config/service.go
@@ -15,7 +15,7 @@
package config
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/apache/dubbo-go/common"
)
var (
diff --git a/config/service_config.go b/config/service_config.go
index 0391a17dd1ef397870ad2fb8288a9b5cbab35bfd..ec9fd1554c7a1b52864119fc6740231455a86d4d 100644
--- a/config/service_config.go
+++ b/config/service_config.go
@@ -22,16 +22,18 @@ import (
"sync"
"time"
)
+
import (
perrors "github.com/pkg/errors"
"go.uber.org/atomic"
)
+
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
)
type ServiceConfig struct {
diff --git a/config/service_config_test.go b/config/service_config_test.go
index bed7cc5b954c21f9700bff6424ac7c73e7f69df3..500af08fe8b39ec5cf4f1fc3dc2c58ae209e3e8d 100644
--- a/config/service_config_test.go
+++ b/config/service_config_test.go
@@ -23,7 +23,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
+ "github.com/apache/dubbo-go/common/extension"
)
func doinit() {
@@ -114,6 +114,7 @@ func doinit() {
},
}
}
+
func Test_Export(t *testing.T) {
doinit()
extension.SetProtocol("registry", GetProtocol)
diff --git a/config/testdata/consumer_config.yml b/config/testdata/consumer_config.yml
index db242c95ad1f1eae32f2e84166263860c2030b48..9095c44d4f821119e85e2225a5ee858abbea80a5 100644
--- a/config/testdata/consumer_config.yml
+++ b/config/testdata/consumer_config.yml
@@ -17,32 +17,32 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
references:
-- registries :
- - "hangzhouzk"
- - "shanghaizk"
- filter: ""
- protocol : "dubbo"
- interface : "com.ikurento.user.UserProvider"
- url: "dubbo://127.0.0.1:20000"
- cluster: "failover"
- methods :
- - name: "GetUser"
- retries: 3
+ - registries :
+ - "hangzhouzk"
+ - "shanghaizk"
+ filter: ""
+ protocol : "dubbo"
+ interface : "com.ikurento.user.UserProvider"
+ url: "dubbo://127.0.0.1:20000"
+ cluster: "failover"
+ methods :
+ - name: "GetUser"
+ retries: 3
protocol_conf:
dubbo:
diff --git a/config/testdata/provider_config.yml b/config/testdata/provider_config.yml
index 6c7da063695886c934eb92a300135f5374a0aa7f..b02384798fc06f7d7e6e9ca919315a09dd1d47da 100644
--- a/config/testdata/provider_config.yml
+++ b/config/testdata/provider_config.yml
@@ -11,45 +11,45 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
services:
-- registries:
- - "hangzhouzk"
- - "shanghaizk"
- filter: ""
- protocol : "dubbo"
- # equivalent to interface of dubbo.xml
- interface : "com.ikurento.user.UserProvider"
- loadbalance: "random"
- warmup: "100"
- cluster: "failover"
- methods:
- - name: "GetUser"
- retries: 1
+ - registries:
+ - "hangzhouzk"
+ - "shanghaizk"
+ filter: ""
+ protocol : "dubbo"
+ # equivalent to interface of dubbo.xml
+ interface : "com.ikurento.user.UserProvider"
loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
protocols:
-- name: "dubbo"
- # while using dubbo protocol, ip cannot is 127.0.0.1, because client of java-dubbo will get 'connection refuse'
- ip : "127.0.0.1"
- port : 20000
-#- name: "jsonrpc"
-# ip: "127.0.0.1"
-# port: 20001
+ - name: "dubbo"
+ # while using dubbo protocol, ip cannot is 127.0.0.1, because client of java-dubbo will get 'connection refuse'
+ ip : "127.0.0.1"
+ port : 20000
+ #- name: "jsonrpc"
+ # ip: "127.0.0.1"
+ # port: 20001
protocol_conf:
dubbo:
diff --git a/examples/dubbo/go-client/app/client.go b/examples/dubbo/go-client/app/client.go
index c95654267dd6ba2a8400888e0fcb6d299fad0cf8..ae1e6102cef3039670b2801db8589e29d1b56d4b 100644
--- a/examples/dubbo/go-client/app/client.go
+++ b/examples/dubbo/go-client/app/client.go
@@ -24,21 +24,21 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
"github.com/dubbogo/hessian2"
)
import (
- _ "github.com/dubbo/go-for-apache-dubbo/common/proxy/proxy_factory"
- "github.com/dubbo/go-for-apache-dubbo/config"
- _ "github.com/dubbo/go-for-apache-dubbo/protocol/dubbo"
- _ "github.com/dubbo/go-for-apache-dubbo/registry/protocol"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ "github.com/apache/dubbo-go/config"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
- _ "github.com/dubbo/go-for-apache-dubbo/filter/impl"
+ _ "github.com/apache/dubbo-go/filter/impl"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
- _ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper"
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
var (
diff --git a/examples/dubbo/go-client/app/user.go b/examples/dubbo/go-client/app/user.go
index 7e9d3daedf756b79318160995ace0d8222b39b05..9f519f0d0440ab457077a9a4273c5e8a8d5464e5 100644
--- a/examples/dubbo/go-client/app/user.go
+++ b/examples/dubbo/go-client/app/user.go
@@ -26,7 +26,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/config"
+ "github.com/apache/dubbo-go/config"
)
type Gender hessian.JavaEnum
diff --git a/examples/dubbo/go-client/app/version.go b/examples/dubbo/go-client/app/version.go
index 33bb9cd02dd53fdbd84f9f96942cf2dc9c1ef115..60c1a81ade0cefd1b766727abc1fcefd6c266939 100644
--- a/examples/dubbo/go-client/app/version.go
+++ b/examples/dubbo/go-client/app/version.go
@@ -1,5 +1,5 @@
package main
var (
- Version = "0.3.1"
+ Version = "2.6.0"
)
diff --git a/examples/dubbo/go-client/profiles/dev/client.yml b/examples/dubbo/go-client/profiles/dev/client.yml
index 4e3acb0043d82cf74099ecbd2c33437478b6c8da..3fcbd2cb15cd4217a8900a148753b8a7337ac553 100644
--- a/examples/dubbo/go-client/profiles/dev/client.yml
+++ b/examples/dubbo/go-client/profiles/dev/client.yml
@@ -15,32 +15,32 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
references:
-- registries :
- - "hangzhouzk"
- - "shanghaizk"
+ - registries :
+ - "hangzhouzk"
+ - "shanghaizk"
- protocol : "dubbo"
-# url: "dubbo://127.0.0.1:20000"
- interface : "com.ikurento.user.UserProvider"
- cluster: "failover"
- methods :
- - name: "GetUser"
- retries: 3
+ protocol : "dubbo"
+ # url: "dubbo://127.0.0.1:20000"
+ interface : "com.ikurento.user.UserProvider"
+ cluster: "failover"
+ methods :
+ - name: "GetUser"
+ retries: 3
protocol_conf:
dubbo:
diff --git a/examples/dubbo/go-client/profiles/dev/log.yml b/examples/dubbo/go-client/profiles/dev/log.yml
index 427308d52b028d1740dac56b66b2e54fa76c6fe2..59fa4279ad85272c4c49d532beaf23b74d00f58a 100644
--- a/examples/dubbo/go-client/profiles/dev/log.yml
+++ b/examples/dubbo/go-client/profiles/dev/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/dubbo/go-client/profiles/release/client.yml b/examples/dubbo/go-client/profiles/release/client.yml
index cb36b6946c3d5c637e291c47e34a779aaf427553..998f232fcac87da0b793ca2c062cf6cf6de8f6f3 100644
--- a/examples/dubbo/go-client/profiles/release/client.yml
+++ b/examples/dubbo/go-client/profiles/release/client.yml
@@ -15,31 +15,31 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
references:
-- registries :
- - "hangzhouzk"
- - "shanghaizk"
+ - registries :
+ - "hangzhouzk"
+ - "shanghaizk"
- protocol : "dubbo"
- interface : "com.ikurento.user.UserProvider"
- cluster: "failover"
- methods :
- - name: "GetUser"
- retries: 3
+ protocol : "dubbo"
+ interface : "com.ikurento.user.UserProvider"
+ cluster: "failover"
+ methods :
+ - name: "GetUser"
+ retries: 3
protocol_conf:
dubbo:
diff --git a/examples/dubbo/go-client/profiles/release/log.yml b/examples/dubbo/go-client/profiles/release/log.yml
index b9139c2e9cb21d5f557eb53e5d6909fca64ac205..e0514be020eedf594d99d112183cdd5ce199e46d 100644
--- a/examples/dubbo/go-client/profiles/release/log.yml
+++ b/examples/dubbo/go-client/profiles/release/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/dubbo/go-client/profiles/test/client.yml b/examples/dubbo/go-client/profiles/test/client.yml
index cb36b6946c3d5c637e291c47e34a779aaf427553..998f232fcac87da0b793ca2c062cf6cf6de8f6f3 100644
--- a/examples/dubbo/go-client/profiles/test/client.yml
+++ b/examples/dubbo/go-client/profiles/test/client.yml
@@ -15,31 +15,31 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
references:
-- registries :
- - "hangzhouzk"
- - "shanghaizk"
+ - registries :
+ - "hangzhouzk"
+ - "shanghaizk"
- protocol : "dubbo"
- interface : "com.ikurento.user.UserProvider"
- cluster: "failover"
- methods :
- - name: "GetUser"
- retries: 3
+ protocol : "dubbo"
+ interface : "com.ikurento.user.UserProvider"
+ cluster: "failover"
+ methods :
+ - name: "GetUser"
+ retries: 3
protocol_conf:
dubbo:
diff --git a/examples/dubbo/go-client/profiles/test/log.yml b/examples/dubbo/go-client/profiles/test/log.yml
index d2e1d05f3f46bc4ec6c7b8a16211c13d2189219d..baee0b7248484e425f88f35ab128212c931ff85e 100644
--- a/examples/dubbo/go-client/profiles/test/log.yml
+++ b/examples/dubbo/go-client/profiles/test/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/dubbo/go-server/app/server.go b/examples/dubbo/go-server/app/server.go
index 1c0d2c2c7391a417177332ab7341d80ade7a4faf..d51d66b40780414ba2feee3ca57113257bb930ac 100644
--- a/examples/dubbo/go-server/app/server.go
+++ b/examples/dubbo/go-server/app/server.go
@@ -23,21 +23,21 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
"github.com/dubbogo/hessian2"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/config"
- _ "github.com/dubbo/go-for-apache-dubbo/protocol/dubbo"
- _ "github.com/dubbo/go-for-apache-dubbo/registry/protocol"
+ "github.com/apache/dubbo-go/config"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
- _ "github.com/dubbo/go-for-apache-dubbo/common/proxy/proxy_factory"
- _ "github.com/dubbo/go-for-apache-dubbo/filter/impl"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ _ "github.com/apache/dubbo-go/filter/impl"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
- _ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper"
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
var (
diff --git a/examples/dubbo/go-server/app/user.go b/examples/dubbo/go-server/app/user.go
index 427125bd1329668c24e9dc46a94d55cfb362a472..8e66dcf821c0228c2349f08a0eeeefecf3ac4db3 100644
--- a/examples/dubbo/go-server/app/user.go
+++ b/examples/dubbo/go-server/app/user.go
@@ -27,7 +27,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/config"
+ "github.com/apache/dubbo-go/config"
)
type Gender hessian.JavaEnum
diff --git a/examples/dubbo/go-server/app/version.go b/examples/dubbo/go-server/app/version.go
index c7552b26e11ec15fd51f3e18905d35d577647cd7..60c1a81ade0cefd1b766727abc1fcefd6c266939 100644
--- a/examples/dubbo/go-server/app/version.go
+++ b/examples/dubbo/go-server/app/version.go
@@ -1,5 +1,5 @@
package main
var (
- Version string = "0.3.1"
+ Version = "2.6.0"
)
diff --git a/examples/dubbo/go-server/profiles/dev/log.yml b/examples/dubbo/go-server/profiles/dev/log.yml
index 427308d52b028d1740dac56b66b2e54fa76c6fe2..59fa4279ad85272c4c49d532beaf23b74d00f58a 100644
--- a/examples/dubbo/go-server/profiles/dev/log.yml
+++ b/examples/dubbo/go-server/profiles/dev/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/dubbo/go-server/profiles/dev/server.yml b/examples/dubbo/go-server/profiles/dev/server.yml
index 6477a6638540e757452c737173088b2af7fe3323..06f3c9f885a917b71baea178d172f8782e174218 100644
--- a/examples/dubbo/go-server/profiles/dev/server.yml
+++ b/examples/dubbo/go-server/profiles/dev/server.yml
@@ -10,43 +10,43 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
services:
-- registries:
- - "hangzhouzk"
- - "shanghaizk"
- protocol : "dubbo"
- # 鐩稿綋浜巇ubbo.xml涓殑interface
- interface : "com.ikurento.user.UserProvider"
- loadbalance: "random"
- warmup: "100"
- cluster: "failover"
- methods:
- - name: "GetUser"
- retries: 1
+ - registries:
+ - "hangzhouzk"
+ - "shanghaizk"
+ protocol : "dubbo"
+ # 鐩稿綋浜巇ubbo.xml涓殑interface
+ interface : "com.ikurento.user.UserProvider"
loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
protocols:
-- name: "dubbo"
- ip : "127.0.0.1"
- port : 20000
-#- name: "jsonrpc"
-# ip: "127.0.0.1"
-# port: 20001
+ - name: "dubbo"
+ ip : "127.0.0.1"
+ port : 20000
+ #- name: "jsonrpc"
+ # ip: "127.0.0.1"
+ # port: 20001
protocol_conf:
dubbo:
diff --git a/examples/dubbo/go-server/profiles/release/log.yml b/examples/dubbo/go-server/profiles/release/log.yml
index b9139c2e9cb21d5f557eb53e5d6909fca64ac205..e0514be020eedf594d99d112183cdd5ce199e46d 100644
--- a/examples/dubbo/go-server/profiles/release/log.yml
+++ b/examples/dubbo/go-server/profiles/release/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/dubbo/go-server/profiles/release/server.yml b/examples/dubbo/go-server/profiles/release/server.yml
index 728e8802dd5d49aef4336597a6810724d0836c16..64587aa1adb9afac3b32c0e74779566ba88cbc7c 100644
--- a/examples/dubbo/go-server/profiles/release/server.yml
+++ b/examples/dubbo/go-server/profiles/release/server.yml
@@ -10,43 +10,43 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
services:
-- registries:
- - "hangzhouzk"
- - "shanghaizk"
- protocol : "dubbo"
- # 鐩稿綋浜巇ubbo.xml涓殑interface
- interface : "com.ikurento.user.UserProvider"
- loadbalance: "random"
- warmup: "100"
- cluster: "failover"
- methods:
- - name: "GetUser"
- retries: 1
+ - registries:
+ - "hangzhouzk"
+ - "shanghaizk"
+ protocol : "dubbo"
+ # 鐩稿綋浜巇ubbo.xml涓殑interface
+ interface : "com.ikurento.user.UserProvider"
loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
protocols:
-- name: "dubbo"
- ip : "127.0.0.1"
- port : 20000
-#- name: "jsonrpc"
-# ip: "127.0.0.1"
-# port: 20001
+ - name: "dubbo"
+ ip : "127.0.0.1"
+ port : 20000
+ #- name: "jsonrpc"
+ # ip: "127.0.0.1"
+ # port: 20001
protocol_conf:
dubbo:
diff --git a/examples/dubbo/go-server/profiles/test/log.yml b/examples/dubbo/go-server/profiles/test/log.yml
index d2e1d05f3f46bc4ec6c7b8a16211c13d2189219d..baee0b7248484e425f88f35ab128212c931ff85e 100644
--- a/examples/dubbo/go-server/profiles/test/log.yml
+++ b/examples/dubbo/go-server/profiles/test/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/dubbo/go-server/profiles/test/server.yml b/examples/dubbo/go-server/profiles/test/server.yml
index 728e8802dd5d49aef4336597a6810724d0836c16..64587aa1adb9afac3b32c0e74779566ba88cbc7c 100644
--- a/examples/dubbo/go-server/profiles/test/server.yml
+++ b/examples/dubbo/go-server/profiles/test/server.yml
@@ -10,43 +10,43 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
services:
-- registries:
- - "hangzhouzk"
- - "shanghaizk"
- protocol : "dubbo"
- # 鐩稿綋浜巇ubbo.xml涓殑interface
- interface : "com.ikurento.user.UserProvider"
- loadbalance: "random"
- warmup: "100"
- cluster: "failover"
- methods:
- - name: "GetUser"
- retries: 1
+ - registries:
+ - "hangzhouzk"
+ - "shanghaizk"
+ protocol : "dubbo"
+ # 鐩稿綋浜巇ubbo.xml涓殑interface
+ interface : "com.ikurento.user.UserProvider"
loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
protocols:
-- name: "dubbo"
- ip : "127.0.0.1"
- port : 20000
-#- name: "jsonrpc"
-# ip: "127.0.0.1"
-# port: 20001
+ - name: "dubbo"
+ ip : "127.0.0.1"
+ port : 20000
+ #- name: "jsonrpc"
+ # ip: "127.0.0.1"
+ # port: 20001
protocol_conf:
dubbo:
diff --git a/examples/jsonrpc/go-client/app/client.go b/examples/jsonrpc/go-client/app/client.go
index b71f0efa20243ddf2635c56ee0eca7340db6ce03..9ae1f196b13b8d203d2d7d882b3123946cffc711 100644
--- a/examples/jsonrpc/go-client/app/client.go
+++ b/examples/jsonrpc/go-client/app/client.go
@@ -24,20 +24,20 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
)
import (
- _ "github.com/dubbo/go-for-apache-dubbo/common/proxy/proxy_factory"
- "github.com/dubbo/go-for-apache-dubbo/config"
- _ "github.com/dubbo/go-for-apache-dubbo/protocol/jsonrpc"
- _ "github.com/dubbo/go-for-apache-dubbo/registry/protocol"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ "github.com/apache/dubbo-go/config"
+ _ "github.com/apache/dubbo-go/protocol/jsonrpc"
+ _ "github.com/apache/dubbo-go/registry/protocol"
- _ "github.com/dubbo/go-for-apache-dubbo/filter/impl"
+ _ "github.com/apache/dubbo-go/filter/impl"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
- _ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper"
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
var (
diff --git a/examples/jsonrpc/go-client/app/user.go b/examples/jsonrpc/go-client/app/user.go
index 0d159876125a19bb9c75fbd21d893942763a67c8..716ae988e18143344dc1b2533616bcc13df0bd2d 100644
--- a/examples/jsonrpc/go-client/app/user.go
+++ b/examples/jsonrpc/go-client/app/user.go
@@ -21,7 +21,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/config"
+ "github.com/apache/dubbo-go/config"
)
func init() {
diff --git a/examples/jsonrpc/go-client/app/version.go b/examples/jsonrpc/go-client/app/version.go
index 33bb9cd02dd53fdbd84f9f96942cf2dc9c1ef115..60c1a81ade0cefd1b766727abc1fcefd6c266939 100644
--- a/examples/jsonrpc/go-client/app/version.go
+++ b/examples/jsonrpc/go-client/app/version.go
@@ -1,5 +1,5 @@
package main
var (
- Version = "0.3.1"
+ Version = "2.6.0"
)
diff --git a/examples/jsonrpc/go-client/profiles/dev/client.yml b/examples/jsonrpc/go-client/profiles/dev/client.yml
index 50ed8d5011cbbd08b133f040eb0d71edb970f146..020adc5e6bd1294a8174f5c0e663f379fe03c88e 100644
--- a/examples/jsonrpc/go-client/profiles/dev/client.yml
+++ b/examples/jsonrpc/go-client/profiles/dev/client.yml
@@ -16,28 +16,52 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
references:
-- registries :
- - "hangzhouzk"
- - "shanghaizk"
+ - registries :
+ - "hangzhouzk"
+ - "shanghaizk"
- protocol : "jsonrpc"
- interface : "com.ikurento.user.UserProvider"
- cluster: "failover"
- methods :
- - name: "GetUser"
- retries: 3
+ protocol : "jsonrpc"
+ interface : "com.ikurento.user.UserProvider"
+ cluster: "failover"
+ methods :
+ - name: "GetUser"
+ retries: 3
+
+protocol_conf:
+ dubbo:
+ reconnect_interval: 0
+ connection_number: 2
+ heartbeat_period: "5s"
+ session_timeout: "20s"
+ fail_fast_timeout: "5s"
+ pool_size: 64
+ pool_ttl: 600
+ getty_session_param:
+ compress_encoding: false
+ tcp_no_delay: true
+ tcp_keep_alive: true
+ keep_alive_period: "120s"
+ tcp_r_buf_size: 262144
+ tcp_w_buf_size: 65536
+ pkg_rq_size: 1024
+ pkg_wq_size: 512
+ tcp_read_timeout: "1s"
+ tcp_write_timeout: "5s"
+ wait_timeout: "1s"
+ max_msg_len: 10240
+ session_name: "client"
diff --git a/examples/jsonrpc/go-client/profiles/dev/log.yml b/examples/jsonrpc/go-client/profiles/dev/log.yml
index 427308d52b028d1740dac56b66b2e54fa76c6fe2..59fa4279ad85272c4c49d532beaf23b74d00f58a 100644
--- a/examples/jsonrpc/go-client/profiles/dev/log.yml
+++ b/examples/jsonrpc/go-client/profiles/dev/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/jsonrpc/go-client/profiles/release/client.yml b/examples/jsonrpc/go-client/profiles/release/client.yml
index 5aae8b717dc448162e0495e4b24d079f43351f4d..3e3bd63f5b2a73312936fc6dbc07404bcbe11687 100644
--- a/examples/jsonrpc/go-client/profiles/release/client.yml
+++ b/examples/jsonrpc/go-client/profiles/release/client.yml
@@ -17,28 +17,28 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
references:
-- registries :
- - "hangzhouzk"
- - "shanghaizk"
+ - registries :
+ - "hangzhouzk"
+ - "shanghaizk"
- protocol : "jsonrpc"
- interface : "com.ikurento.user.UserProvider"
- cluster: "failover"
- methods :
- - name: "GetUser"
- retries: 3
+ protocol : "jsonrpc"
+ interface : "com.ikurento.user.UserProvider"
+ cluster: "failover"
+ methods :
+ - name: "GetUser"
+ retries: 3
diff --git a/examples/jsonrpc/go-client/profiles/release/log.yml b/examples/jsonrpc/go-client/profiles/release/log.yml
index b9139c2e9cb21d5f557eb53e5d6909fca64ac205..e0514be020eedf594d99d112183cdd5ce199e46d 100644
--- a/examples/jsonrpc/go-client/profiles/release/log.yml
+++ b/examples/jsonrpc/go-client/profiles/release/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/jsonrpc/go-client/profiles/test/client.yml b/examples/jsonrpc/go-client/profiles/test/client.yml
index 5e0c0cea0a37672e9e24f5b0f9a7faeca9754f2a..e79f7f47f72f598775be0c226b2f63a3d334f8fe 100644
--- a/examples/jsonrpc/go-client/profiles/test/client.yml
+++ b/examples/jsonrpc/go-client/profiles/test/client.yml
@@ -16,28 +16,28 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
references:
-- registries :
- - "hangzhouzk"
- - "shanghaizk"
+ - registries :
+ - "hangzhouzk"
+ - "shanghaizk"
- protocol : "jsonrpc"
- interface : "com.ikurento.user.UserProvider"
- cluster: "failover"
- methods :
- - name: "GetUser"
- retries: 3
+ protocol : "jsonrpc"
+ interface : "com.ikurento.user.UserProvider"
+ cluster: "failover"
+ methods :
+ - name: "GetUser"
+ retries: 3
diff --git a/examples/jsonrpc/go-client/profiles/test/log.yml b/examples/jsonrpc/go-client/profiles/test/log.yml
index d2e1d05f3f46bc4ec6c7b8a16211c13d2189219d..baee0b7248484e425f88f35ab128212c931ff85e 100644
--- a/examples/jsonrpc/go-client/profiles/test/log.yml
+++ b/examples/jsonrpc/go-client/profiles/test/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/jsonrpc/go-server/app/server.go b/examples/jsonrpc/go-server/app/server.go
index 90c78413c45b54aa883868b140290f22802ebd15..1c95517851d4ef42bb3643dbf313dc03974a2037 100644
--- a/examples/jsonrpc/go-server/app/server.go
+++ b/examples/jsonrpc/go-server/app/server.go
@@ -23,17 +23,17 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- _ "github.com/dubbo/go-for-apache-dubbo/common/proxy/proxy_factory"
- "github.com/dubbo/go-for-apache-dubbo/config"
- _ "github.com/dubbo/go-for-apache-dubbo/protocol/jsonrpc"
- _ "github.com/dubbo/go-for-apache-dubbo/registry/protocol"
+ "github.com/apache/dubbo-go/common/logger"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ "github.com/apache/dubbo-go/config"
+ _ "github.com/apache/dubbo-go/protocol/jsonrpc"
+ _ "github.com/apache/dubbo-go/registry/protocol"
- _ "github.com/dubbo/go-for-apache-dubbo/filter/impl"
+ _ "github.com/apache/dubbo-go/filter/impl"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
- _ "github.com/dubbo/go-for-apache-dubbo/cluster/loadbalance"
- _ "github.com/dubbo/go-for-apache-dubbo/registry/zookeeper"
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
var (
diff --git a/examples/jsonrpc/go-server/app/user.go b/examples/jsonrpc/go-server/app/user.go
index 9170de431a719351ee1e1af4e5c6bbcd4cbfde62..0bf69b9edec301c0cc24e3c3d26aa30845b931a2 100644
--- a/examples/jsonrpc/go-server/app/user.go
+++ b/examples/jsonrpc/go-server/app/user.go
@@ -25,7 +25,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/config"
+ "github.com/apache/dubbo-go/config"
)
type Gender int
diff --git a/examples/jsonrpc/go-server/app/version.go b/examples/jsonrpc/go-server/app/version.go
index c7552b26e11ec15fd51f3e18905d35d577647cd7..60c1a81ade0cefd1b766727abc1fcefd6c266939 100644
--- a/examples/jsonrpc/go-server/app/version.go
+++ b/examples/jsonrpc/go-server/app/version.go
@@ -1,5 +1,5 @@
package main
var (
- Version string = "0.3.1"
+ Version = "2.6.0"
)
diff --git a/examples/jsonrpc/go-server/profiles/dev/log.yml b/examples/jsonrpc/go-server/profiles/dev/log.yml
index 427308d52b028d1740dac56b66b2e54fa76c6fe2..59fa4279ad85272c4c49d532beaf23b74d00f58a 100644
--- a/examples/jsonrpc/go-server/profiles/dev/log.yml
+++ b/examples/jsonrpc/go-server/profiles/dev/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/jsonrpc/go-server/profiles/dev/server.yml b/examples/jsonrpc/go-server/profiles/dev/server.yml
index 945df75c1018280d70c9e78f48d86bc3dc3453ae..0175847a68c19427a35d000f6a7e6d215fd8cf64 100644
--- a/examples/jsonrpc/go-server/profiles/dev/server.yml
+++ b/examples/jsonrpc/go-server/profiles/dev/server.yml
@@ -10,41 +10,41 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
services:
-- registries:
- - "hangzhouzk"
- - "shanghaizk"
- protocol : "jsonrpc"
- # 鐩稿綋浜巇ubbo.xml涓殑interface
- interface : "com.ikurento.user.UserProvider"
- loadbalance: "random"
- warmup: "100"
- cluster: "failover"
- methods:
- - name: "GetUser"
- retries: 1
- loadbalance: "random"
+ - registries:
+ - "hangzhouzk"
+ - "shanghaizk"
+ protocol : "jsonrpc"
+ # 鐩稿綋浜巇ubbo.xml涓殑interface
+ interface : "com.ikurento.user.UserProvider"
+ loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
protocols:
-#- name: "dubbo"
-# ip : "127.0.0.1"
-# port : 20000
-- name: "jsonrpc"
- ip: "127.0.0.1"
- port: 20001
+ #- name: "dubbo"
+ # ip : "127.0.0.1"
+ # port : 20000
+ - name: "jsonrpc"
+ ip: "127.0.0.1"
+ port: 20001
diff --git a/examples/jsonrpc/go-server/profiles/release/log.yml b/examples/jsonrpc/go-server/profiles/release/log.yml
index b9139c2e9cb21d5f557eb53e5d6909fca64ac205..e0514be020eedf594d99d112183cdd5ce199e46d 100644
--- a/examples/jsonrpc/go-server/profiles/release/log.yml
+++ b/examples/jsonrpc/go-server/profiles/release/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/jsonrpc/go-server/profiles/release/server.yml b/examples/jsonrpc/go-server/profiles/release/server.yml
index 597c493d932a63497d265ac37d2d0715751d1005..3c70e82483be227d60e7e9806ed19d3f371ded11 100644
--- a/examples/jsonrpc/go-server/profiles/release/server.yml
+++ b/examples/jsonrpc/go-server/profiles/release/server.yml
@@ -26,25 +26,25 @@ registries :
services:
-- registries:
- - "hangzhouzk"
- - "shanghaizk"
- protocol : "jsonrpc"
- # 鐩稿綋浜巇ubbo.xml涓殑interface
- interface : "com.ikurento.user.UserProvider"
- loadbalance: "random"
- warmup: "100"
- cluster: "failover"
- methods:
- - name: "GetUser"
- retries: 1
+ - registries:
+ - "hangzhouzk"
+ - "shanghaizk"
+ protocol : "jsonrpc"
+ # 鐩稿綋浜巇ubbo.xml涓殑interface
+ interface : "com.ikurento.user.UserProvider"
loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
protocols:
-#- name: "dubbo"
-# ip : "127.0.0.1"
-# port : 20000
-- name: "jsonrpc"
- ip: "127.0.0.1"
- port: 20001
+ #- name: "dubbo"
+ # ip : "127.0.0.1"
+ # port : 20000
+ - name: "jsonrpc"
+ ip: "127.0.0.1"
+ port: 20001
diff --git a/examples/jsonrpc/go-server/profiles/test/log.yml b/examples/jsonrpc/go-server/profiles/test/log.yml
index d2e1d05f3f46bc4ec6c7b8a16211c13d2189219d..baee0b7248484e425f88f35ab128212c931ff85e 100644
--- a/examples/jsonrpc/go-server/profiles/test/log.yml
+++ b/examples/jsonrpc/go-server/profiles/test/log.yml
@@ -22,7 +22,7 @@ encoderConfig:
nameEncoder: ""
outputPaths:
-- "stderr"
+ - "stderr"
errorOutputPaths:
-- "stderr"
+ - "stderr"
initialFields:
diff --git a/examples/jsonrpc/go-server/profiles/test/server.yml b/examples/jsonrpc/go-server/profiles/test/server.yml
index 597c493d932a63497d265ac37d2d0715751d1005..a8ad5746b35804cc0154830fa2d59be249bbc46b 100644
--- a/examples/jsonrpc/go-server/profiles/test/server.yml
+++ b/examples/jsonrpc/go-server/profiles/test/server.yml
@@ -10,41 +10,39 @@ application_config:
environment : "dev"
registries :
-- id: "hangzhouzk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
-
-- id: "shanghaizk"
- type: "zookeeper"
- timeout : "3s"
- address: "127.0.0.1:2182"
- username: ""
- password: ""
+ - id: "hangzhouzk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
+ - id: "shanghaizk"
+ type: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
services:
-- registries:
- - "hangzhouzk"
- - "shanghaizk"
- protocol : "jsonrpc"
- # 鐩稿綋浜巇ubbo.xml涓殑interface
- interface : "com.ikurento.user.UserProvider"
- loadbalance: "random"
- warmup: "100"
- cluster: "failover"
- methods:
- - name: "GetUser"
- retries: 1
+ - registries:
+ - "hangzhouzk"
+ - "shanghaizk"
+ protocol : "jsonrpc"
+ # 鐩稿綋浜巇ubbo.xml涓殑interface
+ interface : "com.ikurento.user.UserProvider"
loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
protocols:
-#- name: "dubbo"
-# ip : "127.0.0.1"
-# port : 20000
-- name: "jsonrpc"
- ip: "127.0.0.1"
- port: 20001
-
+ #- name: "dubbo"
+ # ip : "127.0.0.1"
+ # port : 20000
+ - name: "jsonrpc"
+ ip: "127.0.0.1"
+ port: 20001
diff --git a/filter/filter.go b/filter/filter.go
index 384dbf1a5771ed5ddac2b4863d317616421d45f9..3c45be6d799575d45c3883230e4d146bc6a10693 100644
--- a/filter/filter.go
+++ b/filter/filter.go
@@ -15,7 +15,7 @@
package filter
import (
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/protocol"
)
// Extension - Filter
diff --git a/filter/impl/echo_filter.go b/filter/impl/echo_filter.go
index 22ac6abeef6981c50fcec46ca55a7e6edf47bc08..f9fb1610002972d088bf18546072aae93a72d35a 100644
--- a/filter/impl/echo_filter.go
+++ b/filter/impl/echo_filter.go
@@ -15,17 +15,19 @@
package impl
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/filter"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/filter"
+ "github.com/apache/dubbo-go/protocol"
)
-const ECHO = "echo"
+const (
+ ECHO = "echo"
+)
func init() {
extension.SetFilter(ECHO, GetFilter)
@@ -34,8 +36,7 @@ func init() {
// RPCService need a Echo method in consumer, if you want to use EchoFilter
// eg:
// Echo func(ctx context.Context, arg interface{}, rsp *Xxx) error
-type EchoFilter struct {
-}
+type EchoFilter struct{}
func (ef *EchoFilter) Invoke(invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
logger.Infof("invoking echo filter.")
@@ -45,6 +46,7 @@ func (ef *EchoFilter) Invoke(invoker protocol.Invoker, invocation protocol.Invoc
Rest: invocation.Arguments()[0],
}
}
+
return invoker.Invoke(invocation)
}
diff --git a/filter/impl/echo_filter_test.go b/filter/impl/echo_filter_test.go
index f8774edb8960df9f26e1b41608f408618f4cc343..c33072f66387592e0bafef535d13f55f3453465c 100644
--- a/filter/impl/echo_filter_test.go
+++ b/filter/impl/echo_filter_test.go
@@ -23,9 +23,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
func TestEchoFilter_Invoke(t *testing.T) {
diff --git a/go.mod b/go.mod
index a45f3840b9b3e57e7b773a02ebef3918b052fd7e..f13826387f3c537a1b0e4ea05cb9e9c2231a893d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/dubbo/go-for-apache-dubbo
+module github.com/apache/dubbo-go
require (
github.com/dubbogo/getty v0.0.0-20190523180329-bdf5e640ea53
diff --git a/protocol/dubbo/client.go b/protocol/dubbo/client.go
index ff094eb5aaa1af8d2ffa6a6c210574303e9052f2..05c39582b572a1279995d66f7bec4c18d65c0c04 100644
--- a/protocol/dubbo/client.go
+++ b/protocol/dubbo/client.go
@@ -29,10 +29,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/config"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/config"
)
var (
diff --git a/protocol/dubbo/client_test.go b/protocol/dubbo/client_test.go
index 216d2e10dd2fafb5decb08856ea2258b661004c7..2d0ad8577c7f8898be0b37be521faf06e4e533cc 100644
--- a/protocol/dubbo/client_test.go
+++ b/protocol/dubbo/client_test.go
@@ -28,8 +28,8 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
)
type (
diff --git a/protocol/dubbo/dubbo_exporter.go b/protocol/dubbo/dubbo_exporter.go
index d76ee812f1f21a29d391e404b2d68517f40bd4bc..7f9650cd5c6167aef95bab52919df378f15700d8 100644
--- a/protocol/dubbo/dubbo_exporter.go
+++ b/protocol/dubbo/dubbo_exporter.go
@@ -19,10 +19,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
)
type DubboExporter struct {
diff --git a/protocol/dubbo/dubbo_invoker.go b/protocol/dubbo/dubbo_invoker.go
index 690e4d9b9a476eb832adcedd41f7ddb5ba52939f..bda4ec4db50b07349eefb022088683f447760495 100644
--- a/protocol/dubbo/dubbo_invoker.go
+++ b/protocol/dubbo/dubbo_invoker.go
@@ -24,11 +24,11 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- invocation_impl "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
+ invocation_impl "github.com/apache/dubbo-go/protocol/invocation"
)
var Err_No_Reply = perrors.New("request need @reply")
diff --git a/protocol/dubbo/dubbo_invoker_test.go b/protocol/dubbo/dubbo_invoker_test.go
index 3931279ef5dff9a9ffd450a114a63dbcab223611..92c7885cc0040a42007d3d5ccdd3dd4bed4bb8ce 100644
--- a/protocol/dubbo/dubbo_invoker_test.go
+++ b/protocol/dubbo/dubbo_invoker_test.go
@@ -25,8 +25,8 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
func TestDubboInvoker_Invoke(t *testing.T) {
diff --git a/protocol/dubbo/dubbo_protocol.go b/protocol/dubbo/dubbo_protocol.go
index 512ca099dd8138261e7b50e5cfc07abec273e2d3..024cc4436a02a47f9b91e24e299f029da2babe32 100644
--- a/protocol/dubbo/dubbo_protocol.go
+++ b/protocol/dubbo/dubbo_protocol.go
@@ -15,19 +15,23 @@
package dubbo
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
)
-const DUBBO = "dubbo"
+const (
+ DUBBO = "dubbo"
+)
func init() {
extension.SetProtocol(DUBBO, GetProtocol)
}
-var dubboProtocol *DubboProtocol
+var (
+ dubboProtocol *DubboProtocol
+)
type DubboProtocol struct {
protocol.BaseProtocol
diff --git a/protocol/dubbo/dubbo_protocol_test.go b/protocol/dubbo/dubbo_protocol_test.go
index 9c89667923214248e940b3f98a602a8d4a3e66af..1b1ef5d2afc6529be4e6d29210780cda8f91e0f1 100644
--- a/protocol/dubbo/dubbo_protocol_test.go
+++ b/protocol/dubbo/dubbo_protocol_test.go
@@ -24,8 +24,8 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
)
func TestDubboProtocol_Export(t *testing.T) {
diff --git a/protocol/dubbo/listener.go b/protocol/dubbo/listener.go
index fc56050c12a196753aac606dbbc8a801e7e79040..bcf092e2587862013f81bc6ce1800ba23dbc4a2e 100644
--- a/protocol/dubbo/listener.go
+++ b/protocol/dubbo/listener.go
@@ -28,11 +28,11 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
// todo: WritePkg_Timeout will entry *.yml
diff --git a/protocol/dubbo/pool.go b/protocol/dubbo/pool.go
index 60a65e45fe386a027c6e1556949730cf9ef050f4..92a4d5f2894d93dc9aaa1326d5208879cc844b4c 100644
--- a/protocol/dubbo/pool.go
+++ b/protocol/dubbo/pool.go
@@ -29,7 +29,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
)
type gettyRPCClient struct {
diff --git a/protocol/dubbo/readwriter.go b/protocol/dubbo/readwriter.go
index 87b73aed91d5232975b6f6b1513e3d728c0f2175..d9ea9f8dc5fa2108482539be708df5698df4a1f2 100644
--- a/protocol/dubbo/readwriter.go
+++ b/protocol/dubbo/readwriter.go
@@ -24,9 +24,9 @@ import (
perrors "github.com/pkg/errors"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
)
////////////////////////////////////////////
diff --git a/protocol/dubbo/server.go b/protocol/dubbo/server.go
index f8de070bcc42bf0f81ad2a2e12658f2283bdf210..8feb37e2ce46fda82d2696392a473387210cef21 100644
--- a/protocol/dubbo/server.go
+++ b/protocol/dubbo/server.go
@@ -25,10 +25,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/config"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/config"
+ "github.com/apache/dubbo-go/protocol"
)
var srvConf *ServerConfig
diff --git a/protocol/invocation/rpcinvocation.go b/protocol/invocation/rpcinvocation.go
index 87ab0c67838ba028eab81185eb6d4ccae5679966..0c806238d9109a9777457f23928c0c8ef9785bbd 100644
--- a/protocol/invocation/rpcinvocation.go
+++ b/protocol/invocation/rpcinvocation.go
@@ -19,9 +19,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/protocol"
)
/////////////////////////////
diff --git a/protocol/invoker.go b/protocol/invoker.go
index bedbb10442031fe8b723286f824c03f321623ca1..543cd23fd6a8cbc665d9fe1dde7fd69d473c7d45 100644
--- a/protocol/invoker.go
+++ b/protocol/invoker.go
@@ -15,8 +15,8 @@
package protocol
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/logger"
)
// Extension - Invoker
diff --git a/protocol/jsonrpc/http.go b/protocol/jsonrpc/http.go
index 60257ce027c1434bfd5cc06249f380d3511957dd..9c47c8dd34f030ca36cb66e63da9deea84e7c043 100644
--- a/protocol/jsonrpc/http.go
+++ b/protocol/jsonrpc/http.go
@@ -34,8 +34,8 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
)
//////////////////////////////////////////////
diff --git a/protocol/jsonrpc/http_test.go b/protocol/jsonrpc/http_test.go
index 55f86f454e89bc16f409abfa141508207b749279..713ef7720b29943a639200e445f76222f6a2b013 100644
--- a/protocol/jsonrpc/http_test.go
+++ b/protocol/jsonrpc/http_test.go
@@ -27,9 +27,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/protocol"
)
type (
diff --git a/protocol/jsonrpc/jsonrpc_exporter.go b/protocol/jsonrpc/jsonrpc_exporter.go
index 144437c10402962b3356706b88f1e2701524a97b..e87b598c6b294feb191359c83fd9f5d526a2cdfd 100644
--- a/protocol/jsonrpc/jsonrpc_exporter.go
+++ b/protocol/jsonrpc/jsonrpc_exporter.go
@@ -19,10 +19,10 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
)
type JsonrpcExporter struct {
diff --git a/protocol/jsonrpc/jsonrpc_invoker.go b/protocol/jsonrpc/jsonrpc_invoker.go
index 75ac88085ff396cde95e1ec2a43a7026777569de..05f39d0e4c2dd8b9e653faa5c85b1d1e2ec36cbf 100644
--- a/protocol/jsonrpc/jsonrpc_invoker.go
+++ b/protocol/jsonrpc/jsonrpc_invoker.go
@@ -19,11 +19,11 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- invocation_impl "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
+ invocation_impl "github.com/apache/dubbo-go/protocol/invocation"
)
type JsonrpcInvoker struct {
diff --git a/protocol/jsonrpc/jsonrpc_invoker_test.go b/protocol/jsonrpc/jsonrpc_invoker_test.go
index 2d248469e2bb35edb1708901615c444a0d712dd0..284e587e0dea8b2e83c3dd64b779925cf122ac90 100644
--- a/protocol/jsonrpc/jsonrpc_invoker_test.go
+++ b/protocol/jsonrpc/jsonrpc_invoker_test.go
@@ -25,9 +25,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
func TestJsonrpcInvoker_Invoke(t *testing.T) {
diff --git a/protocol/jsonrpc/jsonrpc_protocol.go b/protocol/jsonrpc/jsonrpc_protocol.go
index 737c9cb175cedaae081abf6a43dfc605fb906d40..12e5e6f925c808871baf2b0f9f4da65be17d19a7 100644
--- a/protocol/jsonrpc/jsonrpc_protocol.go
+++ b/protocol/jsonrpc/jsonrpc_protocol.go
@@ -15,11 +15,11 @@
package jsonrpc
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/config"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/config"
+ "github.com/apache/dubbo-go/protocol"
)
const JSONRPC = "jsonrpc"
diff --git a/protocol/jsonrpc/jsonrpc_protocol_test.go b/protocol/jsonrpc/jsonrpc_protocol_test.go
index 09e43400cdc51431ccd3bcad1389b88f73fac485..3bd33481d9bec54518d42374141384952a7f3435 100644
--- a/protocol/jsonrpc/jsonrpc_protocol_test.go
+++ b/protocol/jsonrpc/jsonrpc_protocol_test.go
@@ -25,9 +25,9 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/config"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/config"
+ "github.com/apache/dubbo-go/protocol"
)
func TestJsonrpcProtocol_Export(t *testing.T) {
diff --git a/protocol/jsonrpc/server.go b/protocol/jsonrpc/server.go
index 1be5c54d239910c7da7b3fd955512e4120fed4da..fbb7c6e6361a907e327863f4dcd05c05610f3e92 100644
--- a/protocol/jsonrpc/server.go
+++ b/protocol/jsonrpc/server.go
@@ -34,11 +34,11 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
)
var (
diff --git a/protocol/protocol.go b/protocol/protocol.go
index 03b2cfbe50c6757a0e86cf4d10385fef97cd8104..e56179603affd8154c4f0a8f0fc0d9408854aa8e 100644
--- a/protocol/protocol.go
+++ b/protocol/protocol.go
@@ -19,8 +19,8 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/logger"
)
// Extension - protocol
diff --git a/protocol/protocolwrapper/mock_protocol_filter.go b/protocol/protocolwrapper/mock_protocol_filter.go
index 902ccefaa974a003b0eaf45c35d65c5c930b81f7..3ee40878c9af3d6c76ea4e1c969dcf074b6c0178 100644
--- a/protocol/protocolwrapper/mock_protocol_filter.go
+++ b/protocol/protocolwrapper/mock_protocol_filter.go
@@ -17,13 +17,13 @@ package protocolwrapper
import (
"sync"
)
+
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
)
-type mockProtocolFilter struct {
-}
+type mockProtocolFilter struct{}
func NewMockProtocolFilter() protocol.Protocol {
return &mockProtocolFilter{}
diff --git a/protocol/protocolwrapper/protocol_filter_wrapper.go b/protocol/protocolwrapper/protocol_filter_wrapper.go
index e7cb227d51215b7a0bfc8e56fde86f1a5bf18777..382d5d34c0f68a1b60b9ba235b2e143a39e0484d 100644
--- a/protocol/protocolwrapper/protocol_filter_wrapper.go
+++ b/protocol/protocolwrapper/protocol_filter_wrapper.go
@@ -15,15 +15,15 @@
package protocolwrapper
import (
- "github.com/dubbo/go-for-apache-dubbo/filter"
+ "github.com/apache/dubbo-go/filter"
"strings"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol"
)
const (
diff --git a/protocol/protocolwrapper/protocol_filter_wrapper_test.go b/protocol/protocolwrapper/protocol_filter_wrapper_test.go
index 49015cdc4b0ce813f7d46d34b3e8ff2a52db80b9..956917a9e2ce63f618a55da3bbf1d5de146e5b31 100644
--- a/protocol/protocolwrapper/protocol_filter_wrapper_test.go
+++ b/protocol/protocolwrapper/protocol_filter_wrapper_test.go
@@ -24,11 +24,11 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/filter/impl"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/filter/impl"
+ "github.com/apache/dubbo-go/protocol"
)
func TestProtocolFilterWrapper_Export(t *testing.T) {
diff --git a/registry/directory/directory.go b/registry/directory/directory.go
index 635e2283b4b003e22fe3e4a4df743d7d57b06dd1..cb9d325e4eceeb94831672ca70b59729ffa1fde9 100644
--- a/registry/directory/directory.go
+++ b/registry/directory/directory.go
@@ -20,25 +20,28 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
perrors "github.com/pkg/errors"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster/directory"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/protocolwrapper"
- "github.com/dubbo/go-for-apache-dubbo/registry"
+ "github.com/apache/dubbo-go/cluster/directory"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/protocolwrapper"
+ "github.com/apache/dubbo-go/registry"
)
-const RegistryConnDelay = 3
+const (
+ RegistryConnDelay = 3
+)
type Options struct {
serviceTTL time.Duration
}
+
type Option func(*Options)
type registryDirectory struct {
diff --git a/registry/directory/directory_test.go b/registry/directory/directory_test.go
index 521bd84f01eba1881528ee4ff91b02ff63412246..5b2d98380266bcf5f83090350bac600623487d9f 100644
--- a/registry/directory/directory_test.go
+++ b/registry/directory/directory_test.go
@@ -21,17 +21,19 @@ import (
"testing"
"time"
)
+
import (
"github.com/stretchr/testify/assert"
)
+
import (
- "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol/invocation"
- "github.com/dubbo/go-for-apache-dubbo/protocol/protocolwrapper"
- "github.com/dubbo/go-for-apache-dubbo/registry"
+ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol/invocation"
+ "github.com/apache/dubbo-go/protocol/protocolwrapper"
+ "github.com/apache/dubbo-go/registry"
)
func TestSubscribe(t *testing.T) {
@@ -48,8 +50,8 @@ func TestSubscribe_Delete(t *testing.T) {
mockRegistry.MockEvent(®istry.ServiceEvent{Action: registry.ServiceDel, Service: *common.NewURLWithOptions("TEST0", common.WithProtocol("dubbo"))})
time.Sleep(1e9)
assert.Len(t, registryDirectory.cacheInvokers, 2)
-
}
+
func TestSubscribe_InvalidUrl(t *testing.T) {
url, _ := common.NewURL(context.TODO(), "mock://127.0.0.1:1111")
mockRegistry, _ := registry.NewMockRegistry(&common.URL{})
diff --git a/registry/event.go b/registry/event.go
index 51a21ac37ce0d2b7fbb82a4d88ad636dfec3ee9d..6a0c9632907ea638abd0e461b05e70498d3a2022 100644
--- a/registry/event.go
+++ b/registry/event.go
@@ -19,8 +19,9 @@ import (
"math/rand"
"time"
)
+
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/apache/dubbo-go/common"
)
func init() {
diff --git a/registry/mock_registry.go b/registry/mock_registry.go
index 16a0942b76918fc7bdd012d35dbb5a435d8d0a95..0136ffc76a033ccacbf4ee5266cc885ccd6f4a43 100644
--- a/registry/mock_registry.go
+++ b/registry/mock_registry.go
@@ -17,8 +17,9 @@ package registry
import (
"go.uber.org/atomic"
)
+
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/apache/dubbo-go/common"
)
type MockRegistry struct {
diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go
index 0c1789ac6593d33289d66d2d63689f95f534c1e4..9f540c13a8c1e0029cb4c6f74a57b711f68c4512 100644
--- a/registry/protocol/protocol.go
+++ b/registry/protocol/protocol.go
@@ -19,20 +19,22 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/protocolwrapper"
- "github.com/dubbo/go-for-apache-dubbo/registry"
- directory2 "github.com/dubbo/go-for-apache-dubbo/registry/directory"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/protocolwrapper"
+ "github.com/apache/dubbo-go/registry"
+ directory2 "github.com/apache/dubbo-go/registry/directory"
)
-var regProtocol *registryProtocol
+var (
+ regProtocol *registryProtocol
+)
type registryProtocol struct {
invokers []protocol.Invoker
diff --git a/registry/protocol/protocol_test.go b/registry/protocol/protocol_test.go
index f1bb2fc5a7e3125933c75e9786cfbffa0c5353fd..8f142cb49e926e70936b95b2e2f9bf0634b70a3e 100644
--- a/registry/protocol/protocol_test.go
+++ b/registry/protocol/protocol_test.go
@@ -18,17 +18,19 @@ import (
"context"
"testing"
)
+
import (
"github.com/stretchr/testify/assert"
)
+
import (
- cluster "github.com/dubbo/go-for-apache-dubbo/cluster/cluster_impl"
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/protocol"
- "github.com/dubbo/go-for-apache-dubbo/protocol/protocolwrapper"
- "github.com/dubbo/go-for-apache-dubbo/registry"
+ cluster "github.com/apache/dubbo-go/cluster/cluster_impl"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/protocolwrapper"
+ "github.com/apache/dubbo-go/registry"
)
func referNormal(t *testing.T, regProtocol *registryProtocol) {
@@ -46,6 +48,7 @@ func referNormal(t *testing.T, regProtocol *registryProtocol) {
assert.IsType(t, &protocol.BaseInvoker{}, invoker)
assert.Equal(t, invoker.GetUrl().String(), url.String())
}
+
func TestRefer(t *testing.T) {
regProtocol := newRegistryProtocol()
referNormal(t, regProtocol)
@@ -85,6 +88,7 @@ func TestOneRegRefer(t *testing.T) {
})
assert.Equal(t, count, 1)
}
+
func exporterNormal(t *testing.T, regProtocol *registryProtocol) {
extension.SetProtocol("registry", GetProtocol)
extension.SetRegistry("mock", registry.NewMockRegistry)
diff --git a/registry/registry.go b/registry/registry.go
index 28ca1a1c19d7e2ffa72797be7bdf221338c19a45..0b5b282a438fb3337901db27468b6d9d2fa789e2 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -15,7 +15,7 @@
package registry
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
+ "github.com/apache/dubbo-go/common"
)
// Extension - Registry
diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go
index b6446e7fcc3dd46515e9e50ad2cdbc323263078e..a6fbaed0868f6b0c40d3b409b977ff8ac3ccf859 100644
--- a/registry/zookeeper/listener.go
+++ b/registry/zookeeper/listener.go
@@ -23,14 +23,14 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
perrors "github.com/pkg/errors"
"github.com/samuel/go-zookeeper/zk"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/registry"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/registry"
)
const (
diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
index 4d553a1658a15416cbcf00c107aeffca11b5031b..46ada0f1ec89211af18f5cceb5c7bb50a0de37ee 100644
--- a/registry/zookeeper/registry.go
+++ b/registry/zookeeper/registry.go
@@ -26,18 +26,18 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
perrors "github.com/pkg/errors"
"github.com/samuel/go-zookeeper/zk"
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
- "github.com/dubbo/go-for-apache-dubbo/common/extension"
- "github.com/dubbo/go-for-apache-dubbo/common/utils"
- "github.com/dubbo/go-for-apache-dubbo/registry"
- "github.com/dubbo/go-for-apache-dubbo/version"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/utils"
+ "github.com/apache/dubbo-go/registry"
+ "github.com/apache/dubbo-go/version"
)
const (
diff --git a/registry/zookeeper/registry_test.go b/registry/zookeeper/registry_test.go
index 3d230bb0a98eef74087f30e1adcf10427433ef7d..185fa1cafa5829169c6e6f31e0fb2ebf0f9fdaf4 100644
--- a/registry/zookeeper/registry_test.go
+++ b/registry/zookeeper/registry_test.go
@@ -20,12 +20,14 @@ import (
"testing"
"time"
)
+
import (
"github.com/stretchr/testify/assert"
)
+
import (
- "github.com/dubbo/go-for-apache-dubbo/common"
- "github.com/dubbo/go-for-apache-dubbo/common/constant"
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
)
func Test_Register(t *testing.T) {
diff --git a/registry/zookeeper/zk_client.go b/registry/zookeeper/zk_client.go
index d11b5f7e5d07573fec2e41fc7eb9d52c51c77d77..4528706838fb79401d61aa4176c143fcfb35f50f 100644
--- a/registry/zookeeper/zk_client.go
+++ b/registry/zookeeper/zk_client.go
@@ -22,7 +22,7 @@ import (
)
import (
- "github.com/dubbo/go-for-apache-dubbo/common/logger"
+ "github.com/apache/dubbo-go/common/logger"
perrors "github.com/pkg/errors"
"github.com/samuel/go-zookeeper/zk"
)
@@ -102,6 +102,7 @@ func newZookeeperClient(name string, zkAddrs []string, timeout time.Duration) (*
return z, nil
}
+
func newMockZookeeperClient(name string, timeout time.Duration) (*zk.TestCluster, *zookeeperClient, <-chan zk.Event, error) {
var (
err error
diff --git a/registry/zookeeper/zk_client_test.go b/registry/zookeeper/zk_client_test.go
index 808b6fcff9d173e406adbc669a8c0b82b41ea3a3..88cde2f3ad534ae0838746b7f9450e138341bdea 100644
--- a/registry/zookeeper/zk_client_test.go
+++ b/registry/zookeeper/zk_client_test.go
@@ -19,6 +19,7 @@ import (
"testing"
"time"
)
+
import (
"github.com/samuel/go-zookeeper/zk"
"github.com/stretchr/testify/assert"
@@ -43,6 +44,7 @@ func verifyEventStateOrder(t *testing.T, c <-chan zk.Event, expectedStates []zk.
}
}
}
+
func verifyEventOrder(t *testing.T, c <-chan zk.Event, expectedEvent []zk.EventType, source string) {
for _, e := range expectedEvent {
for {