From 13f15ea5aff8bc00ff0e036c7e007d142060adf8 Mon Sep 17 00:00:00 2001
From: Joe Zou <yixian.zou@gmail.com>
Date: Wed, 11 Dec 2019 17:19:19 +0800
Subject: [PATCH] fix review problems
---
common/proxy/proxy_factory.go | 3 ++-
common/proxy/proxy_factory/default.go | 7 ++++++-
common/proxy/proxy_factory/default_test.go | 18 +++++++++++++++++-
config/reference_config.go | 9 ++++++---
4 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/common/proxy/proxy_factory.go b/common/proxy/proxy_factory.go
index cd6ef3d1d..116cfe066 100644
--- a/common/proxy/proxy_factory.go
+++ b/common/proxy/proxy_factory.go
@@ -23,7 +23,8 @@ import (
)
type ProxyFactory interface {
- GetProxy(invoker protocol.Invoker, callBack interface{}, url *common.URL) *Proxy
+ GetProxy(invoker protocol.Invoker, url *common.URL) *Proxy
+ GetAsyncProxy(invoker protocol.Invoker, callBack interface{}, url *common.URL) *Proxy
GetInvoker(url common.URL) protocol.Invoker
}
diff --git a/common/proxy/proxy_factory/default.go b/common/proxy/proxy_factory/default.go
index bf87e6380..06824fdc1 100644
--- a/common/proxy/proxy_factory/default.go
+++ b/common/proxy/proxy_factory/default.go
@@ -54,12 +54,17 @@ type DefaultProxyFactory struct {
func NewDefaultProxyFactory(options ...proxy.Option) proxy.ProxyFactory {
return &DefaultProxyFactory{}
}
-func (factory *DefaultProxyFactory) GetProxy(invoker protocol.Invoker, callBack interface{}, url *common.URL) *proxy.Proxy {
+func (factory *DefaultProxyFactory) GetProxy(invoker protocol.Invoker, url *common.URL) *proxy.Proxy {
+ return factory.GetAsyncProxy(invoker, nil, url)
+}
+
+func (factory *DefaultProxyFactory) GetAsyncProxy(invoker protocol.Invoker, callBack interface{}, url *common.URL) *proxy.Proxy {
//create proxy
attachments := map[string]string{}
attachments[constant.ASYNC_KEY] = url.GetParam(constant.ASYNC_KEY, "false")
return proxy.NewProxy(invoker, callBack, attachments)
}
+
func (factory *DefaultProxyFactory) GetInvoker(url common.URL) protocol.Invoker {
return &ProxyInvoker{
BaseInvoker: *protocol.NewBaseInvoker(url),
diff --git a/common/proxy/proxy_factory/default_test.go b/common/proxy/proxy_factory/default_test.go
index cba7757e4..7159b4b00 100644
--- a/common/proxy/proxy_factory/default_test.go
+++ b/common/proxy/proxy_factory/default_test.go
@@ -18,6 +18,7 @@
package proxy_factory
import (
+ "fmt"
"testing"
)
@@ -33,7 +34,22 @@ import (
func Test_GetProxy(t *testing.T) {
proxyFactory := NewDefaultProxyFactory()
url := common.NewURLWithOptions()
- proxy := proxyFactory.GetProxy(protocol.NewBaseInvoker(*url), nil, url)
+ proxy := proxyFactory.GetProxy(protocol.NewBaseInvoker(*url), url)
+ assert.NotNil(t, proxy)
+}
+
+type TestAsync struct {
+}
+
+func (u *TestAsync) CallBack(res common.CallbackResponse) {
+ fmt.Println("CallBack res:", res)
+}
+
+func Test_GetAsyncProxy(t *testing.T) {
+ proxyFactory := NewDefaultProxyFactory()
+ url := common.NewURLWithOptions()
+ async := &TestAsync{}
+ proxy := proxyFactory.GetAsyncProxy(protocol.NewBaseInvoker(*url), async.CallBack, url)
assert.NotNil(t, proxy)
}
diff --git a/config/reference_config.go b/config/reference_config.go
index 1e469d037..eec2c0fcd 100644
--- a/config/reference_config.go
+++ b/config/reference_config.go
@@ -140,10 +140,13 @@ func (refconfig *ReferenceConfig) Refer() {
}
}
- callback := GetCallback(refconfig.id)
-
//create proxy
- refconfig.pxy = extension.GetProxyFactory(consumerConfig.ProxyFactory).GetProxy(refconfig.invoker, callback, url)
+ if refconfig.Async {
+ refconfig.pxy = extension.GetProxyFactory(consumerConfig.ProxyFactory).GetProxy(refconfig.invoker, url)
+ } else {
+ callback := GetCallback(refconfig.id)
+ refconfig.pxy = extension.GetProxyFactory(consumerConfig.ProxyFactory).GetAsyncProxy(refconfig.invoker, callback, url)
+ }
}
// @v is service provider implemented RPCService
--
GitLab