From 814677b85e8e8d1f5e7610ed8103f22726f1c931 Mon Sep 17 00:00:00 2001
From: "xg.gao" <xg.gao@tianrang-inc.com>
Date: Thu, 27 Feb 2020 11:12:46 +0800
Subject: [PATCH] add blank between functions
---
cluster/cluster_impl/base_cluster_invoker.go | 1 +
cluster/cluster_impl/base_cluster_invoker_test.go | 1 +
cluster/cluster_impl/failover_cluster_test.go | 1 +
common/proxy/proxy.go | 1 +
common/url_test.go | 2 ++
config/base_config.go | 3 +++
config/registry_config_test.go | 1 +
config_center/apollo/impl.go | 1 +
config_center/configurator/override.go | 1 +
config_center/configurator/override_test.go | 4 ++--
config_center/parser/configuration_parser.go | 3 +++
config_center/zookeeper/impl.go | 1 +
config_center/zookeeper/impl_test.go | 1 +
filter/filter_impl/auth/consumer_sign.go | 1 +
filter/filter_impl/auth/provider_auth.go | 1 +
filter/filter_impl/generic_filter.go | 3 +++
filter/filter_impl/generic_filter_test.go | 1 +
filter/filter_impl/hystrix_filter_test.go | 1 +
registry/directory/directory_test.go | 2 ++
registry/etcdv3/listener.go | 2 ++
registry/protocol/protocol_test.go | 1 +
registry/zookeeper/registry.go | 1 +
remoting/zookeeper/facade_test.go | 1 +
remoting/zookeeper/listener_test.go | 1 +
24 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go
index 644f67c52..127999941 100644
--- a/cluster/cluster_impl/base_cluster_invoker.go
+++ b/cluster/cluster_impl/base_cluster_invoker.go
@@ -45,6 +45,7 @@ func newBaseClusterInvoker(directory cluster.Directory) baseClusterInvoker {
destroyed: atomic.NewBool(false),
}
}
+
func (invoker *baseClusterInvoker) GetUrl() common.URL {
return invoker.directory.GetUrl()
}
diff --git a/cluster/cluster_impl/base_cluster_invoker_test.go b/cluster/cluster_impl/base_cluster_invoker_test.go
index 49df78c41..d074697b8 100644
--- a/cluster/cluster_impl/base_cluster_invoker_test.go
+++ b/cluster/cluster_impl/base_cluster_invoker_test.go
@@ -47,6 +47,7 @@ func Test_StickyNormal(t *testing.T) {
result1 := base.doSelect(loadbalance.NewRandomLoadBalance(), invocation.NewRPCInvocation("getUser", nil, nil), invokers, invoked)
assert.Equal(t, result, result1)
}
+
func Test_StickyNormalWhenError(t *testing.T) {
invokers := []protocol.Invoker{}
for i := 0; i < 10; i++ {
diff --git a/cluster/cluster_impl/failover_cluster_test.go b/cluster/cluster_impl/failover_cluster_test.go
index 99c584bb5..1be21067a 100644
--- a/cluster/cluster_impl/failover_cluster_test.go
+++ b/cluster/cluster_impl/failover_cluster_test.go
@@ -118,6 +118,7 @@ func normalInvoke(t *testing.T, successCount int, urlParam url.Values, invocatio
}
return clusterInvoker.Invoke(context.Background(), &invocation.RPCInvocation{})
}
+
func Test_FailoverInvokeSuccess(t *testing.T) {
urlParams := url.Values{}
result := normalInvoke(t, 3, urlParams)
diff --git a/common/proxy/proxy.go b/common/proxy/proxy.go
index 9d3f3f882..6765a810a 100644
--- a/common/proxy/proxy.go
+++ b/common/proxy/proxy.go
@@ -59,6 +59,7 @@ func NewProxy(invoke protocol.Invoker, callBack interface{}, attachments map[str
// type XxxProvider struct {
// Yyy func(ctx context.Context, args []interface{}, rsp *Zzz) error
// }
+
func (p *Proxy) Implement(v common.RPCService) {
// check parameters, incoming interface must be a elem's pointer.
diff --git a/common/url_test.go b/common/url_test.go
index 835973065..2372de520 100644
--- a/common/url_test.go
+++ b/common/url_test.go
@@ -164,6 +164,7 @@ func TestURL_GetParamAndDecoded(t *testing.T) {
v, _ := u.GetParamAndDecoded("rule")
assert.Equal(t, rule, v)
}
+
func TestURL_GetRawParam(t *testing.T) {
u, _ := NewURL("condition://0.0.0.0:8080/com.foo.BarService?serialization=fastjson")
u.Username = "test"
@@ -176,6 +177,7 @@ func TestURL_GetRawParam(t *testing.T) {
assert.Equal(t, "/com.foo.BarService", u.GetRawParam("path"))
assert.Equal(t, "fastjson", u.GetRawParam("serialization"))
}
+
func TestURL_ToMap(t *testing.T) {
u, _ := NewURL("condition://0.0.0.0:8080/com.foo.BarService?serialization=fastjson")
u.Username = "test"
diff --git a/config/base_config.go b/config/base_config.go
index 942e966eb..787297c18 100644
--- a/config/base_config.go
+++ b/config/base_config.go
@@ -138,6 +138,7 @@ func getKeyPrefix(val reflect.Value) []string {
return retPrefixs
}
+
func getPtrElement(v reflect.Value) reflect.Value {
if v.Kind() == reflect.Ptr {
v = v.Elem()
@@ -147,6 +148,7 @@ func getPtrElement(v reflect.Value) reflect.Value {
}
return v
}
+
func setFieldValue(val reflect.Value, id reflect.Value, config *config.InmemoryConfiguration) {
for i := 0; i < val.NumField(); i++ {
if key := val.Type().Field(i).Tag.Get("property"); key != "-" && key != "" {
@@ -300,6 +302,7 @@ func setFieldValue(val reflect.Value, id reflect.Value, config *config.InmemoryC
}
}
}
+
func (c *BaseConfig) fresh() {
configList := config.GetEnvInstance().Configuration()
for element := configList.Front(); element != nil; element = element.Next() {
diff --git a/config/registry_config_test.go b/config/registry_config_test.go
index 45d38b29c..6c2fed605 100644
--- a/config/registry_config_test.go
+++ b/config/registry_config_test.go
@@ -46,6 +46,7 @@ func Test_loadRegistries(t *testing.T) {
fmt.Println(urls[0])
assert.Equal(t, "127.0.0.2:2181,128.0.0.1:2181", urls[0].Location)
}
+
func Test_loadRegistries1(t *testing.T) {
target := "shanghai1"
regs := map[string]*RegistryConfig{
diff --git a/config_center/apollo/impl.go b/config_center/apollo/impl.go
index 85dff14a1..4dc198178 100644
--- a/config_center/apollo/impl.go
+++ b/config_center/apollo/impl.go
@@ -163,6 +163,7 @@ func (c *apolloConfiguration) getAddressWithProtocolPrefix(url *common.URL) stri
func (c *apolloConfiguration) Parser() parser.ConfigurationParser {
return c.parser
}
+
func (c *apolloConfiguration) SetParser(p parser.ConfigurationParser) {
c.parser = p
}
diff --git a/config_center/configurator/override.go b/config_center/configurator/override.go
index d0b23ef2f..18415bee3 100644
--- a/config_center/configurator/override.go
+++ b/config_center/configurator/override.go
@@ -36,6 +36,7 @@ import (
func init() {
extension.SetDefaultConfigurator(newConfigurator)
}
+
func newConfigurator(url *common.URL) config_center.Configurator {
return &overrideConfigurator{configuratorUrl: url}
}
diff --git a/config_center/configurator/override_test.go b/config_center/configurator/override_test.go
index 329c598ef..c0aeb1513 100644
--- a/config_center/configurator/override_test.go
+++ b/config_center/configurator/override_test.go
@@ -40,8 +40,8 @@ func Test_configureVerison2p6(t *testing.T) {
assert.NoError(t, err)
configurator.Configure(&providerUrl)
assert.Equal(t, "failfast", providerUrl.GetParam(constant.CLUSTER_KEY, ""))
-
}
+
func Test_configureVerisonOverrideAddr(t *testing.T) {
url, err := common.NewURL("override://0.0.0.0:0/com.xxx.mock.userProvider?group=1&version=1&cluster=failfast&application=BDTService&providerAddresses=127.0.0.2:20001|127.0.0.3:20001")
assert.NoError(t, err)
@@ -52,8 +52,8 @@ func Test_configureVerisonOverrideAddr(t *testing.T) {
assert.NoError(t, err)
configurator.Configure(&providerUrl)
assert.Equal(t, "failover", providerUrl.GetParam(constant.CLUSTER_KEY, ""))
-
}
+
func Test_configureVerison2p6WithIp(t *testing.T) {
url, err := common.NewURL("override://127.0.0.1:20001/com.xxx.mock.userProvider?group=1&version=1&cluster=failfast&application=BDTService")
assert.NoError(t, err)
diff --git a/config_center/parser/configuration_parser.go b/config_center/parser/configuration_parser.go
index 58fcdb49d..f342dc62e 100644
--- a/config_center/parser/configuration_parser.go
+++ b/config_center/parser/configuration_parser.go
@@ -109,6 +109,7 @@ func (parser *DefaultConfigurationParser) ParseToUrls(content string) ([]*common
}
return allUrls, nil
}
+
func serviceItemToUrls(item ConfigItem, config ConfiguratorConfig) ([]*common.URL, error) {
var addresses = item.Addresses
if len(addresses) == 0 {
@@ -154,6 +155,7 @@ func serviceItemToUrls(item ConfigItem, config ConfiguratorConfig) ([]*common.UR
}
return urls, nil
}
+
func appItemToUrls(item ConfigItem, config ConfiguratorConfig) ([]*common.URL, error) {
var addresses = item.Addresses
if len(addresses) == 0 {
@@ -246,6 +248,7 @@ func getParamString(item ConfigItem) (string, error) {
return retStr, nil
}
+
func getEnabledString(item ConfigItem, config ConfiguratorConfig) string {
retStr := "&enabled="
if len(item.Type) == 0 || item.Type == GeneralType {
diff --git a/config_center/zookeeper/impl.go b/config_center/zookeeper/impl.go
index 70fb196a1..404243d47 100644
--- a/config_center/zookeeper/impl.go
+++ b/config_center/zookeeper/impl.go
@@ -155,6 +155,7 @@ func (c *zookeeperDynamicConfiguration) GetRule(key string, opts ...config_cente
func (c *zookeeperDynamicConfiguration) Parser() parser.ConfigurationParser {
return c.parser
}
+
func (c *zookeeperDynamicConfiguration) SetParser(p parser.ConfigurationParser) {
c.parser = p
}
diff --git a/config_center/zookeeper/impl_test.go b/config_center/zookeeper/impl_test.go
index 1d62f3df8..22e15193c 100644
--- a/config_center/zookeeper/impl_test.go
+++ b/config_center/zookeeper/impl_test.go
@@ -77,6 +77,7 @@ func initZkData(group string, t *testing.T) (*zk.TestCluster, *zookeeperDynamicC
return ts, reg
}
+
func Test_GetConfig(t *testing.T) {
ts, reg := initZkData("dubbo", t)
defer ts.Stop()
diff --git a/filter/filter_impl/auth/consumer_sign.go b/filter/filter_impl/auth/consumer_sign.go
index 4280a4919..062744771 100644
--- a/filter/filter_impl/auth/consumer_sign.go
+++ b/filter/filter_impl/auth/consumer_sign.go
@@ -55,6 +55,7 @@ func (csf *ConsumerSignFilter) Invoke(ctx context.Context, invoker protocol.Invo
func (csf *ConsumerSignFilter) OnResponse(ctx context.Context, result protocol.Result, invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
return result
}
+
func getConsumerSignFilter() filter.Filter {
return &ConsumerSignFilter{}
}
diff --git a/filter/filter_impl/auth/provider_auth.go b/filter/filter_impl/auth/provider_auth.go
index fc88e2947..0d5772e55 100644
--- a/filter/filter_impl/auth/provider_auth.go
+++ b/filter/filter_impl/auth/provider_auth.go
@@ -58,6 +58,7 @@ func (paf *ProviderAuthFilter) Invoke(ctx context.Context, invoker protocol.Invo
func (paf *ProviderAuthFilter) OnResponse(ctx context.Context, result protocol.Result, invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
return result
}
+
func getProviderAuthFilter() filter.Filter {
return &ProviderAuthFilter{}
}
diff --git a/filter/filter_impl/generic_filter.go b/filter/filter_impl/generic_filter.go
index e8ff2679b..9bc131ef8 100644
--- a/filter/filter_impl/generic_filter.go
+++ b/filter/filter_impl/generic_filter.go
@@ -83,6 +83,7 @@ func (ef *GenericFilter) OnResponse(_ context.Context, result protocol.Result, _
func GetGenericFilter() filter.Filter {
return &GenericFilter{}
}
+
func struct2MapAll(obj interface{}) interface{} {
if obj == nil {
return obj
@@ -127,6 +128,7 @@ func struct2MapAll(obj interface{}) interface{} {
return obj
}
}
+
func setInMap(m map[string]interface{}, structField reflect.StructField, value interface{}) (result map[string]interface{}) {
result = m
if tagName := structField.Tag.Get("m"); tagName == "" {
@@ -136,6 +138,7 @@ func setInMap(m map[string]interface{}, structField reflect.StructField, value i
}
return
}
+
func headerAtoa(a string) (b string) {
b = strings.ToLower(a[:1]) + a[1:]
return
diff --git a/filter/filter_impl/generic_filter_test.go b/filter/filter_impl/generic_filter_test.go
index 22948353f..b08229199 100644
--- a/filter/filter_impl/generic_filter_test.go
+++ b/filter/filter_impl/generic_filter_test.go
@@ -88,6 +88,7 @@ func Test_struct2MapAll_Slice(t *testing.T) {
assert.Equal(t, reflect.Slice, reflect.TypeOf(m["caCa"]).Kind())
assert.Equal(t, reflect.Map, reflect.TypeOf(m["caCa"].([]interface{})[0].(map[string]interface{})["xxYy"]).Kind())
}
+
func Test_struct2MapAll_Map(t *testing.T) {
var testData struct {
AaAa string
diff --git a/filter/filter_impl/hystrix_filter_test.go b/filter/filter_impl/hystrix_filter_test.go
index 66c17d920..71fc097c8 100644
--- a/filter/filter_impl/hystrix_filter_test.go
+++ b/filter/filter_impl/hystrix_filter_test.go
@@ -213,6 +213,7 @@ func TestGetHystrixFilterConsumer(t *testing.T) {
assert.NotNil(t, get)
assert.True(t, get.(*HystrixFilter).COrP)
}
+
func TestGetHystrixFilterProvider(t *testing.T) {
get := GetHystrixFilterProvider()
assert.NotNil(t, get)
diff --git a/registry/directory/directory_test.go b/registry/directory/directory_test.go
index 8ebd130d7..69ef9cbec 100644
--- a/registry/directory/directory_test.go
+++ b/registry/directory/directory_test.go
@@ -43,6 +43,7 @@ import (
func init() {
config.SetConsumerConfig(config.ConsumerConfig{ApplicationConfig: &config.ApplicationConfig{Name: "test-application"}})
}
+
func TestSubscribe(t *testing.T) {
registryDirectory, _ := normalRegistryDir()
@@ -121,6 +122,7 @@ func Test_List(t *testing.T) {
assert.Equal(t, true, registryDirectory.IsAvailable())
}
+
func Test_MergeProviderUrl(t *testing.T) {
registryDirectory, mockRegistry := normalRegistryDir(true)
providerUrl, _ := common.NewURL("dubbo://0.0.0.0:20000/org.apache.dubbo-go.mockService",
diff --git a/registry/etcdv3/listener.go b/registry/etcdv3/listener.go
index 79e3ad514..f9b046a2c 100644
--- a/registry/etcdv3/listener.go
+++ b/registry/etcdv3/listener.go
@@ -83,6 +83,7 @@ func NewConfigurationListener(reg *etcdV3Registry) *configurationListener {
reg.WaitGroup().Add(1)
return &configurationListener{registry: reg, events: make(chan *config_center.ConfigChangeEvent, 32)}
}
+
func (l *configurationListener) Process(configType *config_center.ConfigChangeEvent) {
l.events <- configType
}
@@ -108,6 +109,7 @@ func (l *configurationListener) Next() (*registry.ServiceEvent, error) {
}
}
}
+
func (l *configurationListener) Close() {
l.registry.WaitGroup().Done()
}
diff --git a/registry/protocol/protocol_test.go b/registry/protocol/protocol_test.go
index de57a0afa..cee2a6a62 100644
--- a/registry/protocol/protocol_test.go
+++ b/registry/protocol/protocol_test.go
@@ -44,6 +44,7 @@ import (
func init() {
config.SetProviderConfig(config.ProviderConfig{ApplicationConfig: &config.ApplicationConfig{Name: "test-application"}})
}
+
func referNormal(t *testing.T, regProtocol *registryProtocol) {
extension.SetProtocol("registry", GetProtocol)
extension.SetRegistry("mock", registry.NewMockRegistry)
diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
index f4e53dcc4..e13443d57 100644
--- a/registry/zookeeper/registry.go
+++ b/registry/zookeeper/registry.go
@@ -141,6 +141,7 @@ func (r *zkRegistry) CloseAndNilClient() {
r.client.Close()
r.client = nil
}
+
func (r *zkRegistry) ZkClient() *zookeeper.ZookeeperClient {
return r.client
}
diff --git a/remoting/zookeeper/facade_test.go b/remoting/zookeeper/facade_test.go
index 97ea77565..a41f6cd32 100644
--- a/remoting/zookeeper/facade_test.go
+++ b/remoting/zookeeper/facade_test.go
@@ -70,6 +70,7 @@ func (r *mockFacade) Destroy() {
func (r *mockFacade) RestartCallBack() bool {
return true
}
+
func (r *mockFacade) IsAvailable() bool {
return true
}
diff --git a/remoting/zookeeper/listener_test.go b/remoting/zookeeper/listener_test.go
index 43e9aca3f..7301cd52c 100644
--- a/remoting/zookeeper/listener_test.go
+++ b/remoting/zookeeper/listener_test.go
@@ -66,6 +66,7 @@ func initZkData(t *testing.T) (*zk.TestCluster, *ZookeeperClient, <-chan zk.Even
return ts, client, event
}
+
func TestListener(t *testing.T) {
changedData := `
dubbo.consumer.request_timeout=3s
--
GitLab