Merge branch 'develop' into develop

config_center/zookeeper/impl_test.go

@@ -100,9 +100,8 @@ func initZkData(group string, t *testing.T) (*zk.TestCluster, *zookeeperDynamicC
 func TestGetConfig(t *testing.T) {
 	ts, reg := initZkData("dubbo", t)
 	defer func() {
-		if err := ts.Stop(); err != nil {
-			t.Errorf("ts.Stop() = error: %v", err)
-		}
+		err := ts.Stop()
+		assert.NoError(t, err)
 	}()
 	configs, err := reg.GetProperties(dubboPropertyFileName, config_center.WithGroup("dubbo"))
 	assert.NoError(t, err)

protocol/dubbo/hessian2/hessian_request.go

@@ -220,34 +220,29 @@ func packRequest(service Service, header DubboHeader, req interface{}) ([]byte,
 	// body
 	//////////////////////////////////////////
 	if hb {
-		if err := encoder.Encode(nil); err != nil {
-			logger.Warnf("Encode(nil) = error: %v", err)
-		}
+		_ = encoder.Encode(nil)
 		goto END
 	}
 
 	// dubbo version + path + version + method
-	if err := encoder.Encode(DEFAULT_DUBBO_PROTOCOL_VERSION); err != nil {
+	if err = encoder.Encode(DEFAULT_DUBBO_PROTOCOL_VERSION); err != nil {
 		logger.Warnf("Encode(DEFAULT_DUBBO_PROTOCOL_VERSION) = error: %v", err)
 	}
-	if err := encoder.Encode(service.Path); err != nil {
+	if err = encoder.Encode(service.Path); err != nil {
 		logger.Warnf("Encode(service.Path) = error: %v", err)
 	}
-	if err := encoder.Encode(service.Version); err != nil {
+	if err = encoder.Encode(service.Version); err != nil {
 		logger.Warnf("Encode(service.Version) = error: %v", err)
 	}
-	if err := encoder.Encode(service.Method); err != nil {
+	if err = encoder.Encode(service.Method); err != nil {
 		logger.Warnf("Encode(service.Method) = error: %v", err)
 	}
 
 	// args = args type list + args value list
 	if types, err = getArgsTypeList(args); err != nil {
 		return nil, perrors.Wrapf(err, " PackRequest(args:%+v)", args)
 	}
-	if err := encoder.Encode(types); err != nil {
-		logger.Warnf("Encode(types:%v) = error: %v", types, err)
-	}
-
+	_ = encoder.Encode(types)
 	for _, v := range args {
 		_ = encoder.Encode(v)
 	}

registry/file/service_discovery_test.go

@@ -44,7 +44,7 @@ func TestNewFileSystemServiceDiscoveryAndDestroy(t *testing.T) {
 	serviceDiscovery, err := newFileSystemServiceDiscovery(testName)
 	assert.NoError(t, err)
 	assert.NotNil(t, serviceDiscovery)
-	defer func () {
+	defer func() {
 		err = serviceDiscovery.Destroy()
 		assert.Nil(t, err)
 	}()
@@ -82,7 +82,7 @@ func TestCURDFileSystemServiceDiscovery(t *testing.T) {
 
 	err = serviceDiscovery.Register(r1)
 	assert.NoError(t, err)
-	defer func () {
+	defer func() {
 		err = serviceDiscovery.Destroy()
 		assert.NoError(t, err)
 	}()

remoting/zookeeper/client_test.go

@@ -96,7 +96,7 @@ func TestCreate(t *testing.T) {
 	ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
 	assert.NoError(t, err)
 	defer func() {
-		err := ts.Stop()
+		_ = ts.Stop()
 		assert.Nil(t, err)
 	}()
 	err = z.Create("test1/test2/test3/test4")
@@ -110,7 +110,7 @@ func TestCreateDelete(t *testing.T) {
 	ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
 	assert.NoError(t, err)
 	defer func() {
-		err := ts.Stop()
+		_ = ts.Stop()
 		assert.Nil(t, err)
 	}()
 
@@ -127,7 +127,7 @@ func TestRegisterTemp(t *testing.T) {
 	ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
 	assert.NoError(t, err)
 	defer func() {
-		err := ts.Stop()
+		_ = ts.Stop()
 		assert.Nil(t, err)
 	}()
 	err = z.Create("/test1/test2/test3")
@@ -144,7 +144,7 @@ func TestRegisterTempSeq(t *testing.T) {
 	ts, z, event, err := NewMockZookeeperClient("test", 15*time.Second)
 	assert.NoError(t, err)
 	defer func() {
-		err := ts.Stop()
+		_ = ts.Stop()
 		assert.Nil(t, err)
 	}()
 	err = z.Create("/test1/test2/test3")

remoting/zookeeper/listener_test.go

@@ -95,7 +95,7 @@ func TestListener(t *testing.T) {
 `
 	var wait sync.WaitGroup
 	ts, client, event := initZkData(t)
-	defer func () {
+	defer func() {
 		if err := ts.Stop(); err != nil {
 			t.Errorf("ts.Stop() = error: %v", err)
 		}