chore: Remove unnecessary return and judgement.

apache · Aug 28, 2020 · e1a0284 · e1a0284
1 parent d0bfafb
commit e1a0284
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 40 deletions.
diff --git a/common/rpc_service.go b/common/rpc_service.go
@@ -24,14 +24,9 @@ import (
 	"sync"
 	"unicode"
 	"unicode/utf8"
-)
 
-import (
-	perrors "github.com/pkg/errors"
-)
-
-import (
 	"github.com/apache/dubbo-go/common/logger"
+	perrors "github.com/pkg/errors"
 )
 
 // RPCService
@@ -271,7 +266,7 @@ func (sm *serviceMap) UnRegister(interfaceName, protocol, serviceId string) erro
 	sm.mutex.Lock()
 	defer sm.mutex.Unlock()
 	sm.interfaceMap[interfaceName] = make([]*Service, 0, len(svrs))
-	for i, _ := range svrs {
+	for i := range svrs {
 		if i != index {
 			sm.interfaceMap[interfaceName] = append(sm.interfaceMap[interfaceName], svrs[i])
 		}

diff --git a/config/base_config.go b/config/base_config.go
@@ -22,15 +22,10 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-)
-
-import (
-	perrors "github.com/pkg/errors"
-)
 
-import (
 	"github.com/apache/dubbo-go/common/config"
 	"github.com/apache/dubbo-go/common/logger"
+	perrors "github.com/pkg/errors"
 )
 
 type multiConfiger interface {
@@ -216,10 +211,8 @@ func setFieldValue(val reflect.Value, id reflect.Value, config *config.InmemoryC
 						prefix := s.MethodByName("Prefix").Call(nil)[0].String()
 						for _, pfx := range strings.Split(prefix, "|") {
 							m := config.GetSubProperty(pfx)
-							if m != nil {
-								for k := range m {
-									f.SetMapIndex(reflect.ValueOf(k), reflect.New(f.Type().Elem().Elem()))
-								}
+							for k := range m {
+								f.SetMapIndex(reflect.ValueOf(k), reflect.New(f.Type().Elem().Elem()))
 							}
 
 						}

diff --git a/config/reference_config.go b/config/reference_config.go
@@ -23,20 +23,16 @@ import (
 	"net/url"
 	"strconv"
 	"time"
-)
 
-import (
 	"github.com/creasty/defaults"
-	gxstrings "github.com/dubbogo/gost/strings"
-)
 
-import (
 	"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/protocol"
+	gxstrings "github.com/dubbogo/gost/strings"
 )
 
 // ReferenceConfig is the configuration of service consumer
@@ -251,5 +247,4 @@ func (c *ReferenceConfig) GenericLoad(id string) {
 	c.id = id
 	c.Refer(genericService)
 	c.Implement(genericService)
-	return
 }
diff --git a/filter/filter_impl/access_log_filter.go b/filter/filter_impl/access_log_filter.go
@@ -23,9 +23,7 @@ import (
 	"reflect"
 	"strings"
 	"time"
-)
 
-import (
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/common/extension"
 	"github.com/apache/dubbo-go/common/logger"

diff --git a/protocol/rest/rest_exporter.go b/protocol/rest/rest_exporter.go
@@ -19,9 +19,7 @@ package rest
 
 import (
 	"sync"
-)
 
-import (
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/common/logger"
@@ -49,5 +47,4 @@ func (re *RestExporter) Unexport() {
 	if err != nil {
 		logger.Errorf("[RestExporter.Unexport] error: %v", err)
 	}
-	return
 }
diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go
@@ -21,23 +21,21 @@ import (
 	"context"
 	"strings"
 	"sync"
-)
-import (
-	gxset "github.com/dubbogo/gost/container/set"
-)
 
-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/common/logger"
 	"github.com/apache/dubbo-go/common/proxy/proxy_factory"
 	"github.com/apache/dubbo-go/config"
 	"github.com/apache/dubbo-go/config_center"
+	gxset "github.com/dubbogo/gost/container/set"
+
 	_ "github.com/apache/dubbo-go/config_center/configurator"
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/protocolwrapper"
 	"github.com/apache/dubbo-go/registry"
+
 	_ "github.com/apache/dubbo-go/registry/directory"
 	"github.com/apache/dubbo-go/remoting"
 )
@@ -103,7 +101,7 @@ func filterHideKey(url *common.URL) *common.URL {
 
 	// be careful params maps in url is map type
 	removeSet := gxset.NewSet()
-	for k, _ := range url.GetParams() {
+	for k := range url.GetParams() {
 		if strings.HasPrefix(k, ".") {
 			removeSet.Add(k)
 		}

diff --git a/remoting/zookeeper/curator_discovery/service_discovery.go b/remoting/zookeeper/curator_discovery/service_discovery.go
@@ -22,18 +22,14 @@ import (
 	"path"
 	"strings"
 	"sync"
-)
 
-import (
 	"github.com/dubbogo/go-zookeeper/zk"
-	perrors "github.com/pkg/errors"
-)
 
-import (
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/common/logger"
 	"github.com/apache/dubbo-go/remoting"
 	"github.com/apache/dubbo-go/remoting/zookeeper"
+	perrors "github.com/pkg/errors"
 )
 
 // Entry contain a service instance
@@ -154,7 +150,6 @@ func (sd *ServiceDiscovery) updateInternalService(name, id string) {
 		return
 	}
 	entry.instance = instance
-	return
 }
 
 // UnregisterService un-register service in zookeeper and delete service in cache