Skip to content
Snippets Groups Projects
Commit 02a802b6 authored by AlexStocks's avatar AlexStocks
Browse files

fix golint errors

parent e8bdf8a8
No related branches found
No related tags found
No related merge requests found
......@@ -39,6 +39,6 @@ func NewAvailableCluster() cluster.Cluster {
}
// Join returns a baseClusterInvoker instance
func (cluser *availableCluster) Join(directory cluster.Directory) protocol.Invoker {
func (cluster *availableCluster) Join(directory cluster.Directory) protocol.Invoker {
return NewAvailableClusterInvoker(directory)
}
......@@ -81,7 +81,7 @@ const (
const (
SIMPLE_METADATA_SERVICE_NAME = "MetadataService"
DEFAULT_REVIESION = "N/A"
DEFAULT_REVISION = "N/A"
)
const (
......
......@@ -19,9 +19,9 @@ package constant
const (
// Version apache/dubbo-go version
Version = "1.3.0"
Version = "1.5.5"
// Name module name
Name = "dubbogo"
// Date release date
DATE = "2020/01/12"
DATE = "2021/01/05"
)
......@@ -131,10 +131,10 @@ func TestProxyImplementForContext(t *testing.T) {
p := NewProxy(invoker, nil, map[string]string{constant.ASYNC_KEY: "false"})
s := &TestService{}
p.Implement(s)
attahments1 := make(map[string]interface{}, 4)
attahments1["k1"] = "v1"
attahments1["k2"] = "v2"
context := context.WithValue(context.Background(), constant.AttachmentKey, attahments1)
attachments1 := make(map[string]interface{}, 4)
attachments1["k1"] = "v1"
attachments1["k2"] = "v2"
context := context.WithValue(context.Background(), constant.AttachmentKey, attachments1)
r, err := p.Get().(*TestService).MethodSix(context, "xxx")
v1 := r.(map[string]interface{})
assert.NoError(t, err)
......
......@@ -37,7 +37,7 @@ const (
failover = "failover"
)
func TestConfigureVerison2p6(t *testing.T) {
func TestConfigureVersion2p6(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")
assert.NoError(t, err)
configurator := extension.GetConfigurator(defaults, url)
......@@ -49,7 +49,7 @@ func TestConfigureVerison2p6(t *testing.T) {
assert.Equal(t, failfast, providerUrl.GetParam(constant.CLUSTER_KEY, ""))
}
func TestConfigureVerisonOverrideAddr(t *testing.T) {
func TestConfigureVersionOverrideAddr(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)
configurator := extension.GetConfigurator(defaults, url)
......@@ -61,7 +61,7 @@ func TestConfigureVerisonOverrideAddr(t *testing.T) {
assert.Equal(t, failover, providerUrl.GetParam(constant.CLUSTER_KEY, ""))
}
func TestConfigureVerison2p6WithIp(t *testing.T) {
func TestConfigureVersion2p6WithIp(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)
configurator := extension.GetConfigurator(defaults, url)
......@@ -74,7 +74,7 @@ func TestConfigureVerison2p6WithIp(t *testing.T) {
}
func TestConfigureVerison2p7(t *testing.T) {
func TestConfigureVersion2p7(t *testing.T) {
url, err := common.NewURL("jsonrpc://0.0.0.0:20001/com.xxx.mock.userProvider?group=1&version=1&cluster=failfast&application=BDTService&configVersion=1.0&side=provider")
assert.NoError(t, err)
configurator := extension.GetConfigurator(defaults, url)
......
......@@ -22,7 +22,6 @@ import (
"testing"
)
import (
"github.com/apache/dubbo-go/filter"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
)
......@@ -31,6 +30,7 @@ import (
"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"
"github.com/apache/dubbo-go/protocol/invocation"
)
......
......@@ -52,7 +52,6 @@ require (
replace (
github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.8.0
github.com/shirou/gopsutil => github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880
launchpad.net/gocheck => github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a
)
go 1.13
This diff is collapsed.
......@@ -135,7 +135,7 @@ func (m metadataServiceProxy) Version() (string, error) {
func newMetadataServiceProxy(ins registry.ServiceInstance) service.MetadataService {
revision := ins.GetMetadata()[constant.EXPORTED_SERVICES_REVISION_PROPERTY_NAME]
if len(revision) == 0 {
revision = constant.DEFAULT_REVIESION
revision = constant.DEFAULT_REVISION
}
return &metadataServiceProxy{
......
......@@ -93,15 +93,15 @@ type Client struct {
func NewClient(url *common.URL) *Client {
// if global trace instance was set , it means trace function enabled. If not , will return Nooptracer
tracer := opentracing.GlobalTracer()
dailOpts := make([]grpc.DialOption, 0, 4)
dialOpts := make([]grpc.DialOption, 0, 4)
maxMessageSize, _ := strconv.Atoi(url.GetParam(constant.MESSAGE_SIZE_KEY, "4"))
dailOpts = append(dailOpts, grpc.WithInsecure(), grpc.WithBlock(), grpc.WithUnaryInterceptor(
dialOpts = append(dialOpts, grpc.WithInsecure(), grpc.WithBlock(), grpc.WithUnaryInterceptor(
otgrpc.OpenTracingClientInterceptor(tracer, otgrpc.LogPayloads())),
grpc.WithDefaultCallOptions(
grpc.CallContentSubtype(clientConf.ContentSubType),
grpc.MaxCallRecvMsgSize(1024*1024*maxMessageSize),
grpc.MaxCallSendMsgSize(1024*1024*maxMessageSize)))
conn, err := grpc.Dial(url.Location, dailOpts...)
conn, err := grpc.Dial(url.Location, dialOpts...)
if err != nil {
panic(err)
}
......
......@@ -75,6 +75,6 @@ func Test_newEtcdV3ServiceDiscovery(t *testing.T) {
func TestEtcdV3ServiceDiscovery_GetDefaultPageSize(t *testing.T) {
setUp()
serviceDiscovry := &etcdV3ServiceDiscovery{}
assert.Equal(t, registry.DefaultPageSize, serviceDiscovry.GetDefaultPageSize())
serviceDiscovery := &etcdV3ServiceDiscovery{}
assert.Equal(t, registry.DefaultPageSize, serviceDiscovery.GetDefaultPageSize())
}
......@@ -162,8 +162,8 @@ func TestNacosServiceDiscovery_CRUD(t *testing.T) {
func TestNacosServiceDiscovery_GetDefaultPageSize(t *testing.T) {
prepareData()
serviceDiscovry, _ := extension.GetServiceDiscovery(constant.NACOS_KEY, testName)
assert.Equal(t, registry.DefaultPageSize, serviceDiscovry.GetDefaultPageSize())
serviceDiscovery, _ := extension.GetServiceDiscovery(constant.NACOS_KEY, testName)
assert.Equal(t, registry.DefaultPageSize, serviceDiscovery.GetDefaultPageSize())
}
func prepareData() {
......
......@@ -129,7 +129,7 @@ type AsyncCallbackResponse struct {
Reply interface{}
}
// the client sends requst to server, there is one pendingResponse at client side to wait the response from server
// the client sends request to server, there is one pendingResponse at client side to wait the response from server
type PendingResponse struct {
seq int64
Err error
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment