Skip to content

Commit 65a822a

Browse files
committed
refactor(versioning): drop unused helpers and aliases
1 parent 7e59e80 commit 65a822a

3 files changed

Lines changed: 3 additions & 31 deletions

File tree

pkg/config/versioning/config.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"encoding/json"
2222

2323
"github.com/apache/dubbo-admin/pkg/common/bizerror"
24+
"github.com/apache/dubbo-admin/pkg/config"
2425
)
2526

2627
const (
@@ -32,6 +33,7 @@ const (
3233
)
3334

3435
type Config struct {
36+
config.BaseConfig
3537
Enabled bool `json:"enabled" yaml:"enabled"`
3638
MaxVersionsPerRule int64 `json:"maxVersionsPerRule" yaml:"maxVersionsPerRule"`
3739
CoalesceWindowMs int64 `json:"coalesceWindowMs" yaml:"coalesceWindowMs"`
@@ -71,14 +73,6 @@ func (c *Config) Sanitize() {
7173
}
7274
}
7375

74-
func (c *Config) PreProcess() error {
75-
return nil
76-
}
77-
78-
func (c *Config) PostProcess() error {
79-
return nil
80-
}
81-
8276
func (c *Config) Validate() error {
8377
if c.MaxVersionsPerRule <= 0 {
8478
return bizerror.New(bizerror.ConfigError, "versioning.maxVersionsPerRule must be greater than 0")

pkg/console/service/rule_version.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func checkExpectedVersion(ctx consolectx.Context, kindName RuleKindName, opts Ru
4646
return svc.CheckExpected(kindName.Kind, kindName.Mesh, kindName.Name, opts.ExpectedVersionID)
4747
}
4848

49-
func putAdminHint(ctx consolectx.Context, res versionedResource, op versioning.Operation, opts RuleMutationOptions) error {
49+
func putAdminHint(ctx consolectx.Context, res coremodel.Resource, op versioning.Operation, opts RuleMutationOptions) error {
5050
svc := ruleVersioning(ctx)
5151
if svc == nil {
5252
return nil
@@ -72,10 +72,6 @@ func getExistingRule(ctx consolectx.Context, kindName RuleKindName) (coremodel.R
7272
return res, nil
7373
}
7474

75-
type versionedResource interface {
76-
coremodel.Resource
77-
}
78-
7975
func ListRuleVersions(ctx consolectx.Context, kindName RuleKindName) (*versioning.ListResult, error) {
8076
return ctx.RuleVersioning().List(kindName.Kind, kindName.Mesh, kindName.Name)
8177
}

pkg/core/manager/manager_helper.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,6 @@ func GetByKeys[T model.Resource](rm ReadOnlyResourceManager, rk model.ResourceKi
5959
return typedResources, nil
6060
}
6161

62-
func List[T model.Resource](rm ReadOnlyResourceManager, rk model.ResourceKind) ([]T, error) {
63-
resources, err := rm.List(rk)
64-
if err != nil {
65-
return nil, err
66-
}
67-
68-
typedResources := make([]T, len(resources))
69-
for i, resource := range resources {
70-
typedResource, ok := resource.(T)
71-
if !ok {
72-
return nil, bizerror.NewAssertionError(rk, reflect.TypeOf(typedResource).Name())
73-
}
74-
typedResources[i] = typedResource
75-
}
76-
77-
return typedResources, nil
78-
}
79-
8062
// ListByIndexes is a helper function of ResourceManager.ListByIndexes
8163
func ListByIndexes[T model.Resource](rm ReadOnlyResourceManager, rk model.ResourceKind, indexes []index.IndexCondition) ([]T, error) {
8264
resources, err := rm.ListByIndexes(rk, indexes)

0 commit comments

Comments
 (0)