diff --git a/cluster/router/condition_router.go b/cluster/router/condition_router.go index 45959a60f8004349aa0dd699aa261d6be0afca31..b9632e29119691009bf59fb7cc5af24ea33dd120 100644 --- a/cluster/router/condition_router.go +++ b/cluster/router/condition_router.go @@ -23,19 +23,19 @@ import ( "strings" ) +import ( + "github.com/dubbogo/gost/container" + 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/logger" "github.com/apache/dubbo-go/common/utils" - "github.com/apache/dubbo-go/gostd/container" "github.com/apache/dubbo-go/protocol" ) -import ( - perrors "github.com/pkg/errors" -) - const ( ROUTE_PATTERN = `([&!=,]*)\\s*([^&!=,\\s]+)` FORCE = "force" diff --git a/cluster/router/condition_router_test.go b/cluster/router/condition_router_test.go index b4c6a829d667765c903faf61bfbd68c290b5a6ad..577c5c416f87b8d56e88a540d43bf092784b0756 100644 --- a/cluster/router/condition_router_test.go +++ b/cluster/router/condition_router_test.go @@ -25,6 +25,11 @@ import ( "testing" ) +import ( + perrors "github.com/pkg/errors" + "github.com/stretchr/testify/assert" +) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/logger" @@ -33,11 +38,6 @@ import ( "github.com/apache/dubbo-go/protocol/invocation" ) -import ( - perrors "github.com/pkg/errors" - "github.com/stretchr/testify/assert" -) - type MockInvoker struct { url common.URL available bool diff --git a/go.mod b/go.mod index 309be9e00f81c614ea4a887de4ccf05456fdb2cd..ef4c7b2ca8e17c4013f0916964597b43c9ae4615 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,7 @@ module github.com/apache/dubbo-go require ( github.com/dubbogo/getty v1.0.7 + github.com/dubbogo/gost v1.0.0 github.com/dubbogo/hessian2 v1.0.2 github.com/magiconair/properties v1.8.1 github.com/pkg/errors v0.8.1 diff --git a/go.sum b/go.sum index 0a8eb6beea3593059b6ffeaca389e93acba65736..3af6b3eb0d163f358e622769edbe6b856823afac 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dubbogo/getty v1.0.7 h1:5Hg+JwXyCKm9Yr4yJkm98ahhnoa8c2h6br5QJxwQ+YU= github.com/dubbogo/getty v1.0.7/go.mod h1:cRMSuoCmwc5lULFFnYZTxyCfZhObmRTNbS7XRnPNHSo= +github.com/dubbogo/gost v1.0.0 h1:obKvpJYdrIY2BidHYwYoj2E50OtwCDqVVVTcH2nnhAY= +github.com/dubbogo/gost v1.0.0/go.mod h1:R7wZm1DrmrKGr50mBZVcg6C9ekG8aL5hP+sgWcIDwQg= github.com/dubbogo/hessian2 v1.0.2 h1:Ka9Z32ZszGAdCpgrGuZQmwkT0qe1pd3o9r7ERCDnSlQ= github.com/dubbogo/hessian2 v1.0.2/go.mod h1:XFGDn4oSZX26zkcfhkM/fCJrOqwQJxk/xgWW1KMJBKM= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= @@ -35,6 +37,5 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=