From 16ca2a25a96f5b0191d33126a8515558235c9182 Mon Sep 17 00:00:00 2001 From: Ming Deng <mindeng@ebay.com> Date: Mon, 28 Oct 2019 12:25:47 +0800 Subject: [PATCH] Fix Reveiw --- filter/common/impl/rejected_execution_handler_only_log.go | 5 ++--- filter/impl/tps_limit_filter_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/filter/common/impl/rejected_execution_handler_only_log.go b/filter/common/impl/rejected_execution_handler_only_log.go index 714133b91..8943433af 100644 --- a/filter/common/impl/rejected_execution_handler_only_log.go +++ b/filter/common/impl/rejected_execution_handler_only_log.go @@ -19,8 +19,6 @@ package impl import ( "sync" - - common2 "github.com/apache/dubbo-go/filter/common" ) import ( @@ -28,6 +26,7 @@ import ( "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/common/logger" + filterCommon "github.com/apache/dubbo-go/filter/common" "github.com/apache/dubbo-go/protocol" ) @@ -62,7 +61,7 @@ func (handler *OnlyLogRejectedExecutionHandler) RejectedExecution(url common.URL return &protocol.RPCResult{} } -func GetOnlyLogRejectedExecutionHandler() common2.RejectedExecutionHandler { +func GetOnlyLogRejectedExecutionHandler() filterCommon.RejectedExecutionHandler { onlyLogHandlerOnce.Do(func() { onlyLogHandlerInstance = &OnlyLogRejectedExecutionHandler{} }) diff --git a/filter/impl/tps_limit_filter_test.go b/filter/impl/tps_limit_filter_test.go index 7d625ac93..debdbd00d 100644 --- a/filter/impl/tps_limit_filter_test.go +++ b/filter/impl/tps_limit_filter_test.go @@ -31,8 +31,8 @@ import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/common/extension" - common2 "github.com/apache/dubbo-go/filter/common" - impl2 "github.com/apache/dubbo-go/filter/common/impl" + filterCommon "github.com/apache/dubbo-go/filter/common" + filterCommonImpl "github.com/apache/dubbo-go/filter/common/impl" "github.com/apache/dubbo-go/filter/impl/tps" "github.com/apache/dubbo-go/filter/impl/tps/impl" "github.com/apache/dubbo-go/protocol" @@ -84,10 +84,10 @@ func TestGenericFilter_Invoke_With_Default_TpsLimiter_Not_Allow(t *testing.T) { }) mockResult := &protocol.RPCResult{} - mockRejectedHandler := impl2.NewMockRejectedExecutionHandler(ctrl) + mockRejectedHandler := filterCommonImpl.NewMockRejectedExecutionHandler(ctrl) mockRejectedHandler.EXPECT().RejectedExecution(gomock.Any(), gomock.Any()).Return(mockResult).Times(1) - extension.SetRejectedExecutionHandler(constant.DEFAULT_KEY, func() common2.RejectedExecutionHandler { + extension.SetRejectedExecutionHandler(constant.DEFAULT_KEY, func() filterCommon.RejectedExecutionHandler { return mockRejectedHandler }) -- GitLab