diff --git a/common/observer/dispatcher/direct_event_dispatcher.go b/common/observer/dispatcher/direct_event_dispatcher.go index ac918dd709957f1053b6486bd9eaa6cc5c543703..f255bd6c36051ad1b8151dae12dd4af416badbf6 100644 --- a/common/observer/dispatcher/direct_event_dispatcher.go +++ b/common/observer/dispatcher/direct_event_dispatcher.go @@ -17,10 +17,13 @@ package dispatcher +import ( + "reflect" +) + import ( "github.com/apache/dubbo-go/common/logger" "github.com/apache/dubbo-go/common/observer" - "reflect" ) func init() { diff --git a/common/observer/event/ServiceInstancesChangedEvent.go b/common/observer/event/ServiceInstancesChangedEvent.go index d85a6d573735742004df6d0f73008b364791460e..e86c8ddf8920fc6491e65835ab7c4776ae372d15 100644 --- a/common/observer/event/ServiceInstancesChangedEvent.go +++ b/common/observer/event/ServiceInstancesChangedEvent.go @@ -19,6 +19,9 @@ package event import ( "fmt" +) + +import ( "github.com/apache/dubbo-go/common/observer" ) diff --git a/common/observer/event_dispatcher.go b/common/observer/event_dispatcher.go index bbb90040520126fb052dc9a09b6a594fe6bce851..259e32b32e64e446bc5acc256b075b4d183d2038 100644 --- a/common/observer/event_dispatcher.go +++ b/common/observer/event_dispatcher.go @@ -17,7 +17,9 @@ package observer -import "github.com/prometheus/common/log" +import ( + "github.com/apache/dubbo-go/common/logger" +) var globalEventDispatcher EventDispatcher @@ -45,7 +47,7 @@ func SetAndInitGlobalDispatcher(name string) { name = "direct" } if globalEventDispatcher != nil { - log.Warnf("EventDispatcher already init. It will be replaced") + logger.Warnf("EventDispatcher already init. It will be replaced") } if dispatchers[name] == nil { panic("EventDispatcher for " + name + " is not existing, make sure you have import the package.") @@ -54,7 +56,7 @@ func SetAndInitGlobalDispatcher(name string) { globalEventDispatcher.AddEventListeners(eventListeners) } -// GetGlobalDispatcher by name +// GetGlobalDispatcher func GetGlobalDispatcher() EventDispatcher { return globalEventDispatcher } diff --git a/common/observer/event_listener.go b/common/observer/event_listener.go index 15a74b61575f9b7a4df13cb91b2eee3320c1e55a..f92f9d2c7de78a73ba55a88d12e2139c1939c4fb 100644 --- a/common/observer/event_listener.go +++ b/common/observer/event_listener.go @@ -18,10 +18,13 @@ package observer import ( - gxsort "github.com/dubbogo/gost/sort" "reflect" ) +import ( + gxsort "github.com/dubbogo/gost/sort" +) + // All eventListeners var eventListeners []EventListener diff --git a/common/observer/listenable_test.go b/common/observer/listenable_test.go index fa006db1b44a5ab8aa1ab5cc578e6e03332b7279..df46bfc2ba47f6e447074b44208a809949f7ae3d 100644 --- a/common/observer/listenable_test.go +++ b/common/observer/listenable_test.go @@ -18,11 +18,14 @@ package observer import ( - "github.com/stretchr/testify/assert" "reflect" "testing" ) +import ( + "github.com/stretchr/testify/assert" +) + func TestListenable(t *testing.T) { el := &TestEventListener{} b := &BaseListenable{} diff --git a/registry/listener/ServiceInstancesChangedListener.go b/registry/listener/ServiceInstancesChangedListener.go index 225c8febe7a0251103c844e4ff84caa26840deb9..3e3a5283de8fbe9d8c5d2ca41d2a79fba40190ec 100644 --- a/registry/listener/ServiceInstancesChangedListener.go +++ b/registry/listener/ServiceInstancesChangedListener.go @@ -17,10 +17,13 @@ package listener +import ( + "reflect" +) + import ( "github.com/apache/dubbo-go/common/observer" "github.com/apache/dubbo-go/common/observer/event" - "reflect" ) func init() {