Skip to content

Commit

Permalink
reduce common directory (#1948)
Browse files Browse the repository at this point in the history
* build(deps): bump github.com/emicklei/go-restful/v3 from 3.7.4 to 3.8.0 (#1929)

Bumps [github.com/emicklei/go-restful/v3](https://github.com/emicklei/go-restful) from 3.7.4 to 3.8.0.
- [Release notes](https://github.com/emicklei/go-restful/releases)
- [Changelog](https://github.com/emicklei/go-restful/blob/v3/CHANGES.md)
- [Commits](emicklei/go-restful@v3.7.4...v3.8.0)

---
updated-dependencies:
- dependency-name: github.com/emicklei/go-restful/v3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* move common/file into common/constant

* move proxy out of common directory

* modify import path

* reduce common dir

* modify import path by imports-formatter

* rename 'dubboLogger' to 'dubbogoLogger'

* modify import path format

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
Leospard and dependabot[bot] authored Jul 7, 2022
1 parent 148404b commit 53221fa
Show file tree
Hide file tree
Showing 217 changed files with 508 additions and 853 deletions.
3 changes: 2 additions & 1 deletion cluster/cluster/adaptivesvc/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
)

import (
"github.com/dubbogo/gost/log/logger"

perrors "github.com/pkg/errors"
)

Expand All @@ -33,7 +35,6 @@ import (
clsutils "dubbo.apache.org/dubbo-go/v3/cluster/utils"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
3 changes: 2 additions & 1 deletion cluster/cluster/base/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
package base

import (
"github.com/dubbogo/gost/log/logger"

perrors "github.com/pkg/errors"

"go.uber.org/atomic"
Expand All @@ -30,7 +32,6 @@ import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
5 changes: 4 additions & 1 deletion cluster/cluster/broadcast/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@ import (
"context"
)

import (
"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/cluster/cluster/base"
"dubbo.apache.org/dubbo-go/v3/cluster/directory"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
3 changes: 2 additions & 1 deletion cluster/cluster/failback/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import (

import (
"github.com/Workiva/go-datastructures/queue"

"github.com/dubbogo/gost/log/logger"
)

import (
Expand All @@ -34,7 +36,6 @@ import (
"dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
3 changes: 2 additions & 1 deletion cluster/cluster/failover/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import (
)

import (
"github.com/dubbogo/gost/log/logger"

perrors "github.com/pkg/errors"
)

Expand All @@ -32,7 +34,6 @@ import (
"dubbo.apache.org/dubbo-go/v3/cluster/directory"
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
5 changes: 4 additions & 1 deletion cluster/cluster/failsafe/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@ import (
"context"
)

import (
"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/cluster/cluster/base"
"dubbo.apache.org/dubbo-go/v3/cluster/directory"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
3 changes: 2 additions & 1 deletion cluster/cluster/forking/cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ import (

import (
"github.com/Workiva/go-datastructures/queue"

"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/cluster/cluster/base"
"dubbo.apache.org/dubbo-go/v3/cluster/directory"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
3 changes: 2 additions & 1 deletion cluster/cluster/mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ import (
)

import (
"github.com/dubbogo/gost/log/logger"

perrors "github.com/pkg/errors"
)

import (
"dubbo.apache.org/dubbo-go/v3/cluster/directory"
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
5 changes: 4 additions & 1 deletion cluster/loadbalance/p2c/loadbalance.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ import (
"time"
)

import (
"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
"dubbo.apache.org/dubbo-go/v3/cluster/metrics"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
5 changes: 4 additions & 1 deletion cluster/loadbalance/ringhash/ringhash.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@ import (
"strconv"
)

import (
"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
"dubbo.apache.org/dubbo-go/v3/remoting/xds"
)
Expand Down
3 changes: 2 additions & 1 deletion cluster/router/chain/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
)

import (
"github.com/dubbogo/gost/log/logger"

perrors "github.com/pkg/errors"

"go.uber.org/atomic"
Expand All @@ -32,7 +34,6 @@ import (
"dubbo.apache.org/dubbo-go/v3/cluster/router"
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/protocol"
)

Expand Down
5 changes: 4 additions & 1 deletion cluster/router/meshrouter/meshrouter.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ import (
"math/rand"
)

import (
"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/cluster/router"
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config_center"
"dubbo.apache.org/dubbo-go/v3/protocol"
"dubbo.apache.org/dubbo-go/v3/remoting/xds"
Expand Down
5 changes: 4 additions & 1 deletion cluster/router/tag/match.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@ import (
"strconv"
)

import (
"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/protocol"
)
Expand Down
3 changes: 2 additions & 1 deletion cluster/router/tag/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ import (
)

import (
"github.com/dubbogo/gost/log/logger"

"gopkg.in/yaml.v2"
)

import (
"dubbo.apache.org/dubbo-go/v3/common"
conf "dubbo.apache.org/dubbo-go/v3/common/config"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/config_center"
"dubbo.apache.org/dubbo-go/v3/protocol"
Expand Down
File renamed without changes.
7 changes: 5 additions & 2 deletions common/extension/proxy_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@
package extension

import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/common/proxy"
"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/proxy"
)

var proxyFactories = make(map[string]func(...proxy.Option) proxy.ProxyFactory)
Expand Down
36 changes: 0 additions & 36 deletions common/logger/file_log.yml

This file was deleted.

Loading

0 comments on commit 53221fa

Please sign in to comment.