diff --git a/config/config_loader.go b/config/config_loader.go index 6bf72680acd1dd93a538f70ec5d3970ff9f30f74..5054ee3b280ebc6cb127833235e3bc96bb2561ee 100644 --- a/config/config_loader.go +++ b/config/config_loader.go @@ -19,16 +19,19 @@ package config import ( "fmt" - "github.com/apache/dubbo-go/common/extension" - perrors "github.com/pkg/errors" "log" "os" "time" ) +import ( + perrors "github.com/pkg/errors" +) + 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" ) diff --git a/protocol/rest/config/reader/rest_config_reader.go b/protocol/rest/config/reader/rest_config_reader.go index 0691096bf9d9dfb6d2f679e68a1c10284ccc5ae9..a3f90f9a964457784ebdcb80e36b8192234f4559 100644 --- a/protocol/rest/config/reader/rest_config_reader.go +++ b/protocol/rest/config/reader/rest_config_reader.go @@ -19,7 +19,6 @@ package reader import ( "bytes" - "github.com/apache/dubbo-go/protocol/rest/config" "strconv" "strings" ) @@ -34,6 +33,7 @@ import ( "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/common/logger" "github.com/apache/dubbo-go/config/interfaces" + "github.com/apache/dubbo-go/protocol/rest/config" ) const REST = "rest" diff --git a/protocol/rest/config/reader/rest_config_reader_test.go b/protocol/rest/config/reader/rest_config_reader_test.go index a4e09d2d9c434a1c5f3c8b222433a522183f78bd..d2dba40b9b85a6cd7772e0fee619720c79e91eb4 100644 --- a/protocol/rest/config/reader/rest_config_reader_test.go +++ b/protocol/rest/config/reader/rest_config_reader_test.go @@ -19,8 +19,6 @@ package reader import ( "bytes" - "github.com/apache/dubbo-go/common/yaml" - "github.com/apache/dubbo-go/protocol/rest/config" "testing" ) @@ -28,6 +26,11 @@ import ( "github.com/stretchr/testify/assert" ) +import ( + "github.com/apache/dubbo-go/common/yaml" + "github.com/apache/dubbo-go/protocol/rest/config" +) + func TestRestConfigReader_ReadConsumerConfig(t *testing.T) { bs, err := yaml.LoadYMLConfig("./testdata/consumer_config.yml") assert.NoError(t, err) diff --git a/protocol/rest/server/server_impl/go_restful_server.go b/protocol/rest/server/server_impl/go_restful_server.go index 51f64e1293e609bf65dd70f65af330c18e6622eb..3ea25531d62f5bd5fdb3b4be3e0fd3892b6b6b54 100644 --- a/protocol/rest/server/server_impl/go_restful_server.go +++ b/protocol/rest/server/server_impl/go_restful_server.go @@ -20,8 +20,6 @@ package server_impl import ( "context" "fmt" - "github.com/apache/dubbo-go/protocol/rest/config" - "github.com/apache/dubbo-go/protocol/rest/server" "net" "net/http" "reflect" @@ -42,6 +40,8 @@ import ( "github.com/apache/dubbo-go/common/logger" "github.com/apache/dubbo-go/protocol" "github.com/apache/dubbo-go/protocol/invocation" + "github.com/apache/dubbo-go/protocol/rest/config" + "github.com/apache/dubbo-go/protocol/rest/server" ) func init() {